From 1e922a8b2934f1c4f5bdf35e02ea6c2e965b9c57 Mon Sep 17 00:00:00 2001
From: yubiuser <github@yubiuser.dev>
Date: Mon, 28 Oct 2024 20:22:09 +0100
Subject: [PATCH] Move all files from /scripts/pi-hole/ to /scripts/

Signed-off-by: yubiuser <github@yubiuser.dev>
---
 error403.lp                                       |  2 +-
 error404.lp                                       |  2 +-
 gravity.lp                                        |  6 +++---
 groups-clients.lp                                 | 10 +++++-----
 groups-domains.lp                                 |  8 ++++----
 groups-lists.lp                                   |  8 ++++----
 groups.lp                                         |  8 ++++----
 index.lp                                          |  8 ++++----
 interfaces.lp                                     |  6 +++---
 login.lp                                          |  6 +++---
 messages.lp                                       |  6 +++---
 network.lp                                        |  8 ++++----
 package.json                                      |  8 ++++----
 queries.lp                                        |  8 ++++----
 scripts/{pi-hole => }/js/charts.js                |  0
 scripts/{pi-hole => }/js/debug.js                 |  4 ++--
 scripts/{pi-hole => }/js/footer.js                |  0
 scripts/{pi-hole => }/js/gravity.js               |  0
 scripts/{pi-hole => }/js/groups-clients.js        |  0
 scripts/{pi-hole => }/js/groups-common.js         |  0
 scripts/{pi-hole => }/js/groups-domains.js        |  0
 scripts/{pi-hole => }/js/groups-lists.js          |  0
 scripts/{pi-hole => }/js/groups.js                |  0
 scripts/{pi-hole => }/js/index.js                 |  0
 scripts/{pi-hole => }/js/interfaces.js            |  0
 scripts/{pi-hole => }/js/ip-address-sorting.js    |  0
 scripts/{pi-hole => }/js/login.js                 |  0
 scripts/{pi-hole => }/js/logout.js                |  0
 scripts/{pi-hole => }/js/messages.js              |  0
 scripts/{pi-hole => }/js/network.js               |  0
 scripts/{pi-hole => }/js/queries.js               |  0
 scripts/{pi-hole => }/js/search.js                |  0
 scripts/{pi-hole => }/js/settings-advanced.js     |  0
 scripts/{pi-hole => }/js/settings-api.js          |  0
 scripts/{pi-hole => }/js/settings-dhcp.js         |  0
 scripts/{pi-hole => }/js/settings-dns-records.js  |  0
 scripts/{pi-hole => }/js/settings-dns.js          |  0
 scripts/{pi-hole => }/js/settings-privacy.js      |  0
 scripts/{pi-hole => }/js/settings-system.js       |  0
 scripts/{pi-hole => }/js/settings-teleporter.js   |  0
 scripts/{pi-hole => }/js/settings.js              |  0
 scripts/{pi-hole => }/js/taillog.js               |  0
 scripts/{pi-hole => }/js/utils.js                 |  0
 scripts/{pi-hole => }/lua/footer.lp               |  2 +-
 scripts/{pi-hole => }/lua/header.lp               |  2 +-
 scripts/{pi-hole => }/lua/header_authenticated.lp |  2 +-
 scripts/{pi-hole => }/lua/settings_header.lp      |  0
 scripts/{pi-hole => }/lua/sidebar.lp              |  0
 search.lp                                         |  6 +++---
 settings-all.lp                                   | 10 +++++-----
 settings-api.lp                                   | 10 +++++-----
 settings-dhcp.lp                                  | 12 ++++++------
 settings-dns.lp                                   | 10 +++++-----
 settings-dnsrecords.lp                            | 12 ++++++------
 settings-privacy.lp                               | 10 +++++-----
 settings-system.lp                                | 12 ++++++------
 settings-teleporter.lp                            | 10 +++++-----
 taillog.lp                                        |  6 +++---
 58 files changed, 101 insertions(+), 101 deletions(-)
 rename scripts/{pi-hole => }/js/charts.js (100%)
 rename scripts/{pi-hole => }/js/debug.js (91%)
 rename scripts/{pi-hole => }/js/footer.js (100%)
 rename scripts/{pi-hole => }/js/gravity.js (100%)
 rename scripts/{pi-hole => }/js/groups-clients.js (100%)
 rename scripts/{pi-hole => }/js/groups-common.js (100%)
 rename scripts/{pi-hole => }/js/groups-domains.js (100%)
 rename scripts/{pi-hole => }/js/groups-lists.js (100%)
 rename scripts/{pi-hole => }/js/groups.js (100%)
 rename scripts/{pi-hole => }/js/index.js (100%)
 rename scripts/{pi-hole => }/js/interfaces.js (100%)
 rename scripts/{pi-hole => }/js/ip-address-sorting.js (100%)
 rename scripts/{pi-hole => }/js/login.js (100%)
 rename scripts/{pi-hole => }/js/logout.js (100%)
 rename scripts/{pi-hole => }/js/messages.js (100%)
 rename scripts/{pi-hole => }/js/network.js (100%)
 rename scripts/{pi-hole => }/js/queries.js (100%)
 rename scripts/{pi-hole => }/js/search.js (100%)
 rename scripts/{pi-hole => }/js/settings-advanced.js (100%)
 rename scripts/{pi-hole => }/js/settings-api.js (100%)
 rename scripts/{pi-hole => }/js/settings-dhcp.js (100%)
 rename scripts/{pi-hole => }/js/settings-dns-records.js (100%)
 rename scripts/{pi-hole => }/js/settings-dns.js (100%)
 rename scripts/{pi-hole => }/js/settings-privacy.js (100%)
 rename scripts/{pi-hole => }/js/settings-system.js (100%)
 rename scripts/{pi-hole => }/js/settings-teleporter.js (100%)
 rename scripts/{pi-hole => }/js/settings.js (100%)
 rename scripts/{pi-hole => }/js/taillog.js (100%)
 rename scripts/{pi-hole => }/js/utils.js (100%)
 rename scripts/{pi-hole => }/lua/footer.lp (97%)
 rename scripts/{pi-hole => }/lua/header.lp (98%)
 rename scripts/{pi-hole => }/lua/header_authenticated.lp (98%)
 rename scripts/{pi-hole => }/lua/settings_header.lp (100%)
 rename scripts/{pi-hole => }/lua/sidebar.lp (100%)

