diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 12c00d2a..05faa270 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
     rev: 2.4.0
     hooks:
       - id: editorconfig-checker
-        exclude: ^(LICENSE|allianceauth\/static\/css\/themes\/bootstrap-locals.less|allianceauth\/eveonline\/swagger.json|(.*.po)|(.*.mo))
+        exclude: ^(LICENSE|allianceauth\/static\/allianceauth\/css\/themes\/bootstrap-locals.less|allianceauth\/eveonline\/swagger.json|(.*.po)|(.*.mo))
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v2.34.0
diff --git a/allianceauth/static/css/auth-base.css b/allianceauth/static/allianceauth/css/auth-base.css
similarity index 100%
rename from allianceauth/static/css/auth-base.css
rename to allianceauth/static/allianceauth/css/auth-base.css
diff --git a/allianceauth/static/css/checkbox.css b/allianceauth/static/allianceauth/css/checkbox.css
similarity index 100%
rename from allianceauth/static/css/checkbox.css
rename to allianceauth/static/allianceauth/css/checkbox.css
diff --git a/allianceauth/static/css/themes/bootstrap-locals.less b/allianceauth/static/allianceauth/css/themes/bootstrap-locals.less
similarity index 100%
rename from allianceauth/static/css/themes/bootstrap-locals.less
rename to allianceauth/static/allianceauth/css/themes/bootstrap-locals.less
diff --git a/allianceauth/static/css/themes/darkly/LICENSE b/allianceauth/static/allianceauth/css/themes/darkly/LICENSE
similarity index 100%
rename from allianceauth/static/css/themes/darkly/LICENSE
rename to allianceauth/static/allianceauth/css/themes/darkly/LICENSE
diff --git a/allianceauth/static/css/themes/darkly/darkly.less b/allianceauth/static/allianceauth/css/themes/darkly/darkly.less
similarity index 100%
rename from allianceauth/static/css/themes/darkly/darkly.less
rename to allianceauth/static/allianceauth/css/themes/darkly/darkly.less
diff --git a/allianceauth/static/css/themes/darkly/darkly.min.css b/allianceauth/static/allianceauth/css/themes/darkly/darkly.min.css
similarity index 100%
rename from allianceauth/static/css/themes/darkly/darkly.min.css
rename to allianceauth/static/allianceauth/css/themes/darkly/darkly.min.css
diff --git a/allianceauth/static/css/themes/flatly-shared.less b/allianceauth/static/allianceauth/css/themes/flatly-shared.less
similarity index 100%
rename from allianceauth/static/css/themes/flatly-shared.less
rename to allianceauth/static/allianceauth/css/themes/flatly-shared.less
diff --git a/allianceauth/static/css/themes/flatly/LICENSE b/allianceauth/static/allianceauth/css/themes/flatly/LICENSE
similarity index 100%
rename from allianceauth/static/css/themes/flatly/LICENSE
rename to allianceauth/static/allianceauth/css/themes/flatly/LICENSE
diff --git a/allianceauth/static/css/themes/flatly/flatly.less b/allianceauth/static/allianceauth/css/themes/flatly/flatly.less
similarity index 100%
rename from allianceauth/static/css/themes/flatly/flatly.less
rename to allianceauth/static/allianceauth/css/themes/flatly/flatly.less
diff --git a/allianceauth/static/css/themes/flatly/flatly.min.css b/allianceauth/static/allianceauth/css/themes/flatly/flatly.min.css
similarity index 100%
rename from allianceauth/static/css/themes/flatly/flatly.min.css
rename to allianceauth/static/allianceauth/css/themes/flatly/flatly.min.css
diff --git a/allianceauth/static/icons/allianceauth.png b/allianceauth/static/allianceauth/icons/allianceauth.png
similarity index 100%
rename from allianceauth/static/icons/allianceauth.png
rename to allianceauth/static/allianceauth/icons/allianceauth.png
diff --git a/allianceauth/static/icons/apple-touch-icon.png b/allianceauth/static/allianceauth/icons/apple-touch-icon.png
similarity index 100%
rename from allianceauth/static/icons/apple-touch-icon.png
rename to allianceauth/static/allianceauth/icons/apple-touch-icon.png
diff --git a/allianceauth/static/icons/favicon-16x16.png b/allianceauth/static/allianceauth/icons/favicon-16x16.png
similarity index 100%
rename from allianceauth/static/icons/favicon-16x16.png
rename to allianceauth/static/allianceauth/icons/favicon-16x16.png
diff --git a/allianceauth/static/icons/favicon-32x32.png b/allianceauth/static/allianceauth/icons/favicon-32x32.png
similarity index 100%
rename from allianceauth/static/icons/favicon-32x32.png
rename to allianceauth/static/allianceauth/icons/favicon-32x32.png
diff --git a/allianceauth/static/icons/favicon-96x96.png b/allianceauth/static/allianceauth/icons/favicon-96x96.png
similarity index 100%
rename from allianceauth/static/icons/favicon-96x96.png
rename to allianceauth/static/allianceauth/icons/favicon-96x96.png
diff --git a/allianceauth/static/js/eve-time.js b/allianceauth/static/allianceauth/js/eve-time.js
similarity index 100%
rename from allianceauth/static/js/eve-time.js
rename to allianceauth/static/allianceauth/js/eve-time.js
diff --git a/allianceauth/static/js/filterDropDown/filterDropDown.min.js b/allianceauth/static/allianceauth/js/filterDropDown/filterDropDown.min.js
similarity index 100%
rename from allianceauth/static/js/filterDropDown/filterDropDown.min.js
rename to allianceauth/static/allianceauth/js/filterDropDown/filterDropDown.min.js
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_444444_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_555555_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777620_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_777777_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_cc0000_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/images/ui-icons_ffffff_256x240.png
diff --git a/allianceauth/static/js/jquery-ui/1.12.1/css/jquery-ui.min.css b/allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/jquery-ui.min.css
similarity index 100%
rename from allianceauth/static/js/jquery-ui/1.12.1/css/jquery-ui.min.css
rename to allianceauth/static/allianceauth/js/jquery-ui/1.12.1/css/jquery-ui.min.css
diff --git a/allianceauth/static/js/refresh_notifications.js b/allianceauth/static/allianceauth/js/refresh_notifications.js
similarity index 100%
rename from allianceauth/static/js/refresh_notifications.js
rename to allianceauth/static/allianceauth/js/refresh_notifications.js
diff --git a/allianceauth/static/js/timers.js b/allianceauth/static/allianceauth/js/timers.js
similarity index 100%
rename from allianceauth/static/js/timers.js
rename to allianceauth/static/allianceauth/js/timers.js