diff --git a/ajax.php b/ajax.php
index a5b3e96c..2bec4255 100644
--- a/ajax.php
+++ b/ajax.php
@@ -9,7 +9,7 @@
 require_once "config.php";
 require_once "functions.php";
 require_once "check_login.php";
-require_once "rfc6238.php";
+require_once "includes/rfc6238.php";
 
 /*
  * Fetches SSL certificates from remote hosts & returns the relevant info (issuer, expiry, public key)
@@ -87,7 +87,7 @@ if (isset($_GET['domain_get_json_details'])) {
     // Get domain history
     $history_sql = mysqli_query($mysqli, "SELECT * FROM domain_history WHERE domain_history_domain_id = $domain_id");
     $history_html = "<table class='table table-sm table-striped border table-hover'>";
-    $history_html .= "<thead class='thead-dark'><tr><th>Date</th><th>Column</th><th>Old Value</th><th>New Value</th></tr></thead><tbody>";
+    $history_html .= "<thead class='thead-dark'><tr><th>Date</th><th>Field</th><th>Before</th><th>After</th></tr></thead><tbody>";
     while ($row = mysqli_fetch_array($history_sql)) {
         // Fetch data from the query and create table rows
         $history_html .= "<tr>";
diff --git a/client_logins.php b/client_logins.php
index 21b798b1..56ff4800 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -413,20 +413,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
 
 <!-- Include script to get TOTP code via the login ID -->
 <script src="js/logins_show_otp_via_id.js"></script>
-
 <!-- Include script to generate readable passwords for login entries -->
 <script src="js/logins_generate_password.js"></script>
-
 <script src="js/bulk_actions.js"></script>
 
 <?php
 
 require_once "modals/client_login_add_modal.php";
-
 require_once "modals/share_modal.php";
-
 require_once "modals/client_login_import_modal.php";
-
 require_once "modals/client_login_export_modal.php";
-
 require_once "includes/footer.php";
diff --git a/guest/guest_ajax.php b/guest/guest_ajax.php
index 9e01dfa7..5910d3db 100644
--- a/guest/guest_ajax.php
+++ b/guest/guest_ajax.php
@@ -11,7 +11,7 @@ require_once "../config.php";
 // Set Timezone
 require_once "../inc_set_timezone.php";
 require_once "../functions.php";
-require_once "../rfc6238.php";
+require_once "../includes/rfc6238.php";
 
 
 /*
diff --git a/base32static.php b/includes/base32static.php
similarity index 100%
rename from base32static.php
rename to includes/base32static.php
diff --git a/rfc6238.php b/includes/rfc6238.php
similarity index 100%
rename from rfc6238.php
rename to includes/rfc6238.php
diff --git a/login.php b/login.php
index 5b8602e3..85883431 100644
--- a/login.php
+++ b/login.php
@@ -21,7 +21,7 @@ if ($config_https_only && (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] !== 'o
 
 require_once "functions.php";
 
-require_once "rfc6238.php";
+require_once "includes/rfc6238.php";
 
 
 // IP & User Agent for logging
diff --git a/post/user/profile.php b/post/user/profile.php
index 7c011ba7..9712bb8b 100644
--- a/post/user/profile.php
+++ b/post/user/profile.php
@@ -193,7 +193,7 @@ if (isset($_POST['edit_your_user_preferences'])) {
 
 if (isset($_POST['verify'])) {
 
-    require_once "rfc6238.php";
+    require_once "includes/rfc6238.php";
 
     $currentcode = intval($_POST['code']);  //code to validate, for example received from device
 
diff --git a/user_security.php b/user_security.php
index 99329dac..d8c5d13f 100644
--- a/user_security.php
+++ b/user_security.php
@@ -52,7 +52,7 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens);
             <center>
                 <?php
 
-                require_once 'rfc6238.php';
+                require_once 'includes/rfc6238.php';
 
                 //Generate a base32 Key
                 $secretkey = key32gen();