diff --git a/ajax/adblock/update_blocklist.php b/ajax/adblock/update_blocklist.php
index 46f7798e..f21cb4aa 100644
--- a/ajax/adblock/update_blocklist.php
+++ b/ajax/adblock/update_blocklist.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['blocklist_id'])) {
diff --git a/ajax/bandwidth/get_bandwidth.php b/ajax/bandwidth/get_bandwidth.php
index 76ffb993..6e069d79 100644
--- a/ajax/bandwidth/get_bandwidth.php
+++ b/ajax/bandwidth/get_bandwidth.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $interface = filter_input(INPUT_GET, 'inet', FILTER_SANITIZE_SPECIAL_CHARS);
diff --git a/ajax/bandwidth/get_bandwidth_hourly.php b/ajax/bandwidth/get_bandwidth_hourly.php
index f68b6e0a..798cf9de 100644
--- a/ajax/bandwidth/get_bandwidth_hourly.php
+++ b/ajax/bandwidth/get_bandwidth_hourly.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (filter_input(INPUT_GET, 'tu') == 'h') {
diff --git a/ajax/logging/clearlog.php b/ajax/logging/clearlog.php
index ff052f56..5b928912 100644
--- a/ajax/logging/clearlog.php
+++ b/ajax/logging/clearlog.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 
diff --git a/ajax/networking/do_sys_reset.php b/ajax/networking/do_sys_reset.php
index b9df53cc..ab885af4 100644
--- a/ajax/networking/do_sys_reset.php
+++ b/ajax/networking/do_sys_reset.php
@@ -1,15 +1,14 @@
 <?php
-
+require_once '../../includes/autoload.php';
 require_once '../../includes/config.php';
 require_once '../../includes/session.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/session.php';
 require_once '../../includes/functions.php';
 
 if (isset($_POST['csrf_token'])) {
-    if (csrfValidateRequest() && !CSRFValidate()) {
-        handleInvalidCSRFToken();
+    if ($token->csrfValidateRequest() && !$token->CSRFValidate()) {
+        $token->handleInvalidCSRFToken();
     }
     $return = 0;
     $path = "../../config";
@@ -33,5 +32,6 @@ if (isset($_POST['csrf_token'])) {
     echo json_encode($jsonData);
 
 } else {
-    handleInvalidCSRFToken();
+    $token->handleInvalidCSRFToken();
 }
+
diff --git a/ajax/networking/get_all_interfaces.php b/ajax/networking/get_all_interfaces.php
index b88e987b..2953b734 100644
--- a/ajax/networking/get_all_interfaces.php
+++ b/ajax/networking/get_all_interfaces.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 exec("ls /sys/class/net | grep -v lo", $interfaces);
diff --git a/ajax/networking/get_channel.php b/ajax/networking/get_channel.php
index 099f192a..77683dc7 100644
--- a/ajax/networking/get_channel.php
+++ b/ajax/networking/get_channel.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 exec('cat '. RASPI_HOSTAPD_CONFIG, $hostapdconfig);
diff --git a/ajax/networking/get_frequencies.php b/ajax/networking/get_frequencies.php
index 53bb89a4..f1a9dba3 100644
--- a/ajax/networking/get_frequencies.php
+++ b/ajax/networking/get_frequencies.php
@@ -1,10 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
-require_once '../../src/RaspAP/Parsers/IwParser.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['interface'])) {
diff --git a/ajax/networking/get_ip_summary.php b/ajax/networking/get_ip_summary.php
index 9f9b4cee..3dac9735 100644
--- a/ajax/networking/get_ip_summary.php
+++ b/ajax/networking/get_ip_summary.php
@@ -1,10 +1,8 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/functions.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 if (isset($_POST['interface'])) {
diff --git a/ajax/networking/get_netcfg.php b/ajax/networking/get_netcfg.php
index d05f2aae..104f6d09 100644
--- a/ajax/networking/get_netcfg.php
+++ b/ajax/networking/get_netcfg.php
@@ -1,10 +1,9 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
+require_once '../../includes/functions.php';
 
 $interface = $_POST['iface'];
 
diff --git a/ajax/networking/get_nl80211_band.php b/ajax/networking/get_nl80211_band.php
index e293d705..26ed2048 100644
--- a/ajax/networking/get_nl80211_band.php
+++ b/ajax/networking/get_nl80211_band.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/locale.php';
 
diff --git a/ajax/networking/get_wgcfg.php b/ajax/networking/get_wgcfg.php
index 1479a919..af64bec4 100644
--- a/ajax/networking/get_wgcfg.php
+++ b/ajax/networking/get_wgcfg.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 // fetch wg client.conf
diff --git a/ajax/networking/get_wgkey.php b/ajax/networking/get_wgkey.php
index d274e621..4c4e76aa 100644
--- a/ajax/networking/get_wgkey.php
+++ b/ajax/networking/get_wgkey.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $entity = escapeshellcmd($_POST['entity']);
diff --git a/ajax/networking/wifi_stations.php b/ajax/networking/wifi_stations.php
index a17ebb32..428a348f 100644
--- a/ajax/networking/wifi_stations.php
+++ b/ajax/networking/wifi_stations.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/defaults.php';
 require_once '../../includes/functions.php';
diff --git a/ajax/openvpn/activate_ovpncfg.php b/ajax/openvpn/activate_ovpncfg.php
index 066cd9f6..8aef26d8 100644
--- a/ajax/openvpn/activate_ovpncfg.php
+++ b/ajax/openvpn/activate_ovpncfg.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 
diff --git a/ajax/openvpn/del_ovpncfg.php b/ajax/openvpn/del_ovpncfg.php
index 1d6241aa..4046149d 100644
--- a/ajax/openvpn/del_ovpncfg.php
+++ b/ajax/openvpn/del_ovpncfg.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 require_once '../../includes/functions.php';
 
diff --git a/ajax/plugins/do_plugin_install.php b/ajax/plugins/do_plugin_install.php
index 1ec5f93a..7055ee9d 100755
--- a/ajax/plugins/do_plugin_install.php
+++ b/ajax/plugins/do_plugin_install.php
@@ -1,11 +1,8 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
-require_once '../../src/RaspAP/Plugins/PluginInstaller.php';
 
 $pluginInstaller = \RaspAP\Plugins\PluginInstaller::getInstance();
 $plugin_uri = $_POST['plugin_uri'] ?? null;
diff --git a/ajax/session/do_check_session.php b/ajax/session/do_check_session.php
index cdd0d4ac..ea87b754 100755
--- a/ajax/session/do_check_session.php
+++ b/ajax/session/do_check_session.php
@@ -1,9 +1,7 @@
 <?php
-
-require '../../includes/csrf.php';
+require_once '../../includes/autoload.php';
 require_once '../../includes/session.php';
 require_once '../../includes/config.php';
-require_once '../../src/RaspAP/Auth/HTTPAuth.php';
 require_once '../../includes/authenticate.php';
 
 $lastActivity = $_SESSION['lastActivity'] ?? time();