diff --git a/Containerfile b/Containerfile
new file mode 100644
index 0000000..f2a44ed
--- /dev/null
+++ b/Containerfile
@@ -0,0 +1,7 @@
+FROM php:7.4-apache
+
+COPY src/ /var/www/html/
+
+# Use the default production configuration
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini"
+RUN a2enmod rewrite
diff --git a/core/init/loader.php b/core/init/loader.php
index b16e1d3..d333bce 100644
--- a/core/init/loader.php
+++ b/core/init/loader.php
@@ -35,8 +35,8 @@ class Loader {
   public function get_page_name(){
     $uri = Core::get_get_data();
     $page = "/none";
-    if(isset($uri["page"])){
-      $page = parse_url($uri["page"]);
+    if(isset($uri["path"])){
+      $page = parse_url($uri["path"]);
       $page = $page["path"];
     }
     return $page;
diff --git a/public/index.php b/public/index.php
deleted file mode 100644
index cea0619..0000000
--- a/public/index.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php include("core/init.php");
-$b = new StartUp();
-$b->start();
diff --git a/src/.htaccess b/src/.htaccess
new file mode 100644
index 0000000..36b5b0b
--- /dev/null
+++ b/src/.htaccess
@@ -0,0 +1,4 @@
+RewriteEngine on
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteCond %{REQUEST_FILENAME} !-d
+RewriteRule ^(.*)$ /index.php?path=$1 [NC,L,QSA]
diff --git a/core/db/db.php b/src/core/db/db.php
similarity index 100%
rename from core/db/db.php
rename to src/core/db/db.php
diff --git a/core/init.php b/src/core/init.php
similarity index 90%
rename from core/init.php
rename to src/core/init.php
index 55124af..2239eba 100644
--- a/core/init.php
+++ b/src/core/init.php
@@ -1,6 +1,6 @@
 <?php
 // this class starts the whole thing going.
-class StartUp {
+class Init {
   public function start (){
     // define a constant for checking later on
     define("LETSGO",true);
@@ -29,7 +29,7 @@ class StartUp {
     // YOU REALLY SHOULD HAVE YOUR OWN CONFIG FILE!!!
 
     if (!file_exists($config)) {
-      $config = Core::root_dir()."/config/config.sample.ini";
+      $config = Core::root_dir()."/sample-config/config.sample.ini";
     }
 
     // define services file location
@@ -39,7 +39,7 @@ class StartUp {
     // YOU REALLY SHOULD HAVE YOUR OWN SERVICES FILE!!!
 
     if (!file_exists($services)) {
-      $services = Core::root_dir()."/config/services.sample.ini";
+      $services = Core::root_dir()."/sample-config/services.sample.ini";
     }
 
     // Store the config settings in the Core::Config variable
diff --git a/core/init/core.php b/src/core/init/core.php
similarity index 69%
rename from core/init/core.php
rename to src/core/init/core.php
index 09db228..01bdffa 100644
--- a/core/init/core.php
+++ b/src/core/init/core.php
@@ -4,13 +4,7 @@
   public static function root_dir(){
     return $_SERVER['DOCUMENT_ROOT'];
   }
-  public static function get_current_page_name(){
-    if (!isset(self::$CurrentPage->Name)){
-      return "Login";
-    } else {
-      return self::$CurrentPage->Name;
-    }
-  }
+
   public static function get_post_data(){
     $data = [];
     foreach($_POST as $key=>$value){
@@ -48,10 +42,29 @@
     }
   }
   public static function get_current_git_commit( $branch='master' ) {
-    if ( $hash = file_get_contents( sprintf( '.git/refs/heads/%s', $branch ) ) ) {
+    $gitref = sprintf( self::root_dir().'/../.git/refs/heads/%s', $branch );
+    if ( file_exists($gitref) && $hash = file_get_contents( $gitref ) ) {
       return trim($hash);
     } else {
       return false;
     }
   }
+  public static function full_url(){
+    if(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] === 'on') {
+      $addr = "https";
+    } else {
+      $addr = "http";
+    }
+    // Here append the common URL characters.
+    $addr .= "://";
+
+    // Append the host(domain name, ip) to the URL.
+    $addr .= $_SERVER['HTTP_HOST'];
+
+    // Append the requested resource location to the URL
+    $addr .= $_SERVER['REQUEST_URI'];
+
+    // Return the address
+    return $addr;
+  }
 }
diff --git a/core/init/errors.php b/src/core/init/errors.php
similarity index 100%
rename from core/init/errors.php
rename to src/core/init/errors.php
diff --git a/src/core/init/loader.php b/src/core/init/loader.php
new file mode 100644
index 0000000..8255be7
--- /dev/null
+++ b/src/core/init/loader.php
@@ -0,0 +1,47 @@
+<?php
+require ("core.php");
+require ("user.php");
+require ("responder.php");
+require ("errors.php");
+class Loader {
+  public function request_page(){
+    // Check if user is authenticated and go to the relevant section
+    if (User::is_authenticated()){
+      $this->go_to_page(true);
+    } else {
+      $this->go_to_page(false);
+    }
+  }
+  public function go_to_page($authenticated) {
+    switch ($authenticated) {
+      case false:
+        require(Core::root_dir()."/public/unauthorized.php");
+        break;
+      default:
+        $p = $this->get_page_name();
+        if (substr($p,0,6) != "/admin") {
+          header('Content-Type: application/json');  // <-- header declaration
+        }
+        if(substr($p,0,1) == "/") {
+          Core::$CurrentPage = substr($p,1);
+        } else {
+          Core::$CurrentPage = $p;
+        }
+          require_once(Core::root_dir()."/public/respond.php");
+        // } else {
+        //   Core::$CurrentPage = "Error";
+        //   require_once(Core::RootDir()."/public/error.php");
+        // }
+        break;
+    }
+  }
+  public function get_page_name(){
+    $uri = Core::get_get_data();
+    $page = "/none";
+    if(isset($uri["path"])){
+      $page = parse_url($uri["path"]);
+      $page = $page["path"];
+    }
+    return $page;
+  }
+}
diff --git a/core/init/responder.php b/src/core/init/responder.php
similarity index 89%
rename from core/init/responder.php
rename to src/core/init/responder.php
index 8671c08..5579370 100644
--- a/core/init/responder.php
+++ b/src/core/init/responder.php
@@ -25,6 +25,9 @@ class Responder {
       case "get/all":
         $resp = $this->all_urls();
         break;
+      case "get/select":
+        $resp = $this->selection();
+        break;
       case "none":
       case "test":
       case "home":
@@ -51,6 +54,13 @@ class Responder {
 
     return $response;
   }
+  private function selection(){
+    $response = new Response();
+    $response->message = "Not Implemented";
+    $uri = Core::full_url();
+    $response->payload = parse_url($uri);
+    return $response;
+  }
   private function dummy_response(){
     // Generate a dummy response for testing
     $response = new Response();
diff --git a/core/init/user.php b/src/core/init/user.php
similarity index 100%
rename from core/init/user.php
rename to src/core/init/user.php
diff --git a/index.php b/src/index.php
similarity index 53%
rename from index.php
rename to src/index.php
index 0dedf26..37ad07f 100644
--- a/index.php
+++ b/src/index.php
@@ -1,3 +1,5 @@
 <?php
 // entry point - inport and run the public index.php file
-require("public/index.php");
+include("core/init.php");
+$b = new Init();
+$b->start();
diff --git a/public/error.php b/src/public/error.php
similarity index 100%
rename from public/error.php
rename to src/public/error.php
diff --git a/public/respond.php b/src/public/respond.php
similarity index 100%
rename from public/respond.php
rename to src/public/respond.php
diff --git a/public/unauthorized.php b/src/public/unauthorized.php
similarity index 100%
rename from public/unauthorized.php
rename to src/public/unauthorized.php
diff --git a/config/config.sample.ini b/src/sample-config/config.sample.ini
similarity index 100%
rename from config/config.sample.ini
rename to src/sample-config/config.sample.ini
diff --git a/config/services.sample.ini b/src/sample-config/services.sample.ini
similarity index 100%
rename from config/services.sample.ini
rename to src/sample-config/services.sample.ini