diff --git a/source/packages/com_mokosuitestorelocator/access.xml b/source/packages/com_mokosuitestorelocator/admin/access.xml
similarity index 100%
rename from source/packages/com_mokosuitestorelocator/access.xml
rename to source/packages/com_mokosuitestorelocator/admin/access.xml
diff --git a/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml b/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
index 25e03a5..1098761 100644
--- a/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
+++ b/source/packages/com_mokosuitestorelocator/mokosuitestorelocator.xml
@@ -58,6 +58,7 @@
 
 	<administration>
 		<files folder="admin">
+			<filename>access.xml</filename>
 			<folder>forms</folder>
 			<folder>language</folder>
 			<folder>services</folder>
diff --git a/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml b/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
index 9257ea4..ab09fa5 100644
--- a/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
+++ b/source/packages/mod_mokosuitestorelocator_map/mod_mokosuitestorelocator_map.xml
@@ -26,6 +26,7 @@
 	<namespace path="src">Moko\Module\MokoSuiteStoreLocatorMap</namespace>
 
 	<files>
+		<folder>services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 		<folder>language</folder>
diff --git a/source/packages/mod_mokosuitestorelocator_map/services/provider.php b/source/packages/mod_mokosuitestorelocator_map/services/provider.php
new file mode 100644
index 0000000..6ad82a0
--- /dev/null
+++ b/source/packages/mod_mokosuitestorelocator_map/services/provider.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     MokoSuiteStoreLocator
+ * @subpackage  mod_mokosuitestorelocator_map
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\HelperFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+return new class implements ServiceProviderInterface
+{
+    public function register(Container $container): void
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Moko\\Module\\MokoSuiteStoreLocatorMap'));
+        $container->registerServiceProvider(new HelperFactory('\\Moko\\Module\\MokoSuiteStoreLocatorMap\\Helper'));
+        $container->registerServiceProvider(new Module());
+    }
+};
diff --git a/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml b/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
index 48efc2a..42965b1 100644
--- a/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
+++ b/source/packages/mod_mokosuitestorelocator_search/mod_mokosuitestorelocator_search.xml
@@ -26,6 +26,7 @@
 	<namespace path="src">Moko\Module\MokoSuiteStoreLocatorSearch</namespace>
 
 	<files>
+		<folder>services</folder>
 		<folder>src</folder>
 		<folder>tmpl</folder>
 		<folder>language</folder>
diff --git a/source/packages/mod_mokosuitestorelocator_search/services/provider.php b/source/packages/mod_mokosuitestorelocator_search/services/provider.php
new file mode 100644
index 0000000..bd0e032
--- /dev/null
+++ b/source/packages/mod_mokosuitestorelocator_search/services/provider.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @package     MokoSuiteStoreLocator
+ * @subpackage  mod_mokosuitestorelocator_search
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Extension\Service\Provider\Module;
+use Joomla\CMS\Extension\Service\Provider\ModuleDispatcherFactory;
+use Joomla\CMS\Extension\Service\Provider\HelperFactory;
+use Joomla\DI\Container;
+use Joomla\DI\ServiceProviderInterface;
+
+return new class implements ServiceProviderInterface
+{
+    public function register(Container $container): void
+    {
+        $container->registerServiceProvider(new ModuleDispatcherFactory('\\Moko\\Module\\MokoSuiteStoreLocatorSearch'));
+        $container->registerServiceProvider(new HelperFactory('\\Moko\\Module\\MokoSuiteStoreLocatorSearch\\Helper'));
+        $container->registerServiceProvider(new Module());
+    }
+};