diff --git a/src/templates/moko-cassiopeia/component.php b/src/templates/component.php
similarity index 100%
rename from src/templates/moko-cassiopeia/component.php
rename to src/templates/component.php
diff --git a/src/templates/moko-cassiopeia/custom.php b/src/templates/custom.php
similarity index 100%
rename from src/templates/moko-cassiopeia/custom.php
rename to src/templates/custom.php
diff --git a/src/templates/moko-cassiopeia/error.php b/src/templates/error.php
similarity index 100%
rename from src/templates/moko-cassiopeia/error.php
rename to src/templates/error.php
diff --git a/src/templates/moko-cassiopeia/favicon.ico b/src/templates/favicon.ico
similarity index 100%
rename from src/templates/moko-cassiopeia/favicon.ico
rename to src/templates/favicon.ico
diff --git a/src/templates/moko-cassiopeia/favicon.ico.bak b/src/templates/favicon.ico.bak
similarity index 100%
rename from src/templates/moko-cassiopeia/favicon.ico.bak
rename to src/templates/favicon.ico.bak
diff --git a/src/templates/moko-cassiopeia/html/com_contact/contact/default.php b/src/templates/html/com_contact/contact/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_contact/contact/default.php
rename to src/templates/html/com_contact/contact/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_contact/contact/index.html b/src/templates/html/com_contact/contact/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_contact/contact/index.html
rename to src/templates/html/com_contact/contact/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_contact/default.php b/src/templates/html/com_contact/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_contact/default.php
rename to src/templates/html/com_contact/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_contact/index.html b/src/templates/html/com_contact/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_contact/index.html
rename to src/templates/html/com_contact/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_content/article/index.html b/src/templates/html/com_content/article/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/article/index.html
rename to src/templates/html/com_content/article/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_content/article/toc-left.php b/src/templates/html/com_content/article/toc-left.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/article/toc-left.php
rename to src/templates/html/com_content/article/toc-left.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/article/toc-right.php b/src/templates/html/com_content/article/toc-right.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/article/toc-right.php
rename to src/templates/html/com_content/article/toc-right.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/categories/default.php b/src/templates/html/com_content/categories/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/categories/default.php
rename to src/templates/html/com_content/categories/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/categories/default_items.php b/src/templates/html/com_content/categories/default_items.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/categories/default_items.php
rename to src/templates/html/com_content/categories/default_items.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/categories/index.html b/src/templates/html/com_content/categories/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/categories/index.html
rename to src/templates/html/com_content/categories/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/blog.php b/src/templates/html/com_content/category/blog.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/blog.php
rename to src/templates/html/com_content/category/blog.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/blog_children.php b/src/templates/html/com_content/category/blog_children.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/blog_children.php
rename to src/templates/html/com_content/category/blog_children.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/blog_item.php b/src/templates/html/com_content/category/blog_item.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/blog_item.php
rename to src/templates/html/com_content/category/blog_item.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/blog_links.php b/src/templates/html/com_content/category/blog_links.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/blog_links.php
rename to src/templates/html/com_content/category/blog_links.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/default.php b/src/templates/html/com_content/category/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/default.php
rename to src/templates/html/com_content/category/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/default_articles.php b/src/templates/html/com_content/category/default_articles.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/default_articles.php
rename to src/templates/html/com_content/category/default_articles.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/default_children.php b/src/templates/html/com_content/category/default_children.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/default_children.php
rename to src/templates/html/com_content/category/default_children.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/category/index.html b/src/templates/html/com_content/category/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/category/index.html
rename to src/templates/html/com_content/category/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_content/featured/default.php b/src/templates/html/com_content/featured/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/featured/default.php
rename to src/templates/html/com_content/featured/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/featured/default_item.php b/src/templates/html/com_content/featured/default_item.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/featured/default_item.php
rename to src/templates/html/com_content/featured/default_item.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/featured/default_links.php b/src/templates/html/com_content/featured/default_links.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/featured/default_links.php
rename to src/templates/html/com_content/featured/default_links.php
diff --git a/src/templates/moko-cassiopeia/html/com_content/featured/index.html b/src/templates/html/com_content/featured/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/featured/index.html
rename to src/templates/html/com_content/featured/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_content/index.html b/src/templates/html/com_content/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_content/index.html
rename to src/templates/html/com_content/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_engage/comments/default.php b/src/templates/html/com_engage/comments/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/comments/default.php
rename to src/templates/html/com_engage/comments/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_engage/comments/default_form.php b/src/templates/html/com_engage/comments/default_form.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/comments/default_form.php
rename to src/templates/html/com_engage/comments/default_form.php
diff --git a/src/templates/moko-cassiopeia/html/com_engage/comments/default_list.php b/src/templates/html/com_engage/comments/default_list.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/comments/default_list.php
rename to src/templates/html/com_engage/comments/default_list.php
diff --git a/src/templates/moko-cassiopeia/html/com_engage/comments/default_login.php b/src/templates/html/com_engage/comments/default_login.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/comments/default_login.php
rename to src/templates/html/com_engage/comments/default_login.php
diff --git a/src/templates/moko-cassiopeia/html/com_engage/comments/index.html b/src/templates/html/com_engage/comments/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/comments/index.html
rename to src/templates/html/com_engage/comments/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_engage/index.html b/src/templates/html/com_engage/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_engage/index.html
rename to src/templates/html/com_engage/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/accordion_plans.php b/src/templates/html/com_osmembership/common/accordion_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/accordion_plans.php
rename to src/templates/html/com_osmembership/common/accordion_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/batch.php b/src/templates/html/com_osmembership/common/batch.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/batch.php
rename to src/templates/html/com_osmembership/common/batch.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/batch_nocheck.php b/src/templates/html/com_osmembership/common/batch_nocheck.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/batch_nocheck.php
rename to src/templates/html/com_osmembership/common/batch_nocheck.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/categories.php b/src/templates/html/com_osmembership/common/categories.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/categories.php
rename to src/templates/html/com_osmembership/common/categories.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/columns_plans.php b/src/templates/html/com_osmembership/common/columns_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/columns_plans.php
rename to src/templates/html/com_osmembership/common/columns_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/default_plans.php b/src/templates/html/com_osmembership/common/default_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/default_plans.php
rename to src/templates/html/com_osmembership/common/default_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/group_members.php b/src/templates/html/com_osmembership/common/group_members.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/group_members.php
rename to src/templates/html/com_osmembership/common/group_members.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/index.html b/src/templates/html/com_osmembership/common/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/index.html
rename to src/templates/html/com_osmembership/common/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/paymentredirect.php b/src/templates/html/com_osmembership/common/paymentredirect.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/paymentredirect.php
rename to src/templates/html/com_osmembership/common/paymentredirect.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/plan_custom_fields.php b/src/templates/html/com_osmembership/common/plan_custom_fields.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/plan_custom_fields.php
rename to src/templates/html/com_osmembership/common/plan_custom_fields.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/plan_information.php b/src/templates/html/com_osmembership/common/plan_information.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/plan_information.php
rename to src/templates/html/com_osmembership/common/plan_information.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/priceduration.php b/src/templates/html/com_osmembership/common/priceduration.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/priceduration.php
rename to src/templates/html/com_osmembership/common/priceduration.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_circle_plans.php b/src/templates/html/com_osmembership/common/pricingtable_circle_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_circle_plans.php
rename to src/templates/html/com_osmembership/common/pricingtable_circle_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_flat_plans.php b/src/templates/html/com_osmembership/common/pricingtable_flat_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_flat_plans.php
rename to src/templates/html/com_osmembership/common/pricingtable_flat_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_plans.php b/src/templates/html/com_osmembership/common/pricingtable_plans.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/pricingtable_plans.php
rename to src/templates/html/com_osmembership/common/pricingtable_plans.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/renew_options.php b/src/templates/html/com_osmembership/common/renew_options.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/renew_options.php
rename to src/templates/html/com_osmembership/common/renew_options.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/restrictionmsg.php b/src/templates/html/com_osmembership/common/restrictionmsg.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/restrictionmsg.php
rename to src/templates/html/com_osmembership/common/restrictionmsg.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/subscriptions_history.php b/src/templates/html/com_osmembership/common/subscriptions_history.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/subscriptions_history.php
rename to src/templates/html/com_osmembership/common/subscriptions_history.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/subscriptions_pdf.php b/src/templates/html/com_osmembership/common/subscriptions_pdf.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/subscriptions_pdf.php
rename to src/templates/html/com_osmembership/common/subscriptions_pdf.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/common/upgrade_options.php b/src/templates/html/com_osmembership/common/upgrade_options.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/common/upgrade_options.php
rename to src/templates/html/com_osmembership/common/upgrade_options.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/index.html b/src/templates/html/com_osmembership/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/index.html
rename to src/templates/html/com_osmembership/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default.php b/src/templates/html/com_osmembership/mplan/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default.php
rename to src/templates/html/com_osmembership/mplan/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_advanced_settings.php b/src/templates/html/com_osmembership/mplan/default_advanced_settings.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_advanced_settings.php
rename to src/templates/html/com_osmembership/mplan/default_advanced_settings.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_general.php b/src/templates/html/com_osmembership/mplan/default_general.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_general.php
rename to src/templates/html/com_osmembership/mplan/default_general.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_group_membership.php b/src/templates/html/com_osmembership/mplan/default_group_membership.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_group_membership.php
rename to src/templates/html/com_osmembership/mplan/default_group_membership.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_member_card.php b/src/templates/html/com_osmembership/mplan/default_member_card.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_member_card.php
rename to src/templates/html/com_osmembership/mplan/default_member_card.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_messages.php b/src/templates/html/com_osmembership/mplan/default_messages.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_messages.php
rename to src/templates/html/com_osmembership/mplan/default_messages.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_metadata.php b/src/templates/html/com_osmembership/mplan/default_metadata.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_metadata.php
rename to src/templates/html/com_osmembership/mplan/default_metadata.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_recurring_settings.php b/src/templates/html/com_osmembership/mplan/default_recurring_settings.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_recurring_settings.php
rename to src/templates/html/com_osmembership/mplan/default_recurring_settings.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_reminder_messages.php b/src/templates/html/com_osmembership/mplan/default_reminder_messages.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_reminder_messages.php
rename to src/templates/html/com_osmembership/mplan/default_reminder_messages.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_reminders_settings.php b/src/templates/html/com_osmembership/mplan/default_reminders_settings.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_reminders_settings.php
rename to src/templates/html/com_osmembership/mplan/default_reminders_settings.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_renew_options.php b/src/templates/html/com_osmembership/mplan/default_renew_options.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_renew_options.php
rename to src/templates/html/com_osmembership/mplan/default_renew_options.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_renewal_discounts.php b/src/templates/html/com_osmembership/mplan/default_renewal_discounts.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_renewal_discounts.php
rename to src/templates/html/com_osmembership/mplan/default_renewal_discounts.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_translation.php b/src/templates/html/com_osmembership/mplan/default_translation.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_translation.php
rename to src/templates/html/com_osmembership/mplan/default_translation.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_upgrade_options.php b/src/templates/html/com_osmembership/mplan/default_upgrade_options.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/default_upgrade_options.php
rename to src/templates/html/com_osmembership/mplan/default_upgrade_options.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplan/index.html b/src/templates/html/com_osmembership/mplan/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplan/index.html
rename to src/templates/html/com_osmembership/mplan/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplans/default.php b/src/templates/html/com_osmembership/mplans/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplans/default.php
rename to src/templates/html/com_osmembership/mplans/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplans/default_search_bar.bootstrap4.php b/src/templates/html/com_osmembership/mplans/default_search_bar.bootstrap4.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplans/default_search_bar.bootstrap4.php
rename to src/templates/html/com_osmembership/mplans/default_search_bar.bootstrap4.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplans/default_search_bar.php b/src/templates/html/com_osmembership/mplans/default_search_bar.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplans/default_search_bar.php
rename to src/templates/html/com_osmembership/mplans/default_search_bar.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/mplans/index.html b/src/templates/html/com_osmembership/mplans/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/mplans/index.html
rename to src/templates/html/com_osmembership/mplans/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plan/default.php b/src/templates/html/com_osmembership/plan/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plan/default.php
rename to src/templates/html/com_osmembership/plan/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plan/default_renew_upgrade.php b/src/templates/html/com_osmembership/plan/default_renew_upgrade.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plan/default_renew_upgrade.php
rename to src/templates/html/com_osmembership/plan/default_renew_upgrade.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plan/index.html b/src/templates/html/com_osmembership/plan/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plan/index.html
rename to src/templates/html/com_osmembership/plan/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/columns.php b/src/templates/html/com_osmembership/plans/columns.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/columns.php
rename to src/templates/html/com_osmembership/plans/columns.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/default.php b/src/templates/html/com_osmembership/plans/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/default.php
rename to src/templates/html/com_osmembership/plans/default.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/index.html b/src/templates/html/com_osmembership/plans/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/index.html
rename to src/templates/html/com_osmembership/plans/index.html
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtable.php b/src/templates/html/com_osmembership/plans/pricingtable.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtable.php
rename to src/templates/html/com_osmembership/plans/pricingtable.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtablecircle.php b/src/templates/html/com_osmembership/plans/pricingtablecircle.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtablecircle.php
rename to src/templates/html/com_osmembership/plans/pricingtablecircle.php
diff --git a/src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtableflat.php b/src/templates/html/com_osmembership/plans/pricingtableflat.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/com_osmembership/plans/pricingtableflat.php
rename to src/templates/html/com_osmembership/plans/pricingtableflat.php
diff --git a/src/templates/moko-cassiopeia/html/index.html b/src/templates/html/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/index.html
rename to src/templates/html/index.html
diff --git a/src/templates/moko-cassiopeia/html/layouts/chromes/card.php b/src/templates/html/layouts/chromes/card.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/layouts/chromes/card.php
rename to src/templates/html/layouts/chromes/card.php
diff --git a/src/templates/moko-cassiopeia/html/layouts/chromes/html5.php b/src/templates/html/layouts/chromes/html5.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/layouts/chromes/html5.php
rename to src/templates/html/layouts/chromes/html5.php
diff --git a/src/templates/moko-cassiopeia/html/layouts/chromes/index.html b/src/templates/html/layouts/chromes/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/layouts/chromes/index.html
rename to src/templates/html/layouts/chromes/index.html
diff --git a/src/templates/moko-cassiopeia/html/layouts/chromes/noCard.php b/src/templates/html/layouts/chromes/noCard.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/layouts/chromes/noCard.php
rename to src/templates/html/layouts/chromes/noCard.php
diff --git a/src/templates/moko-cassiopeia/html/layouts/index.html b/src/templates/html/layouts/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/layouts/index.html
rename to src/templates/html/layouts/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_custom/banner.php b/src/templates/html/mod_custom/banner.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_custom/banner.php
rename to src/templates/html/mod_custom/banner.php
diff --git a/src/templates/moko-cassiopeia/html/mod_custom/hero.php b/src/templates/html/mod_custom/hero.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_custom/hero.php
rename to src/templates/html/mod_custom/hero.php
diff --git a/src/templates/moko-cassiopeia/html/mod_custom/index.html b/src/templates/html/mod_custom/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_custom/index.html
rename to src/templates/html/mod_custom/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_gabble/default.php b/src/templates/html/mod_gabble/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_gabble/default.php
rename to src/templates/html/mod_gabble/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_gabble/index.html b/src/templates/html/mod_gabble/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_gabble/index.html
rename to src/templates/html/mod_gabble/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_membershipplans/index.html b/src/templates/html/mod_membershipplans/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_membershipplans/index.html
rename to src/templates/html/mod_membershipplans/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/collapse-metismenu.php b/src/templates/html/mod_menu/collapse-metismenu.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/collapse-metismenu.php
rename to src/templates/html/mod_menu/collapse-metismenu.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu.php b/src/templates/html/mod_menu/dropdown-metismenu.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu.php
rename to src/templates/html/mod_menu/dropdown-metismenu.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_component.php b/src/templates/html/mod_menu/dropdown-metismenu_component.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_component.php
rename to src/templates/html/mod_menu/dropdown-metismenu_component.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_heading.php b/src/templates/html/mod_menu/dropdown-metismenu_heading.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_heading.php
rename to src/templates/html/mod_menu/dropdown-metismenu_heading.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_separator.php b/src/templates/html/mod_menu/dropdown-metismenu_separator.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_separator.php
rename to src/templates/html/mod_menu/dropdown-metismenu_separator.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_url.php b/src/templates/html/mod_menu/dropdown-metismenu_url.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/dropdown-metismenu_url.php
rename to src/templates/html/mod_menu/dropdown-metismenu_url.php
diff --git a/src/templates/moko-cassiopeia/html/mod_menu/index.html b/src/templates/html/mod_menu/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_menu/index.html
rename to src/templates/html/mod_menu/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_cart/default.php b/src/templates/html/mod_virtuemart_cart/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_cart/default.php
rename to src/templates/html/mod_virtuemart_cart/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_cart/dropdown.php b/src/templates/html/mod_virtuemart_cart/dropdown.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_cart/dropdown.php
rename to src/templates/html/mod_virtuemart_cart/dropdown.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_cart/index.html b/src/templates/html/mod_virtuemart_cart/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_cart/index.html
rename to src/templates/html/mod_virtuemart_cart/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_category/all.php b/src/templates/html/mod_virtuemart_category/all.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_category/all.php
rename to src/templates/html/mod_virtuemart_category/all.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_category/current.php b/src/templates/html/mod_virtuemart_category/current.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_category/current.php
rename to src/templates/html/mod_virtuemart_category/current.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_category/default.php b/src/templates/html/mod_virtuemart_category/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_category/default.php
rename to src/templates/html/mod_virtuemart_category/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_category/index.html b/src/templates/html/mod_virtuemart_category/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_category/index.html
rename to src/templates/html/mod_virtuemart_category/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_category/wall.php b/src/templates/html/mod_virtuemart_category/wall.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_category/wall.php
rename to src/templates/html/mod_virtuemart_category/wall.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_currencies/default.php b/src/templates/html/mod_virtuemart_currencies/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_currencies/default.php
rename to src/templates/html/mod_virtuemart_currencies/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_currencies/index.html b/src/templates/html/mod_virtuemart_currencies/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_currencies/index.html
rename to src/templates/html/mod_virtuemart_currencies/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_manufacturer/default.php b/src/templates/html/mod_virtuemart_manufacturer/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_manufacturer/default.php
rename to src/templates/html/mod_virtuemart_manufacturer/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_manufacturer/index.html b/src/templates/html/mod_virtuemart_manufacturer/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_manufacturer/index.html
rename to src/templates/html/mod_virtuemart_manufacturer/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_product/default.php b/src/templates/html/mod_virtuemart_product/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_product/default.php
rename to src/templates/html/mod_virtuemart_product/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_product/index.html b/src/templates/html/mod_virtuemart_product/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_product/index.html
rename to src/templates/html/mod_virtuemart_product/index.html
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_search/default.php b/src/templates/html/mod_virtuemart_search/default.php
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_search/default.php
rename to src/templates/html/mod_virtuemart_search/default.php
diff --git a/src/templates/moko-cassiopeia/html/mod_virtuemart_search/index.html b/src/templates/html/mod_virtuemart_search/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/mod_virtuemart_search/index.html
rename to src/templates/html/mod_virtuemart_search/index.html
diff --git a/src/templates/moko-cassiopeia/html/tinymce/index.html b/src/templates/html/tinymce/index.html
similarity index 100%
rename from src/templates/moko-cassiopeia/html/tinymce/index.html
rename to src/templates/html/tinymce/index.html
diff --git a/src/templates/index.html b/src/templates/index.html
index 4ded426..d8abe80 100644
--- a/src/templates/index.html
+++ b/src/templates/index.html
@@ -12,8 +12,8 @@
  You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/ .
 
  # FILE INFORMATION
