diff --git a/agent/includes/inc_all_user.php b/agent/includes/inc_all_user.php
deleted file mode 100644
index 7830a69f..00000000
--- a/agent/includes/inc_all_user.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-require_once "../config.php";
-require_once "../functions.php";
-require_once "../includes/router.php";
-require_once "../includes/check_login.php";
-require_once "../includes/page_title.php";
-require_once "../includes/header.php";
-require_once "../includes/top_nav.php";
-require_once "includes/user_side_nav.php";
-require_once "../includes/inc_wrapper.php";
-require_once "../includes/inc_alert_feedback.php";
-require_once "../includes/filter_header.php";
-
diff --git a/agent/user/includes/inc_all_user.php b/agent/user/includes/inc_all_user.php
new file mode 100644
index 00000000..9c9f6c96
--- /dev/null
+++ b/agent/user/includes/inc_all_user.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/router.php";
+require_once "../../includes/check_login.php";
+require_once "../../includes/page_title.php";
+require_once "../../includes/header.php";
+require_once "../../includes/top_nav.php";
+require_once "includes/user_side_nav.php";
+require_once "../../includes/inc_wrapper.php";
+require_once "../../includes/inc_alert_feedback.php";
+require_once "../../includes/filter_header.php";
+
diff --git a/agent/includes/user_side_nav.php b/agent/user/includes/user_side_nav.php
similarity index 96%
rename from agent/includes/user_side_nav.php
rename to agent/user/includes/user_side_nav.php
index 45ca3ce9..d7d38eb3 100644
--- a/agent/includes/user_side_nav.php
+++ b/agent/user/includes/user_side_nav.php
@@ -1,7 +1,7 @@
 <!-- Main Sidebar Container -->
 <aside class="main-sidebar sidebar-dark-<?php echo nullable_htmlentities($config_theme); ?> d-print-none">
 
-    <a class="brand-link pb-1 mt-1" href="clients.php">    
+    <a class="brand-link pb-1 mt-1" href="../<?php echo $config_start_page ?>">  
         <p class="h5">
             <i class="nav-icon fas fa-arrow-left ml-3 mr-2"></i> 
             <span class="brand-text">
@@ -55,3 +55,4 @@
     </div>
     <!-- /.sidebar -->
 </aside>