diff --git a/error403.lp b/error403.lp
index d071669f..82144646 100644
--- a/error403.lp
+++ b/error403.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header.lp','r')
+mg.include('scripts/lua/header.lp','r')
 ?>
 <body class="hold-transition layout-boxed login-page">
     <div class="box login-box">
diff --git a/error404.lp b/error404.lp
index 394e1a89..4aed89b5 100644
--- a/error404.lp
+++ b/error404.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header.lp','r')
+mg.include('scripts/lua/header.lp','r')
 ?>
 <body class="hold-transition layout-boxed login-page">
     <div class="box login-box">
diff --git a/gravity.lp b/gravity.lp
index 063125d8..c2312acd 100644
--- a/gravity.lp
+++ b/gravity.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -27,5 +27,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 <button type="button" id="gravityBtn" class="btn btn-lg btn-primary btn-block">Update</button>
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/gravity.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/gravity.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-clients.lp b/groups-clients.lp
index e0fd29c7..2ffbea9b 100644
--- a/groups-clients.lp
+++ b/groups-clients.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <!-- Title -->
@@ -93,8 +93,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-clients.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-clients.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-domains.lp b/groups-domains.lp
index 80d4a8c8..59d460f1 100644
--- a/groups-domains.lp
+++ b/groups-domains.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <!-- Title -->
@@ -150,7 +150,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-domains.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-domains.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups-lists.lp b/groups-lists.lp
index 4fb0c73d..4803e37f 100644
--- a/groups-lists.lp
+++ b/groups-lists.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <!-- Title -->
@@ -92,7 +92,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-lists.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-lists.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/groups.lp b/groups.lp
index 0e70f5d9..06db01da 100644
--- a/groups.lp
+++ b/groups.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <!-- Title -->
@@ -81,7 +81,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups-common.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/groups.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups-common.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/groups.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/index.lp b/index.lp
index 3cb316ef..a5b3ab83 100644
--- a/index.lp
+++ b/index.lp
@@ -8,7 +8,7 @@
 --]]
 
 indexpage = true
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <!-- Small boxes (Stat box) -->
 <div class="row">
