diff --git a/ajax.php b/ajax.php
index aa2d26ee..a60433c4 100644
--- a/ajax.php
+++ b/ajax.php
@@ -8,7 +8,7 @@
 
 require_once "config.php";
 require_once "functions.php";
-require_once "check_login.php";
+require_once "includes/check_login.php";
 require_once "plugins/totp/totp.php";
 
 /*
diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php
index 523e5208..8c35e4eb 100644
--- a/guest/guest_ajax.php
+++ b/guest/guest_ajax.php
@@ -9,7 +9,7 @@
 require_once "../config.php";
 
 // Set Timezone
-require_once "../inc_set_timezone.php";
+require_once "../includes/inc_set_timezone.php";
 require_once "../functions.php";
 require_once "../plugins/totp/totp.php";
 
diff --git a/guest/guest_pay_invoice_stripe.php b/guest/guest_pay_invoice_stripe.php
index 9f3c9a6e..c50758d6 100644
--- a/guest/guest_pay_invoice_stripe.php
+++ b/guest/guest_pay_invoice_stripe.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once 'guest_header.php';
+require_once 'includes/guest_header.php';
 
 // Define wording
 DEFINE("WORDING_PAYMENT_FAILED", "<br><h2>There was an error verifying your payment. Please contact us for more information before attempting payment again.</h2>");
@@ -19,7 +19,7 @@ $config_stripe_flat_fee = floatval($stripe_vars['config_stripe_flat_fee']);
 // Check Stripe is configured
 if ($config_stripe_enable == 0 || $config_stripe_account == 0 || empty($config_stripe_publishable) || empty($config_stripe_secret)) {
     echo "<br><h2>Stripe payments not enabled/configured</h2>";
-    require_once 'guest_footer.php';
+    require_once 'includes/guest_footer.php';
     error_log("Stripe payment error - disabled. Check payments are enabled, Expense account is set, Stripe publishable and secret keys are configured.");
     exit();
 }
@@ -47,7 +47,7 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
     // Ensure we have a valid invoice
     if (!$sql || mysqli_num_rows($sql) !== 1) {
         echo "<br><h2>Oops, something went wrong! Please ensure you have the correct URL and have not already paid this invoice.</h2>";
-        require_once 'guest_footer.php';
+        require_once 'includes/guest_footer.php';
         error_log("Stripe payment error - Invoice with ID $invoice_id is unknown/not eligible to be paid.");
         exit();
     }
@@ -357,4 +357,4 @@ if (isset($_GET['invoice_id'], $_GET['url_key']) && !isset($_GET['payment_intent
 }
 
 
-require_once 'guest_footer.php';
+require_once 'includes/guest_footer.php';
diff --git a/guest/guest_view_invoice.php b/guest/guest_view_invoice.php
index 8352d4f8..a1db478c 100644
--- a/guest/guest_view_invoice.php
+++ b/guest/guest_view_invoice.php
@@ -1,10 +1,10 @@
 <?php
 
-require_once "guest_header.php";
+require_once "includes/guest_header.php";
 
 if (!isset($_GET['invoice_id'], $_GET['url_key'])) {
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
 
     exit();
 }
@@ -25,7 +25,7 @@ $sql = mysqli_query(
 if (mysqli_num_rows($sql) !== 1) {
     // Invalid invoice/key
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
 
     exit();
 }
@@ -931,4 +931,4 @@ if ($outstanding_invoices_count > 0) { ?>
 
 <?php } // End previous unpaid invoices
 
-require_once "guest_footer.php";
+require_once "includes/guest_footer.php";
diff --git a/guest/guest_view_item.php b/guest/guest_view_item.php
index a61fbc47..4744774e 100644
--- a/guest/guest_view_item.php
+++ b/guest/guest_view_item.php
@@ -4,7 +4,7 @@ header('Cache-Control: no-store, no-cache, must-revalidate');
 header('Cache-Control: post-check=0, pre-check=0', false);
 header('Pragma: no-cache');
 
-require_once "guest_header.php";
+require_once "includes/guest_header.php";
 
 
 //Initialize the HTML Purifier to prevent XSS
@@ -38,7 +38,7 @@ $currency_format = numfmt_create($company_locale, NumberFormatter::CURRENCY);
 <?php
 if (!isset($_GET['id']) || !isset($_GET['key'])) {
     echo "<div class='alert alert-danger'>Incorrect URL.</div>";
-    include "guest_footer.php";
+    include "includes/guest_footer.php";
 
     exit();
 }
@@ -52,7 +52,7 @@ $row = mysqli_fetch_array($sql);
 // Check we got a result
 if (mysqli_num_rows($sql) !== 1 || !$row) {
     echo "<div class='alert alert-danger' >No item to view. Check with the person that sent you this link to ensure it is correct and has not expired.</div>";
-    include "guest_footer.php";
+    include "includes/guest_footer.php";
 
     exit();
 }
@@ -60,7 +60,7 @@ if (mysqli_num_rows($sql) !== 1 || !$row) {
 // Check item share is active & hasn't been viewed too many times but allow 0 views as that is consider infinite views
 if ($row['item_active'] !== "1" || ($row['item_view_limit'] > 0 && $row['item_views'] >= $row['item_view_limit'])) {
     echo "<div class='alert alert-danger'>Item cannot be viewed at this time. Check with the person that sent you this link to ensure it is correct and has not expired.</div>";
-    include "guest_footer.php";
+    include "includes/guest_footer.php";
 
     exit();
 }
@@ -122,7 +122,7 @@ if ($item_type == "Document") {
 
     if (mysqli_num_rows($doc_sql) !== 1 || !$doc_row) {
         echo "<div class='alert alert-danger'>Error retrieving document to view.</div>";
-        require_once "guest_footer.php";
+        require_once "includes/guest_footer.php";
 
         exit();
     }
@@ -149,7 +149,7 @@ if ($item_type == "Document") {
 
     if (mysqli_num_rows($file_sql) !== 1 || !$file_row) {
         echo "<div class='alert alert-danger'>Error retrieving file.</div>";
-        include "guest_footer.php";
+        include "includes/guest_footer.php";
 
         exit();
     }
@@ -170,7 +170,7 @@ if ($item_type == "Document") {
     $credential_row = mysqli_fetch_array($credential_sql);
     if (mysqli_num_rows($credential_sql) !== 1 || !$credential_row) {
         echo "<div class='alert alert-danger'>Error retrieving login.</div>";
-        include "guest_footer.php";
+        include "includes/guest_footer.php";
 
         exit();
     }
@@ -273,6 +273,6 @@ if ($item_type == "Document") {
 </div>
 
 <?php
-require_once "guest_footer.php";
+require_once "includes/guest_footer.php";
 
 ?>
diff --git a/guest/guest_view_quote.php b/guest/guest_view_quote.php
index 0baabd22..66317731 100644
--- a/guest/guest_view_quote.php
+++ b/guest/guest_view_quote.php
@@ -1,11 +1,11 @@
 <?php
 
-require_once "guest_header.php";
+require_once "includes/guest_header.php";
 
 
 if (!isset($_GET['quote_id'], $_GET['url_key'])) {
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
 
     exit();
 }
@@ -27,7 +27,7 @@ $sql = mysqli_query(
 if (mysqli_num_rows($sql) !== 1) {
     // Invalid quote/key
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
 
     exit();
 }
@@ -717,5 +717,5 @@ if ($quote_status == "Draft" || $quote_status == "Sent" || $quote_status == "Vie
 
 <?php
 require_once "guest_quote_upload_file_modal.php";
-require_once "guest_footer.php";
+require_once "includes/guest_footer.php";
 
diff --git a/guest/guest_view_ticket.php b/guest/guest_view_ticket.php
index 57cd952c..a5a58064 100644
--- a/guest/guest_view_ticket.php
+++ b/guest/guest_view_ticket.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "guest_header.php";
+require_once "includes/guest_header.php";
 
 //Initialize the HTML Purifier to prevent XSS
 require "../plugins/htmlpurifier/HTMLPurifier.standalone.php";
@@ -12,7 +12,7 @@ $purifier = new HTMLPurifier($purifier_config);
 
 if (!isset($_GET['ticket_id'], $_GET['url_key'])) {
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
     exit();
 }
 
@@ -34,7 +34,7 @@ $ticket_sql = mysqli_query($mysqli,
 if (mysqli_num_rows($ticket_sql) !== 1) {
     // Invalid invoice/key
     echo "<br><h2>Oops, something went wrong! Please raise a ticket if you believe this is an error.</h2>";
-    require_once "guest_footer.php";
+    require_once "includes/guest_footer.php";
 
     exit();
 }
@@ -208,4 +208,4 @@ if ($ticket_row) {
 </div>
 
 <?php
-require_once "guest_footer.php";
+require_once "includes/guest_footer.php";
diff --git a/guest/guest_footer.php b/guest/includes/guest_footer.php
similarity index 100%
rename from guest/guest_footer.php
rename to guest/includes/guest_footer.php
diff --git a/guest/guest_header.php b/guest/includes/guest_header.php
similarity index 100%
rename from guest/guest_header.php
rename to guest/includes/guest_header.php