diff --git a/api.php b/api.php
index 3c3ad7d1..0d0ac959 100644
--- a/api.php
+++ b/api.php
@@ -1,7 +1,7 @@
 <?php
     $api = true;
-    require "php/password.php";
-    require "php/auth.php";
+    require "scripts/pi-hole/php/password.php";
+    require "scripts/pi-hole/php/auth.php";
 
     check_cors();
 
diff --git a/footer.php b/footer.php
index 1fc8a1c4..8f60954d 100644
--- a/footer.php
+++ b/footer.php
@@ -42,7 +42,7 @@
 <script src="scripts/vendor/dataTables.bootstrap.min.js"></script>
 <script src="scripts/vendor/Chart.bundle.min.js"></script>
 
-<script src="scripts/pi-hole/footer.js"></script>
+<script src="scripts/pi-hole/js/footer.js"></script>
 
 </body>
 </html>
diff --git a/gravity.php b/gravity.php
index c3907893..fc5c722e 100644
--- a/gravity.php
+++ b/gravity.php
@@ -24,4 +24,4 @@
 ?>
 
 
-<script src="scripts/pi-hole/gravity.js"></script>
+<script src="scripts/pi-hole/js/gravity.js"></script>
diff --git a/header.php b/header.php
index 19ce476b..6a6cd4fa 100644
--- a/header.php
+++ b/header.php
@@ -1,6 +1,6 @@
 <?php
-    require "php/auth.php";
-    require "php/password.php";
+    require "scripts/pi-hole/php/auth.php";
+    require "scripts/pi-hole/php/password.php";
 
     check_cors();
 
@@ -129,7 +129,7 @@
         <p>To enable Javascript click <a href="http://www.enable-javascript.com/" target="_blank">here</a></p><label for="js-hide">Close</label></div>
 </div>
 <!-- /JS Warning -->
-<script src="scripts/pi-hole/header.js"></script>
+<script src="scripts/pi-hole/js/header.js"></script>
 <!-- Send token to JS -->
 <div id="token" hidden><?php echo $token ?></div>
 <div class="wrapper">
@@ -380,7 +380,7 @@
     // If auth is required and not set, i.e. no successfully logged in,
     // we show the reduced version of the summary (index) page
     if(!$auth && (!isset($indexpage) || isset($_GET['login']))){
-        require "php/loginpage.php";
+        require "scripts/pi-hole/php/loginpage.php";
         require "footer.php";
         exit();
     }
diff --git a/help.php b/help.php
index 70d61f55..fcfabdcc 100644
--- a/help.php
+++ b/help.php
@@ -149,4 +149,4 @@
     require "footer.php";
 ?>
 
-<script src="scripts/pi-hole/help.js"></script>
+<script src="scripts/pi-hole/js/help.js"></script>
diff --git a/index.php b/index.php
index f3af7c54..695ec599 100644
--- a/index.php
+++ b/index.php
@@ -216,4 +216,4 @@ else
     require "footer.php";
 ?>
 