+
diff --git a/agent/user/post.php b/agent/user/post.php
new file mode 100644
index 00000000..50b8332b
--- /dev/null
+++ b/agent/user/post.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * ITFlow - User GET/POST request handler
+ */
+
+require_once "../../config.php";
+require_once "../../functions.php";
+require_once "../../includes/check_login.php";
+
+// Define a variable that we can use to only allow running post files via inclusion (prevents people/bots poking them)
+define('FROM_POST_HANDLER', true);
+
+
+// Determine which files we should load
+
+// Parse URL & get the path
+$path = parse_url($_SERVER['HTTP_REFERER'], PHP_URL_PATH);
+
+// Get the base name (the page name)
+$module = explode(".", basename($path))[0];
+
+// Strip off any _details bits
+$module = str_ireplace('_details', '', $module);
+
+// Dynamically load admin-related module POST logic
+
+// Load all module POST logic
+//  Loads everything in post/user/
+//  Eventually, it would be nice to only specifically load what we need like we do for admins
+
+foreach (glob("post/*.php") as $user_module) {
+    if (!preg_match('/_model\.php$/', basename($user_module))) {
+        require_once $user_module;
+    }
+}
+
+
+// Logout is the same for user and admin
+require_once "../../post/logout.php";
+
+// TODO: Find a home for these
+
+require_once "../../post/ai.php";
+require_once "../../post/misc.php";
+
diff --git a/agent/post/profile.php b/agent/user/post/profile.php
similarity index 99%
rename from agent/post/profile.php
rename to agent/user/post/profile.php
index 2944eba1..d8a86397 100644
--- a/agent/post/profile.php
+++ b/agent/user/post/profile.php
@@ -55,7 +55,7 @@ if (isset($_POST['edit_your_user_details'])) {
             $file_tmp_path = $_FILES['avatar']['tmp_name'];
 
             // directory in which the uploaded file will be moved
-            $upload_file_dir = "../uploads/users/$session_user_id/";
+            $upload_file_dir = "../../uploads/users/$session_user_id/";
             $dest_path = $upload_file_dir . $new_file_name;
             move_uploaded_file($file_tmp_path, $dest_path);
 
diff --git a/agent/user_activity.php b/agent/user/user_activity.php
similarity index 95%
rename from agent/user_activity.php
rename to agent/user/user_activity.php
index de10e259..fe3f07e2 100644
--- a/agent/user_activity.php
+++ b/agent/user/user_activity.php
@@ -90,10 +90,10 @@ $sql_recent_logs = mysqli_query($mysqli, "SELECT * FROM logs
     </table>
     <?php if (isset($session_is_admin) && $session_is_admin === true) { ?>
         <div class="card-footer">
-            <a href="../admin/audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
+            <a href="../../admin/audit_log.php?q=<?php echo nullable_htmlentities($session_name); ?>">See More...</a>
         </div>
     <?php } ?>
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/agent/user_details.php b/agent/user/user_details.php
similarity index 96%
rename from agent/user_details.php
rename to agent/user/user_details.php
index 5b5e7a97..d5c1ac25 100644
--- a/agent/user_details.php
+++ b/agent/user/user_details.php
@@ -15,7 +15,7 @@ require_once "includes/inc_all_user.php";
             <div class="row">
                 <div class="col-md-3 text-center">
                     <?php if($session_avatar) { ?>
-                    <img class="img-thumbnail" src="<?php echo "../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
+                    <img class="img-thumbnail" src="<?php echo "../../uploads/users/$session_user_id/" . nullable_htmlentities($session_avatar); ?>">
                     <a href="post.php?clear_your_user_avatar&csrf_token=<?= $_SESSION['csrf_token'] ?>" class="btn btn-outline-danger btn-block">Remove Avatar</a>
                     <hr>
                     <?php } ?>
@@ -78,4 +78,4 @@ require_once "includes/inc_all_user.php";
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/agent/user_preferences.php b/agent/user/user_preferences.php
similarity index 98%
rename from agent/user_preferences.php
rename to agent/user/user_preferences.php
index 9f968fc9..6730a369 100644
--- a/agent/user_preferences.php
+++ b/agent/user/user_preferences.php
@@ -51,4 +51,4 @@ $user_config_calendar_first_day = intval($row['user_config_calendar_first_day'])
 </div>
 
 <?php
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/agent/user_security.php b/agent/user/user_security.php
similarity index 97%
rename from agent/user_security.php
rename to agent/user/user_security.php
index 81b91d9f..3199f58c 100644
--- a/agent/user_security.php
+++ b/agent/user/user_security.php
@@ -38,7 +38,7 @@ $remember_token_count = mysqli_num_rows($sql_remember_tokens);
                     <i class="fas fa-lock mr-2"></i>Enable MFA
                 </button>
 
-                <?php require_once "modals/user_mfa_modal.php"; ?>
+                <?php require_once "/modals/user_mfa_modal.php"; ?>
             
             <?php } else { ?>
                 <a href="post.php?disable_mfa&csrf_token=<?php echo $_SESSION['csrf_token'] ?>" class="btn btn-danger"><i class="fas fa-unlock mr-2"></i>Disable MFA</a>
@@ -97,4 +97,4 @@ if (!empty($_SESSION['show_mfa_modal'])) {
     unset($_SESSION['show_mfa_modal']);
 }
 
-require_once "../includes/footer.php";
+require_once "../../includes/footer.php";
diff --git a/includes/top_nav.php b/includes/top_nav.php
index 511302c0..e5535b6f 100644
--- a/includes/top_nav.php
+++ b/includes/top_nav.php
@@ -104,8 +104,8 @@
                     <?php if ($session_is_admin) { ?>
                         <a href="../../admin" class="btn btn-default btn-block btn-flat mb-2"><i class="fas fa-user-shield mr-2"></i>Administration</a>
                     <?php } ?>
-                    <a href="../../agent/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
-                    <a href="../post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
+                    <a href="../../agent/user/user_details.php" class="btn btn-default btn-flat"><i class="fas fa-user-cog mr-2"></i>Account</a>
+                    <a href="post.php?logout" class="btn btn-default btn-flat float-right"><i class="fas fa-sign-out-alt mr-2"></i>Logout</a>
                 </li>
             </ul>
         </li>