diff --git a/guest_ajax.php b/guest/guest_ajax.php
similarity index 95%
rename from guest_ajax.php
rename to guest/guest_ajax.php
index cec4ecc7..efbc4868 100644
--- a/guest_ajax.php
+++ b/guest/guest_ajax.php
@@ -6,14 +6,14 @@
  * Always returns data in JSON format, unless otherwise specified
  */
 
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
-require_once "rfc6238.php";
+require_once "../rfc6238.php";
 
 
 /*
@@ -74,7 +74,7 @@ if (isset($_GET['stripe_create_pi'])) {
     }
 
     // Setup Stripe
-    require_once 'vendor/stripe-php-10.5.0/init.php';
+    require_once '../vendor/stripe-php-10.5.0/init.php';
 
 
     $row = mysqli_fetch_array(mysqli_query($mysqli, "SELECT config_stripe_enable, config_stripe_secret, config_stripe_account FROM settings WHERE company_id = 1"));
diff --git a/guest_download_file.php b/guest/guest_download_file.php
similarity index 93%
rename from guest_download_file.php
rename to guest/guest_download_file.php
index e3671975..f083d429 100644
--- a/guest_download_file.php
+++ b/guest/guest_download_file.php
@@ -1,11 +1,11 @@
 <?php
 // Not including the guest header as we don't want any HTML output
-require_once "config.php";
+require_once "../config.php";
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
-require_once "functions.php";
+require_once "../functions.php";
 
 
 $session_ip = sanitizeInput(getIP());
@@ -59,7 +59,7 @@ if (isset($_GET['id']) && isset($_GET['key'])) {
     $file_name = sanitizeInput($file_row['file_name']);
     $file_reference_name = sanitizeInput($file_row['file_reference_name']);
     $client_id = intval($file_row['file_client_id']);
-    $file_path = "uploads/clients/$client_id/$file_reference_name";
+    $file_path = "../uploads/clients/$client_id/$file_reference_name";
 
     // Display file as download
     $mime_type = mime_content_type($file_path);
diff --git a/guest/guest_footer.php b/guest/guest_footer.php
new file mode 100644
index 00000000..bc6c1eb8
--- /dev/null
+++ b/guest/guest_footer.php
@@ -0,0 +1,30 @@
+        </div><!-- /.container-fluid -->
+      </div>
+      <!-- /.content -->
+    </div>
+    <!-- /.content-wrapper -->
+  </div>
+  <!-- ./wrapper -->
+
+  <!-- REQUIRED SCRIPTS -->
+  <?php require_once "../includes/inc_confirm_modal.php"; ?>
+
+  <!-- jQuery -->
+  <script src="../plugins/jquery/jquery.min.js"></script>
+  <!-- Bootstrap 4 -->
+  <script src="../plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
+  <!-- AdminLTE App -->
+  <script src="../plugins/adminlte/js/adminlte.min.js"></script>
+  <!-- Custom js -->
+  <script src="../plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
+  <script src="../plugins/moment/moment.min.js"></script>
+  <script src='../plugins/daterangepicker/daterangepicker.js'></script>
+  <script src='../plugins/select2/js/select2.min.js'></script>
+  <script src='../plugins/inputmask/inputmask.min.js'></script>
+
+  <script src="../js/app.js"></script>
+
+  <script src="../js/confirm_modal.js"></script>
+
+  </body>
+</html>
diff --git a/guest_header.php b/guest/guest_header.php
similarity index 70%
rename from guest_header.php
rename to guest/guest_header.php
index 8ce55023..d82f5eac 100644
--- a/guest_header.php
+++ b/guest/guest_header.php
@@ -1,12 +1,12 @@
 <?php
 
-require_once "config.php";
-require_once "functions.php";
+require_once "../config.php";
+require_once "../functions.php";
 
 session_start();
 
 // Set Timezone
-require_once "inc_set_timezone.php";
+require_once "../inc_set_timezone.php";
 
 $ip = sanitizeInput(getIP());
 $user_agent = sanitizeInput($_SERVER['HTTP_USER_AGENT']);
@@ -35,20 +35,20 @@ $session_company_name = $row['company_name'];
     Favicon
     If Fav Icon exists else use the default one 
     -->
-    <?php if(file_exists('uploads/favicon.ico')) { ?>
-        <link rel="icon" type="image/x-icon" href="/uploads/favicon.ico">
+    <?php if(file_exists('../uploads/favicon.ico')) { ?>
+        <link rel="icon" type="image/x-icon" href="../uploads/favicon.ico">
     <?php } ?>
 
     <!-- Font Awesome Icons -->
-    <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
+    <link rel="stylesheet" href="../plugins/fontawesome-free/css/all.min.css">
     <!-- Theme style -->
-    <link rel="stylesheet" href="dist/css/adminlte.min.css">
+    <link rel="stylesheet" href="../plugins/adminlte/css/adminlte.min.css">
 
     <!-- Custom Style Sheet -->
-    <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
-    <link href="plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
-    <link href="plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
-    <link href='plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
+    <link href="../plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
+    <link href="../plugins/select2/css/select2.min.css" rel="stylesheet" type="text/css">
+    <link href="../plugins/select2-bootstrap4-theme/select2-bootstrap4.min.css" rel="stylesheet" type="text/css">
+    <link href='../plugins/daterangepicker/daterangepicker.css' rel='stylesheet' />
 
 </head>
 <body class="layout-top-nav">
diff --git a/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php
similarity index 99%
rename from guest_pay_invoice_stripe.php
rename to guest/guest_pay_invoice_stripe.php
index 3be52d31..019c670f 100644
--- a/guest_pay_invoice_stripe.php
+++ b/guest/guest_pay_invoice_stripe.php
@@ -168,7 +168,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
     </div>
 
     <!-- Include local JS that powers stripe -->
-    <script src="js/guest_pay_invoice_stripe.js"></script>
+    <script src="../js/guest_pay_invoice_stripe.js"></script>
 
     <?php
 
@@ -181,7 +181,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
     $pi_cs = $_GET['payment_intent_client_secret'];
 
     // Initialize stripe
-    require_once 'vendor/stripe-php-10.5.0/init.php';
+    require_once '../vendor/stripe-php-10.5.0/init.php';
 
     \Stripe\Stripe::setApiKey($config_stripe_secret);
 
diff --git a/guest_post.php b/guest/guest_post.php
similarity index 98%
rename from guest_post.php
rename to guest/guest_post.php
index b2fd9ac7..9d0a4875 100644
--- a/guest_post.php
+++ b/guest/guest_post.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "config.php";
-require_once "functions.php";
+require_once "../config.php";
+require_once "../functions.php";
 
 session_start();
 
-require_once "inc_set_timezone.php"; // Must be included after session_start to work
+require_once "../inc_set_timezone.php"; // Must be included after session_start to work
 
 if (isset($_GET['accept_quote'], $_GET['url_key'])) {
     $quote_id = intval($_GET['accept_quote']);
diff --git a/guest_view_invoice.php b/guest/guest_view_invoice.php
similarity index 99%
rename from guest_view_invoice.php
rename to guest/guest_view_invoice.php
index 712d3886..ca1c4765 100644
--- a/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -74,7 +74,7 @@ $company_email = nullable_htmlentities($row['company_email']);
 $company_website = nullable_htmlentities($row['company_website']);
 $company_logo = nullable_htmlentities($row['company_logo']);
 if (!empty($company_logo)) {
-    $company_logo_base64 = base64_encode(file_get_contents("uploads/settings/$company_logo"));
+    $company_logo_base64 = base64_encode(file_get_contents("../uploads/settings/$company_logo"));
 }
 $company_locale = nullable_htmlentities($row['company_locale']);
 $config_invoice_footer = nullable_htmlentities($row['config_invoice_footer']);
@@ -169,7 +169,7 @@ if ($balance > 0) {
         <div class="card-body">
             <div class="row mb-4">
                 <div class="col-2">
-                    <img class="img-fluid" src="<?php echo "uploads/settings/$company_logo"; ?>">
+                    <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>">
                 </div>
                 <div class="col-10">
                     <?php if ($invoice_status == "Paid") { ?>
@@ -343,8 +343,8 @@ if ($balance > 0) {
         </div>
     </div>
 
-    <script src='plugins/pdfmake/pdfmake.min.js'></script>
-    <script src='plugins/pdfmake/vfs_fonts.js'></script>
+    <script src='../plugins/pdfmake/pdfmake.min.js'></script>
+    <script src='../plugins/pdfmake/vfs_fonts.js'></script>
     <script>
 
         var docDefinition = {
diff --git a/guest_view_item.php b/guest/guest_view_item.php
similarity index 98%
rename from guest_view_item.php
rename to guest/guest_view_item.php
index 49be46f7..c04e9ada 100644
--- a/guest_view_item.php
+++ b/guest/guest_view_item.php
@@ -8,7 +8,7 @@ require_once "guest_header.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
-require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]);
@@ -87,7 +87,7 @@ appNotify("Share Viewed", "$item_type_sql_escaped has been viewed by $item_recip
 
 <?php
     if (!empty($company_logo)) { ?>
-            <img alt="<?=nullable_htmlentities($company_name)?> logo" height="40" width="80" class="img-fluid" src="<?php echo "uploads/settings/$company_logo"; ?>">
+            <img alt="<?=nullable_htmlentities($company_name)?> logo" height="40" width="80" class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>">
         <?php
         } else {
             echo "<h3>$company_name</h3>";
diff --git a/guest_view_quote.php b/guest/guest_view_quote.php
similarity index 98%
rename from guest_view_quote.php
rename to guest/guest_view_quote.php
index b909b79a..56f584f6 100644
--- a/guest_view_quote.php
+++ b/guest/guest_view_quote.php
@@ -74,7 +74,7 @@ $company_email = nullable_htmlentities($row['company_email']);
 $company_website = nullable_htmlentities($row['company_website']);
 $company_logo = nullable_htmlentities($row['company_logo']);
 if (!empty($company_logo)) {
-    $company_logo_base64 = base64_encode(file_get_contents("uploads/settings/$company_logo"));
+    $company_logo_base64 = base64_encode(file_get_contents("../uploads/settings/$company_logo"));
 }
 $company_locale = nullable_htmlentities($row['company_locale']);
 $config_quote_footer = nullable_htmlentities($row['config_quote_footer']);
@@ -112,7 +112,7 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
 
             <div class="row mb-4">
                 <div class="col-sm-2">
-                    <img class="img-fluid" src="<?php echo "uploads/settings/$company_logo"; ?>">
+                    <img class="img-fluid" src="<?php echo "../uploads/settings/$company_logo"; ?>">
                 </div>
                 <div class="col-sm-10">
                     <?php if ($quote_status == "Accepted" || $quote_status == "Declined") { ?>
@@ -284,8 +284,8 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
         </div>
     </div>
 
-    <script src='plugins/pdfmake/pdfmake.min.js'></script>
-    <script src='plugins/pdfmake/vfs_fonts.js'></script>
+    <script src='../plugins/pdfmake/pdfmake.min.js'></script>
+    <script src='../plugins/pdfmake/vfs_fonts.js'></script>
     <script>
 
         var docDefinition = {
diff --git a/guest_view_ticket.php b/guest/guest_view_ticket.php
similarity index 99%
rename from guest_view_ticket.php
rename to guest/guest_view_ticket.php
index 2b0c0ff7..e32c7946 100644
--- a/guest_view_ticket.php
+++ b/guest/guest_view_ticket.php
@@ -3,7 +3,7 @@
 require_once "guest_header.php";
 
 //Initialize the HTML Purifier to prevent XSS
-require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
+require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
 
 $purifier_config = HTMLPurifier_Config::createDefault();
 $purifier_config->set('URI.AllowedSchemes', ['data' => true, 'src' => true, 'http' => true, 'https' => true]);
diff --git a/guest_footer.php b/guest_footer.php
deleted file mode 100644
index c6e94e3c..00000000
--- a/guest_footer.php
+++ /dev/null
@@ -1,30 +0,0 @@
-        </div><!-- /.container-fluid -->
-      </div>
-      <!-- /.content -->
-    </div>
-    <!-- /.content-wrapper -->
-  </div>
-  <!-- ./wrapper -->
-
-  <!-- REQUIRED SCRIPTS -->
-  <?php require_once "inc_confirm_modal.php"; ?>
-
-  <!-- jQuery -->
-  <script src="plugins/jquery/jquery.min.js"></script>
-  <!-- Bootstrap 4 -->
-  <script src="plugins/bootstrap/js/bootstrap.bundle.min.js"></script>
-  <!-- AdminLTE App -->
-  <script src="dist/js/adminlte.min.js"></script>
-  <!-- Custom js -->
-  <script src="plugins/tempusdominus-bootstrap-4/js/tempusdominus-bootstrap-4.min.js"></script>
-  <script src="plugins/moment/moment.min.js"></script>
-  <script src='plugins/daterangepicker/daterangepicker.js'></script>
-  <script src='plugins/select2/js/select2.min.js'></script>
-  <script src='plugins/inputmask/min/inputmask/inputmask.min.js'></script>
-
-  <script src="js/app.js"></script>
-
-  <script src="js/confirm_modal.js"></script>
-
-  </body>
-</html>
diff --git a/includes/header.php b/includes/header.php
index 7d8bd8bf..ac886ac6 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -30,7 +30,7 @@ header("X-Frame-Options: DENY");
     <link rel="stylesheet" href="plugins/fontawesome-free/css/all.min.css">
 
     <!-- Theme style -->
-    <link rel="stylesheet" href="dist/css/adminlte.min.css">
+    <link rel="stylesheet" href="plugins/adminlte/css/adminlte.min.css">
 
     <!-- Custom Style Sheet -->
     <link href="plugins/tempusdominus-bootstrap-4/css/tempusdominus-bootstrap-4.min.css" rel="stylesheet" type="text/css">
diff --git a/index.php b/index.php
index cb69e797..ab0d6145 100644
--- a/index.php
+++ b/index.php
@@ -1,7 +1,7 @@
 <?php 
 
 if (file_exists("config.php")) {
-    include "inc_all.php";
+    require_once "includes/inc_all.php";
  ?>
 	<!-- Breadcrumbs-->
 	<ol class="breadcrumb">
@@ -16,7 +16,7 @@ if (file_exists("config.php")) {
 	<hr>
 	<?php 
 
-	include "footer.php";
+	require_once "includes/footer.php";
 
 
 } else {