- DEFGROUP: Joomla.Site
- INGROUP: Templates.Moko-Cassiopeia
+ DEFGROUP: Joomla.Templates.Site
+ INGROUP: Moko-Cassiopeia
  FILE: index.html
  BRIEF: Security redirect page to block folder access and forward to site root.
 -->
diff --git a/src/templates/moko-cassiopeia/index.php b/src/templates/index.php
similarity index 100%
rename from src/templates/moko-cassiopeia/index.php
rename to src/templates/index.php
diff --git a/src/templates/moko-cassiopeia/joomla.asset.json b/src/templates/joomla.asset.json
similarity index 100%
rename from src/templates/moko-cassiopeia/joomla.asset.json
rename to src/templates/joomla.asset.json
diff --git a/src/templates/moko-cassiopeia/index.html b/src/templates/moko-cassiopeia/index.html
deleted file mode 100644
index d8abe80..0000000
--- a/src/templates/moko-cassiopeia/index.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<!-- Copyright (C) 2025 Moko Consulting <jmiller@mokoconsulting.tech>
-
- This file is part of a Moko Consulting project.
-
- SPDX-License-Identifier: GPL-3.0-or-later
-
- This program is free software; you can redistribute it and/or modify  it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/ .
-
- # FILE INFORMATION
- DEFGROUP: Joomla.Templates.Site
- INGROUP: Moko-Cassiopeia
- FILE: index.html
- BRIEF: Security redirect page to block folder access and forward to site root.
--->
-
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8" />
-	<title>Redirecting…</title>
-
-	<!-- Search engines: do not index this placeholder redirect page -->
-	<meta name="robots" content="noindex, nofollow, noarchive" />
-
-	<!-- Instant redirect fallback even if JavaScript is disabled -->
-	<meta http-equiv="refresh" content="0; url=/" />
-
-	<!-- Canonical root reference -->
-	<link rel="canonical" href="/" />
-
-	<meta name="viewport" content="width=device-width, initial-scale=1" />
-
-	<script>
-
-	(function redirectToRoot() {
-		// Configuration object with safe defaults.
-		var opts = {
-			fallbackPath: "/",   // string: fallback destination if origin is unavailable
-			delayMs: 0,           // number: delay before redirect in ms (0 = immediate)
-			behavior: "replace"   // enum: "replace" | "assign"
-		};
-
-		// Determine absolute origin in all mainstream browsers.
-		var origin = (typeof location.origin === "string" && location.origin)
-									|| (location.protocol + "//" + location.host);
-
-		// Final destination: absolute root of the current site, or fallback path.
-		var destination = origin ? origin + "/" : opts.fallbackPath;
-
-		function go() {
-			if (opts.behavior === "assign") {
-				location.assign(destination);
-			} else {
-				location.replace(destination);
-			}
-		}
-
-		// Execute redirect, optionally after a short delay.
-		if (opts.delayMs > 0) {
-			setTimeout(go, opts.delayMs);
-		} else {
-			go();
-		}
-	})();
-	</script>
-
-	<!--
-		Secondary meta-refresh for no-JS environments is already set above.
-		Some very old crawlers may ignore JS; the meta refresh ensures coverage.
-	-->
-
-	<noscript>
-		<!-- Extra defense-in-depth: if JS is disabled, meta refresh (above) handles redirect. -->
-		<style>
-			html, body { height:100%; }
-			body { display:flex; align-items:center; justify-content:center; margin:0; font: 16px/1.4 system-ui, -apple-system, Segoe UI, Roboto, Arial, sans-serif; }
-			.msg { opacity: .75; text-align: center; }
-		</style>
-	</noscript>
-</head>
-<body>
-	<div class="msg">Redirecting to the site root… If you are not redirected, <a href="/">click here</a>.</div>
-</body>
-</html>
diff --git a/src/templates/moko-cassiopeia/offline.php b/src/templates/offline.php
similarity index 100%
rename from src/templates/moko-cassiopeia/offline.php
rename to src/templates/offline.php
diff --git a/src/templates/moko-cassiopeia/templateDetails.xml b/src/templates/templateDetails.xml
similarity index 100%
rename from src/templates/moko-cassiopeia/templateDetails.xml
rename to src/templates/templateDetails.xml