@@ -279,7 +279,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/index.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/index.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/interfaces.lp b/interfaces.lp
index b4341c99..d3f1a915 100644
--- a/interfaces.lp
+++ b/interfaces.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -32,5 +32,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/interfaces.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/interfaces.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/login.lp b/login.lp
index 1d572260..32605a4e 100644
--- a/login.lp
+++ b/login.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header.lp','r')
+mg.include('scripts/lua/header.lp','r')
 ?>
 <body class="hold-transition layout-boxed login-page">
 <div class="box login-box" id="login-box">
@@ -120,7 +120,7 @@ mg.include('scripts/pi-hole/lua/header.lp','r')
         <strong><a href="https://pi-hole.net/donate/" rel="noopener" target="_blank"><i class="fa fa-heart text-red"></i> Donate</a></strong> if you found this useful.
     </div>
 </div>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/login.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/footer.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/login.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
 </body>
 </html>
diff --git a/messages.lp b/messages.lp
index d96999d9..23968958 100644
--- a/messages.lp
+++ b/messages.lp
@@ -7,7 +7,7 @@
 *    Please see LICENSE file for your rights under this license.
 */ ]]--
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <!-- Title -->
@@ -41,6 +41,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/messages.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/messages.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/network.lp b/network.lp
index 5c26559f..75545221 100644
--- a/network.lp
+++ b/network.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 
 <div class="row">
@@ -64,7 +64,7 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 </div>
 <!-- /.row -->
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/network.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/network.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/package.json b/package.json
index 1404f2bd..f173bc27 100644
--- a/package.json
+++ b/package.json
@@ -16,11 +16,11 @@
   "homepage": "https://github.com/pi-hole/web#readme",
   "scripts": {
     "prefix": "postcss \"style/*.css\" \"style/themes/*.css\" --use autoprefixer --no-map --replace",
-    "prettier:check": "prettier -l \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**/*.js\"",
-    "prettier:fix": "prettier --write \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**/*.js\"",
+    "prettier:check": "prettier -l \"style/*.css\" \"style/themes/*.css\" \"scripts/**/*.js\"",
+    "prettier:fix": "prettier --write \"style/*.css\" \"style/themes/*.css\" \"scripts/**/*.js\"",
     "xo": "xo",
-    "xo:check": "npm run xo -- \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**\"",
-    "xo:fix": "npm run xo -- --fix \"style/*.css\" \"style/themes/*.css\" \"scripts/pi-hole/**\"",
+    "xo:check": "npm run xo -- \"style/*.css\" \"style/themes/*.css\" \"scripts/**\"",
+    "xo:fix": "npm run xo -- --fix \"style/*.css\" \"style/themes/*.css\" \"scripts/**\"",
     "test": "npm run prettier:check && npm run xo:check",
     "testpr": "npm run prettier:fix && git diff --ws-error-highlight=all --color=always --exit-code && npm run xo:check"
   },
diff --git a/queries.lp b/queries.lp
index 3c5b9d01..baeaa1b4 100644
--- a/queries.lp
+++ b/queries.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <!-- Alert Modal -->
 <div id="alertModal" class="modal fade" role="dialog" data-backdrop="static" data-keyboard="false">