-<script src="scripts/pi-hole/index.js"></script>
+<script src="scripts/pi-hole/js/index.js"></script>
diff --git a/list.php b/list.php
index 1408a6ed..38194b56 100644
--- a/list.php
+++ b/list.php
@@ -55,4 +55,4 @@ function getFullName() {
 require "footer.php";
 ?>
 
-<script src="scripts/pi-hole/list.js"></script>
+<script src="scripts/pi-hole/js/list.js"></script>
diff --git a/queries.php b/queries.php
index 7d1cbc2a..5fe9681f 100644
--- a/queries.php
+++ b/queries.php
@@ -100,4 +100,4 @@ if(isset($setupVars["API_QUERY_LOG_SHOW"]))
     require "footer.php";
 ?>
 
-<script src="scripts/pi-hole/queries.js"></script>
+<script src="scripts/pi-hole/js/queries.js"></script>
diff --git a/queryads.php b/queryads.php
index 3bfc7adf..4b8c9628 100644
--- a/queryads.php
+++ b/queryads.php
@@ -22,4 +22,4 @@
 ?>
 
 
-<script src="scripts/pi-hole/queryads.js"></script>
+<script src="scripts/pi-hole/js/queryads.js"></script>
diff --git a/scripts/pi-hole/footer.js b/scripts/pi-hole/js/footer.js
similarity index 100%
rename from scripts/pi-hole/footer.js
rename to scripts/pi-hole/js/footer.js
diff --git a/scripts/pi-hole/gravity.js b/scripts/pi-hole/js/gravity.js
similarity index 100%
rename from scripts/pi-hole/gravity.js
rename to scripts/pi-hole/js/gravity.js
diff --git a/scripts/pi-hole/header.js b/scripts/pi-hole/js/header.js
similarity index 100%
rename from scripts/pi-hole/header.js
rename to scripts/pi-hole/js/header.js
diff --git a/scripts/pi-hole/help.js b/scripts/pi-hole/js/help.js
similarity index 100%
rename from scripts/pi-hole/help.js
rename to scripts/pi-hole/js/help.js
diff --git a/scripts/pi-hole/index.js b/scripts/pi-hole/js/index.js
similarity index 100%
rename from scripts/pi-hole/index.js
rename to scripts/pi-hole/js/index.js
diff --git a/scripts/pi-hole/list.js b/scripts/pi-hole/js/list.js
similarity index 100%
rename from scripts/pi-hole/list.js
rename to scripts/pi-hole/js/list.js
diff --git a/scripts/pi-hole/queries.js b/scripts/pi-hole/js/queries.js
similarity index 100%
rename from scripts/pi-hole/queries.js
rename to scripts/pi-hole/js/queries.js
diff --git a/scripts/pi-hole/queryads.js b/scripts/pi-hole/js/queryads.js
similarity index 100%
rename from scripts/pi-hole/queryads.js
rename to scripts/pi-hole/js/queryads.js
diff --git a/scripts/pi-hole/settings.js b/scripts/pi-hole/js/settings.js
similarity index 100%
rename from scripts/pi-hole/settings.js
rename to scripts/pi-hole/js/settings.js
diff --git a/php/add.php b/scripts/pi-hole/php/add.php
similarity index 100%
rename from php/add.php
rename to scripts/pi-hole/php/add.php
diff --git a/php/auth.php b/scripts/pi-hole/php/auth.php
similarity index 100%
rename from php/auth.php
rename to scripts/pi-hole/php/auth.php
diff --git a/php/func.php b/scripts/pi-hole/php/func.php
similarity index 100%
rename from php/func.php
rename to scripts/pi-hole/php/func.php
diff --git a/php/get.php b/scripts/pi-hole/php/get.php
similarity index 100%
rename from php/get.php
rename to scripts/pi-hole/php/get.php
diff --git a/php/gravity.sh.php b/scripts/pi-hole/php/gravity.sh.php
similarity index 100%
rename from php/gravity.sh.php
rename to scripts/pi-hole/php/gravity.sh.php
diff --git a/php/loginpage.php b/scripts/pi-hole/php/loginpage.php
similarity index 100%
rename from php/loginpage.php
rename to scripts/pi-hole/php/loginpage.php
diff --git a/php/password.php b/scripts/pi-hole/php/password.php
similarity index 100%
rename from php/password.php
rename to scripts/pi-hole/php/password.php
diff --git a/php/queryads.php b/scripts/pi-hole/php/queryads.php
similarity index 100%
rename from php/queryads.php
rename to scripts/pi-hole/php/queryads.php
diff --git a/php/savesettings.php b/scripts/pi-hole/php/savesettings.php
similarity index 100%
rename from php/savesettings.php
rename to scripts/pi-hole/php/savesettings.php
diff --git a/php/sub.php b/scripts/pi-hole/php/sub.php
similarity index 100%
rename from php/sub.php
rename to scripts/pi-hole/php/sub.php
diff --git a/settings.php b/settings.php
index 3a4457f3..75ae1df2 100644
--- a/settings.php
+++ b/settings.php
@@ -1,6 +1,6 @@
 <?php
 	require "header.php";
-	require "php/savesettings.php";
+	require "scripts/pi-hole/php/savesettings.php";
 	// Reread ini file as things might have been changed
 	$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
 ?>
@@ -506,5 +506,5 @@
 <script src="scripts/vendor/jquery.inputmask.js"></script>
 <script src="scripts/vendor/jquery.inputmask.extensions.js"></script>
 <script src="scripts/vendor/jquery.confirm.min.js"></script>
-<script src="scripts/pi-hole/settings.js"></script>
+<script src="scripts/pi-hole/js/settings.js"></script>