diff --git a/admin/index.php b/admin/index.php
index 8ba2a53..0cf2476 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -87,7 +87,7 @@ session_start();
                 echo "<iframe src=\"user_management/create_safe_admin.php\" name=\"dataFrame\" class=\"dataFrame\" id=\"dataFrame\" onload=\"resizeIframe(this);\"></iframe>";
             } else { // Otherwise we'll show the nav page
                 if (!isset($_SESSION["userID"])){
-                    echo "<iframe src=\"../login_page.php?redirect=admin\" name=\"dataFrame\" class=\"dataFrame\" id=\"dataFrame\" onload=\"resizeIframe(this);\"></iframe>";
+                    echo "<iframe src=\"../user/login_page.php?redirect=admin\" name=\"dataFrame\" class=\"dataFrame\" id=\"dataFrame\" onload=\"resizeIframe(this);\"></iframe>";
                 } else if (isset($_SESSION["userID"]) && $_SESSION["privileges"] == 1) {
                     echo "<iframe src=\"admin_nav.php\" name=\"dataFrame\" class=\"dataFrame\" id=\"dataFrame\" onload=\"resizeIframe(this);\"></iframe>";
                 } else {
@@ -108,7 +108,7 @@ session_start();
                 <?php 
                 if (isset($_SESSION["userID"])){
                     echo "<a href=\"/user/" . $_SESSION["username"] . " \" class=\"subNavLink\">ACCOUNT</a>";
-                    echo "<a href=\"../logout.php?redirect=admin\" class=\"subNavLink\" id=\"loginButton\">LOGOUT</a>";
+                    echo "<a href=\"../user/logout.php?redirect=admin\" class=\"subNavLink\" id=\"loginButton\">LOGOUT</a>";
                 }
                 ?>
             </div>
diff --git a/admin/user_management/add_user.php b/admin/user_management/add_user.php
index 914afea..281c306 100644
--- a/admin/user_management/add_user.php
+++ b/admin/user_management/add_user.php
@@ -81,7 +81,7 @@
       echo "<p>Account created! You may sign in now.</p>";
       echo "<p>&nbsp;</p>";
       echo "<a href=\"/\" class=\"subNavLink\">HOME</a>";
-      echo "<a href=\"/login_page.php\" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
+      echo "<a href=\"/user/login_page.php\" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
       echo "<p>&nbsp;</p>";
       echo "</div>";
     }
diff --git a/index.php b/index.php
index e582dc7..b46c9f9 100644
--- a/index.php
+++ b/index.php
@@ -47,7 +47,7 @@ session_start();
                 if (isset($_SESSION["userID"])){
                     echo "<a href=\"/user/" . $_SESSION["username"] . " \" class=\"subNavLink\">ACCOUNT</a>";
                     echo "<a href=\"/ \" class=\"subNavLink\">HOME</a>";
-                    echo "<a href=\"/logout.php \" class=\"subNavLink\">LOGOUT</a>";
+                    echo "<a href=\"/user/logout.php \" class=\"subNavLink\">LOGOUT</a>";
                     echo "<a href=\"/admin/data_management/game_form.php \" target=\"dataFrame\" class=\"subNavLink\">ADD GAME DETAILS</a>";
                     // Anything we need to show to logged in admins will be below
                     if (isset($_SESSION["privileges"]) && $_SESSION["privileges"] == 1){
@@ -55,8 +55,8 @@ session_start();
                         echo "<a href=\"/admin \" class=\"subNavLink\">ADMIN PANEL</a>";
                     }
                 } else {
-                    echo "<a href=\"/login_page.php \" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
-                    echo "<a href=\"/create_account.php \" target=\"dataFrame\" class=\"subNavLink\">CREATE AN ACCOUNT</a>";
+                    echo "<a href=\"/user/login_page.php \" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
+                    echo "<a href=\"/user/create_account.php \" target=\"dataFrame\" class=\"subNavLink\">CREATE AN ACCOUNT</a>";
                     echo "<a href=\"/ \" class=\"subNavLink\">HOME</a>";
                 }
                 ?>
diff --git a/user/.gitignore b/user/.gitignore
deleted file mode 100644
index dd8a14d..0000000
--- a/user/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-admin/dev_db_config.php
-.htaccess
-favicon.ico
diff --git a/create_account.php b/user/create_account.php
similarity index 97%
rename from create_account.php
rename to user/create_account.php
index 7a8053c..7f70790 100644
--- a/create_account.php
+++ b/user/create_account.php
@@ -42,7 +42,7 @@ try {  // Try opening the SQL database connection
         <link rel="stylesheet" href="/styles/user_management.css" />
         <script src="/scripts/tools.js"></script>
         <script>verifyPageInFrame()</script>
-        <?php include ("admin/db_config.php");?> <!-- Our password-length variable is stored here -->
+        <?php include ("../admin/db_config.php");?> <!-- Our password-length variable is stored here -->
         <script src="/scripts/user_management.js"></script>
         <script>
             var head = document.getElementsByTagName('HEAD')[0];
diff --git a/login.php b/user/login.php
similarity index 97%
rename from login.php
rename to user/login.php
index 8db00a8..8b7f236 100644
--- a/login.php
+++ b/user/login.php
@@ -19,7 +19,7 @@ session_start();
 <body class="sqlOutput">
   <?php
   // USER-DEFINED VARIABLES
-  include("admin/db_config.php"); // Include database stuff
+  include("../admin/db_config.php"); // Include database stuff
 
   try {  // Try opening the SQL database connection
     $conn = new PDO("mysql:host=$servername; dbname=$dbName", $dbUsername, $dbPassword);
diff --git a/login_page.php b/user/login_page.php
similarity index 95%
rename from login_page.php
rename to user/login_page.php
index 18c7403..59eeb8b 100644
--- a/login_page.php
+++ b/user/login_page.php
@@ -19,7 +19,7 @@ $redirect = $_GET["redirect"];
     <body id="loginBody">
         <h3 id="loginNotice">Sign in to continue</h3>
         <div id="loginPanel">
-            <form id="loginForm" onsubmit="return verifyInput()" action="/login.php?redirect=<?php echo $redirect; ?>" method="POST">
+            <form id="loginForm" onsubmit="return verifyInput()" action="/user/login.php?redirect=<?php echo $redirect; ?>" method="POST">
                 <div id="inputArea">
                     <label for="username">Username:</label>
                     <input type="text" name="username" id="username" required>
diff --git a/logout.php b/user/logout.php
similarity index 100%
rename from logout.php
rename to user/logout.php
diff --git a/user/user.php b/user/user.php
index 7ae9928..9c9c0a2 100644
--- a/user/user.php
+++ b/user/user.php
@@ -103,9 +103,9 @@ try {  // Try opening the SQL database connection
                 <?php 
                 // If someone is logged in, give them the opportunity to log out
                 if (isset($_SESSION["userID"])){
-                    echo "<a href=\"../logout.php?redirect=\" class=\"subNavLink\" id=\"loginButton\">LOGOUT</a>";
+                    echo "<a href=\"../user/logout.php?redirect=\" class=\"subNavLink\" id=\"loginButton\">LOGOUT</a>";
                 } else {
-                    echo "<a href=\"/login_page.php \" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
+                    echo "<a href=\"/user/login_page.php \" target=\"dataFrame\" class=\"subNavLink\">SIGN IN</a>";
                     echo "<a href=\"/create_account.php \" target=\"dataFrame\" class=\"subNavLink\">CREATE AN ACCOUNT</a>";
                     echo "<a href=\"/ \" class=\"subNavLink\">HOME</a>";
                 }