@@ -195,8 +195,8 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 <!-- /.row -->
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-select/bootstrap-select.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/daterangepicker/daterangepicker.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/queries.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/queries.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/scripts/pi-hole/js/charts.js b/scripts/js/charts.js
similarity index 100%
rename from scripts/pi-hole/js/charts.js
rename to scripts/js/charts.js
diff --git a/scripts/pi-hole/js/debug.js b/scripts/js/debug.js
similarity index 91%
rename from scripts/pi-hole/js/debug.js
rename to scripts/js/debug.js
index 314588ba..022f6b95 100644
--- a/scripts/pi-hole/js/debug.js
+++ b/scripts/js/debug.js
@@ -26,7 +26,7 @@ function eventsource() {
   if (typeof EventSource !== "function") {
     $.ajax({
       method: "GET",
-      url: "scripts/pi-hole/php/debug.php?IE&token=" + token + checked,
+      url: "scripts/php/debug.php?IE&token=" + token + checked,
       async: false,
     }).done(function (data) {
       ta.show();
@@ -36,7 +36,7 @@ function eventsource() {
     return;
   }
 
-  var source = new EventSource("scripts/pi-hole/php/debug.php?&token=" + token + checked);
+  var source = new EventSource("scripts/php/debug.php?&token=" + token + checked);
 
   // Reset and show field
   ta.empty();
diff --git a/scripts/pi-hole/js/footer.js b/scripts/js/footer.js
similarity index 100%
rename from scripts/pi-hole/js/footer.js
rename to scripts/js/footer.js
diff --git a/scripts/pi-hole/js/gravity.js b/scripts/js/gravity.js
similarity index 100%
rename from scripts/pi-hole/js/gravity.js
rename to scripts/js/gravity.js
diff --git a/scripts/pi-hole/js/groups-clients.js b/scripts/js/groups-clients.js
similarity index 100%
rename from scripts/pi-hole/js/groups-clients.js
rename to scripts/js/groups-clients.js
diff --git a/scripts/pi-hole/js/groups-common.js b/scripts/js/groups-common.js
similarity index 100%
rename from scripts/pi-hole/js/groups-common.js
rename to scripts/js/groups-common.js
diff --git a/scripts/pi-hole/js/groups-domains.js b/scripts/js/groups-domains.js
similarity index 100%
rename from scripts/pi-hole/js/groups-domains.js
rename to scripts/js/groups-domains.js
diff --git a/scripts/pi-hole/js/groups-lists.js b/scripts/js/groups-lists.js
similarity index 100%
rename from scripts/pi-hole/js/groups-lists.js
rename to scripts/js/groups-lists.js
diff --git a/scripts/pi-hole/js/groups.js b/scripts/js/groups.js
similarity index 100%
rename from scripts/pi-hole/js/groups.js
rename to scripts/js/groups.js
diff --git a/scripts/pi-hole/js/index.js b/scripts/js/index.js
similarity index 100%
rename from scripts/pi-hole/js/index.js
rename to scripts/js/index.js
diff --git a/scripts/pi-hole/js/interfaces.js b/scripts/js/interfaces.js
similarity index 100%
rename from scripts/pi-hole/js/interfaces.js
rename to scripts/js/interfaces.js
diff --git a/scripts/pi-hole/js/ip-address-sorting.js b/scripts/js/ip-address-sorting.js
similarity index 100%
rename from scripts/pi-hole/js/ip-address-sorting.js
rename to scripts/js/ip-address-sorting.js
diff --git a/scripts/pi-hole/js/login.js b/scripts/js/login.js
similarity index 100%
rename from scripts/pi-hole/js/login.js
rename to scripts/js/login.js
diff --git a/scripts/pi-hole/js/logout.js b/scripts/js/logout.js
similarity index 100%
rename from scripts/pi-hole/js/logout.js
rename to scripts/js/logout.js
diff --git a/scripts/pi-hole/js/messages.js b/scripts/js/messages.js
similarity index 100%
rename from scripts/pi-hole/js/messages.js
rename to scripts/js/messages.js
diff --git a/scripts/pi-hole/js/network.js b/scripts/js/network.js
similarity index 100%
rename from scripts/pi-hole/js/network.js
rename to scripts/js/network.js
diff --git a/scripts/pi-hole/js/queries.js b/scripts/js/queries.js
similarity index 100%
rename from scripts/pi-hole/js/queries.js
rename to scripts/js/queries.js
diff --git a/scripts/pi-hole/js/search.js b/scripts/js/search.js
similarity index 100%
rename from scripts/pi-hole/js/search.js
rename to scripts/js/search.js
diff --git a/scripts/pi-hole/js/settings-advanced.js b/scripts/js/settings-advanced.js
similarity index 100%
rename from scripts/pi-hole/js/settings-advanced.js
rename to scripts/js/settings-advanced.js
diff --git a/scripts/pi-hole/js/settings-api.js b/scripts/js/settings-api.js
similarity index 100%
rename from scripts/pi-hole/js/settings-api.js
rename to scripts/js/settings-api.js
diff --git a/scripts/pi-hole/js/settings-dhcp.js b/scripts/js/settings-dhcp.js
similarity index 100%
rename from scripts/pi-hole/js/settings-dhcp.js
rename to scripts/js/settings-dhcp.js
diff --git a/scripts/pi-hole/js/settings-dns-records.js b/scripts/js/settings-dns-records.js
similarity index 100%
rename from scripts/pi-hole/js/settings-dns-records.js
rename to scripts/js/settings-dns-records.js
diff --git a/scripts/pi-hole/js/settings-dns.js b/scripts/js/settings-dns.js
similarity index 100%
rename from scripts/pi-hole/js/settings-dns.js
rename to scripts/js/settings-dns.js
diff --git a/scripts/pi-hole/js/settings-privacy.js b/scripts/js/settings-privacy.js
similarity index 100%
rename from scripts/pi-hole/js/settings-privacy.js
rename to scripts/js/settings-privacy.js
diff --git a/scripts/pi-hole/js/settings-system.js b/scripts/js/settings-system.js
similarity index 100%
rename from scripts/pi-hole/js/settings-system.js
rename to scripts/js/settings-system.js
diff --git a/scripts/pi-hole/js/settings-teleporter.js b/scripts/js/settings-teleporter.js
similarity index 100%
rename from scripts/pi-hole/js/settings-teleporter.js
rename to scripts/js/settings-teleporter.js
diff --git a/scripts/pi-hole/js/settings.js b/scripts/js/settings.js
similarity index 100%
rename from scripts/pi-hole/js/settings.js
rename to scripts/js/settings.js
diff --git a/scripts/pi-hole/js/taillog.js b/scripts/js/taillog.js
similarity index 100%
rename from scripts/pi-hole/js/taillog.js
rename to scripts/js/taillog.js
diff --git a/scripts/pi-hole/js/utils.js b/scripts/js/utils.js
similarity index 100%
rename from scripts/pi-hole/js/utils.js
rename to scripts/js/utils.js
diff --git a/scripts/pi-hole/lua/footer.lp b/scripts/lua/footer.lp
similarity index 97%
rename from scripts/pi-hole/lua/footer.lp
rename to scripts/lua/footer.lp
index d290af7f..6dcb5640 100644
--- a/scripts/pi-hole/lua/footer.lp
+++ b/scripts/lua/footer.lp
@@ -66,7 +66,7 @@ end
 
 </div>
 <!-- ./wrapper -->
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/footer.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/footer.js')?>"></script>
 
 <div id="advanced-info-data" style="display: none;" data-starttime="<?=starttime?>" data-endtime="<?=mg.time(true)?>" data-client-ip="<?=mg.request_info.remote_addr?>" data-tls="<?=tostring(is_secure)?>" data-xff="<?=x_forwarded_for?>"></div>
 </body>
diff --git a/scripts/pi-hole/lua/header.lp b/scripts/lua/header.lp
similarity index 98%
rename from scripts/pi-hole/lua/header.lp
rename to scripts/lua/header.lp
index 3dfb482b..257b046d 100644
--- a/scripts/pi-hole/lua/header.lp
+++ b/scripts/lua/header.lp
@@ -120,6 +120,6 @@ if startsWith(scriptname, 'groups') then
     <script src="<?=pihole.fileversion('vendor/adminLTE/adminlte.min.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/bootstrap-notify/bootstrap-notify.min.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/font-awesome/font-awesome.min.js')?>"></script>
-    <script src="<?=pihole.fileversion('scripts/pi-hole/js/utils.js')?>"></script>
+    <script src="<?=pihole.fileversion('scripts/js/utils.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/waitMe/waitMe.min.js')?>"></script>
     <link rel="stylesheet" href="<?=pihole.fileversion('vendor/waitMe/waitMe.min.css')?>">
diff --git a/scripts/pi-hole/lua/header_authenticated.lp b/scripts/lua/header_authenticated.lp
similarity index 98%
rename from scripts/pi-hole/lua/header_authenticated.lp
rename to scripts/lua/header_authenticated.lp
index be65a501..8c20d9c8 100644
--- a/scripts/pi-hole/lua/header_authenticated.lp
+++ b/scripts/lua/header_authenticated.lp
@@ -9,7 +9,7 @@
 ]]--
 mg.include('header.lp','r')
 ?>
-    <script src="<?=pihole.fileversion('scripts/pi-hole/js/logout.js')?>"></script>
+    <script src="<?=pihole.fileversion('scripts/js/logout.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/select2/select2.min.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/datatables/datatables.min.js')?>"></script>
     <script src="<?=pihole.fileversion('vendor/datatables-select/datatables.select.min.js')?>"></script>
diff --git a/scripts/pi-hole/lua/settings_header.lp b/scripts/lua/settings_header.lp
similarity index 100%
rename from scripts/pi-hole/lua/settings_header.lp
rename to scripts/lua/settings_header.lp
diff --git a/scripts/pi-hole/lua/sidebar.lp b/scripts/lua/sidebar.lp
similarity index 100%
rename from scripts/pi-hole/lua/sidebar.lp
rename to scripts/lua/sidebar.lp
diff --git a/search.lp b/search.lp
index 7b5a0892..01b60ae6 100644
--- a/search.lp
+++ b/search.lp
@@ -7,7 +7,7 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <!-- Title -->
 <div class="page-header">
@@ -48,5 +48,5 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
 
 <pre id="output" style="width: 100%; height: 100%;" hidden></pre>
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/search.js')?>"></script>
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<script src="<?=pihole.fileversion('scripts/js/search.js')?>"></script>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-all.lp b/settings-all.lp
index 75905fbc..f758b761 100644
--- a/settings-all.lp
+++ b/settings-all.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "All Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row settings-level-expert" id="advanced-content">
     <div class="overlay" id="advanced-overlay">
@@ -33,7 +33,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-advanced.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-advanced.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-api.lp b/settings-api.lp
index 71e0d9c1..9d9a3e90 100644
--- a/settings-api.lp
+++ b/settings-api.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "Web Interface - API Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6 settings-level-basic">
@@ -249,7 +249,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/qrious/qrious.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-api.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-api.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dhcp.lp b/settings-dhcp.lp
index 639b4d1a..196c039f 100644
--- a/settings-dhcp.lp
+++ b/settings-dhcp.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "DHCP Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <!-- DHCP Settings Box -->
@@ -226,8 +226,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dhcp.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dhcp.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dns.lp b/settings-dns.lp
index 75be8110..e400ec6c 100644
--- a/settings-dns.lp
+++ b/settings-dns.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "DNS Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-lg-6">
@@ -238,7 +238,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
     </div>
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dns.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-dnsrecords.lp b/settings-dnsrecords.lp
index e79228d8..ce3c745d 100644
--- a/settings-dnsrecords.lp
+++ b/settings-dnsrecords.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "Local DNS Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-12 col-lg-6">
@@ -109,8 +109,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-dns-records.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/ip-address-sorting.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-dns-records.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/ip-address-sorting.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-privacy.lp b/settings-privacy.lp
index 08325bce..753306ad 100644
--- a/settings-privacy.lp
+++ b/settings-privacy.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "Privacy Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6 settings-level-basic">
@@ -109,7 +109,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-privacy.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-privacy.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-system.lp b/settings-system.lp
index 5f16714d..683fb89e 100644
--- a/settings-system.lp
+++ b/settings-system.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "System Settings"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6">
@@ -318,8 +318,8 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
 <script src="<?=pihole.fileversion('vendor/jquery-confirm/jquery.confirm.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/charts.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-system.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/charts.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-system.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/settings-teleporter.lp b/settings-teleporter.lp
index e59c6a65..359ac2e1 100644
--- a/settings-teleporter.lp
+++ b/settings-teleporter.lp
@@ -7,11 +7,11 @@
 *  Please see LICENSE file for your rights under this license.
 --]]
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 
 -- Page title and level selector
 PageTitle = "Teleporter"
