diff --git a/src/media/templates/site/moko-cassiopeia/css/editor.css b/src/media/css/editor.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/editor.css
rename to src/media/css/editor.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/gable.css b/src/media/css/gable.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/gable.css
rename to src/media/css/gable.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/dark/colors_alternative.css b/src/media/css/global/dark/colors_alternative.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/dark/colors_alternative.css
rename to src/media/css/global/dark/colors_alternative.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/dark/colors_standard.css b/src/media/css/global/dark/colors_standard.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/dark/colors_standard.css
rename to src/media/css/global/dark/colors_standard.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/dark/index.html b/src/media/css/global/dark/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/dark/index.html
rename to src/media/css/global/dark/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/index.html b/src/media/css/global/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/index.html
rename to src/media/css/global/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/light/colors_alternative.css b/src/media/css/global/light/colors_alternative.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/light/colors_alternative.css
rename to src/media/css/global/light/colors_alternative.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/light/colors_standard.css b/src/media/css/global/light/colors_standard.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/light/colors_standard.css
rename to src/media/css/global/light/colors_standard.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/light/index.html b/src/media/css/global/light/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/light/index.html
rename to src/media/css/global/light/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/global/social-media-demo.css b/src/media/css/global/social-media-demo.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/global/social-media-demo.css
rename to src/media/css/global/social-media-demo.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/index.html b/src/media/css/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/index.html
rename to src/media/css/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/system/index.html b/src/media/css/system/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/system/index.html
rename to src/media/css/system/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/system/searchtools/index.html b/src/media/css/system/searchtools/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/system/searchtools/index.html
rename to src/media/css/system/searchtools/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/css/system/searchtools/searchtools.css b/src/media/css/system/searchtools/searchtools.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/system/searchtools/searchtools.css
rename to src/media/css/system/searchtools/searchtools.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/template-rtl.css b/src/media/css/template-rtl.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/template-rtl.css
rename to src/media/css/template-rtl.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/template.css b/src/media/css/template.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/template.css
rename to src/media/css/template.css
diff --git a/src/media/templates/site/moko-cassiopeia/css/user.css b/src/media/css/user.css
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/css/user.css
rename to src/media/css/user.css
diff --git a/src/media/templates/site/moko-cassiopeia/fonts/index.html b/src/media/fonts/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/fonts/index.html
rename to src/media/fonts/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/fonts/osaka-re.ttf b/src/media/fonts/osaka-re.ttf
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/fonts/osaka-re.ttf
rename to src/media/fonts/osaka-re.ttf
diff --git a/src/media/templates/site/moko-cassiopeia/images/bg.svg b/src/media/images/bg.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/bg.svg
rename to src/media/images/bg.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/index.html b/src/media/images/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/index.html
rename to src/media/images/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/images/logo.svg b/src/media/images/logo.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/logo.svg
rename to src/media/images/logo.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/select-bg-active-rtl.svg b/src/media/images/select-bg-active-rtl.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/select-bg-active-rtl.svg
rename to src/media/images/select-bg-active-rtl.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/select-bg-active.svg b/src/media/images/select-bg-active.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/select-bg-active.svg
rename to src/media/images/select-bg-active.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/select-bg-rtl.svg b/src/media/images/select-bg-rtl.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/select-bg-rtl.svg
rename to src/media/images/select-bg-rtl.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/select-bg.svg b/src/media/images/select-bg.svg
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/select-bg.svg
rename to src/media/images/select-bg.svg
diff --git a/src/media/templates/site/moko-cassiopeia/images/teaser_bg_sm.png b/src/media/images/teaser_bg_sm.png
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/teaser_bg_sm.png
rename to src/media/images/teaser_bg_sm.png
diff --git a/src/media/templates/site/moko-cassiopeia/images/template_preview.png b/src/media/images/template_preview.png
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/template_preview.png
rename to src/media/images/template_preview.png
diff --git a/src/media/templates/site/moko-cassiopeia/images/template_thumbnail.png b/src/media/images/template_thumbnail.png
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/images/template_thumbnail.png
rename to src/media/images/template_thumbnail.png
diff --git a/src/media/templates/site/moko-cassiopeia/js/darkmode-toggle.js b/src/media/js/darkmode-toggle.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/darkmode-toggle.js
rename to src/media/js/darkmode-toggle.js
diff --git a/src/media/templates/site/moko-cassiopeia/js/gtm.js b/src/media/js/gtm.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/gtm.js
rename to src/media/js/gtm.js
diff --git a/src/media/templates/site/moko-cassiopeia/index.html b/src/media/js/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/index.html
rename to src/media/js/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/js/index.html b/src/media/js/mod_menu/index.html
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/index.html
rename to src/media/js/mod_menu/index.html
diff --git a/src/media/templates/site/moko-cassiopeia/js/mod_menu/menu-metismenu-es5.js b/src/media/js/mod_menu/menu-metismenu-es5.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/mod_menu/menu-metismenu-es5.js
rename to src/media/js/mod_menu/menu-metismenu-es5.js
diff --git a/src/media/templates/site/moko-cassiopeia/js/mod_menu/menu-metismenu.js b/src/media/js/mod_menu/menu-metismenu.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/mod_menu/menu-metismenu.js
rename to src/media/js/mod_menu/menu-metismenu.js
diff --git a/src/media/templates/site/moko-cassiopeia/js/template.js b/src/media/js/template.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/template.js
rename to src/media/js/template.js
diff --git a/src/media/templates/site/moko-cassiopeia/js/theme-init.js b/src/media/js/theme-init.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/theme-init.js
rename to src/media/js/theme-init.js
diff --git a/src/media/templates/site/moko-cassiopeia/js/user.js b/src/media/js/user.js
similarity index 100%
rename from src/media/templates/site/moko-cassiopeia/js/user.js
rename to src/media/js/user.js
diff --git a/src/media/templates/site/moko-cassiopeia/vendor/joomla-custom-elements/index.html b/src/media/templates/site/moko-cassiopeia/vendor/joomla-custom-elements/index.html
deleted file mode 100644
index 4ded426..0000000
--- a/src/media/templates/site/moko-cassiopeia/vendor/joomla-custom-elements/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-