-mg.include('scripts/pi-hole/lua/settings_header.lp','r')
+mg.include('scripts/lua/settings_header.lp','r')
 ?>
 <div class="row">
     <div class="col-md-6">
@@ -102,7 +102,7 @@ mg.include('scripts/pi-hole/lua/settings_header.lp','r')
 </div>
 
 <script src="<?=pihole.fileversion('vendor/bootstrap-toggle/bootstrap-toggle.min.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings-teleporter.js')?>"></script>
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/settings.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings-teleporter.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/settings.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>
diff --git a/taillog.lp b/taillog.lp
index 4d0aa487..4e1c5c71 100644
--- a/taillog.lp
+++ b/taillog.lp
@@ -7,7 +7,7 @@
 *    Please see LICENSE file for your rights under this license.
 */ ]]--
 
-mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
+mg.include('scripts/lua/header_authenticated.lp','r')
 ?>
 <div class="row">
     <div class="col-md-12">
@@ -33,6 +33,6 @@ mg.include('scripts/pi-hole/lua/header_authenticated.lp','r')
     </div>
 </div>
 
-<script src="<?=pihole.fileversion('scripts/pi-hole/js/taillog.js')?>"></script>
+<script src="<?=pihole.fileversion('scripts/js/taillog.js')?>"></script>
 
-<? mg.include('scripts/pi-hole/lua/footer.lp','r')?>
+<? mg.include('scripts/lua/footer.lp','r')?>