diff --git a/src/Bundle/Resources/config/services.yml b/src/Bundle/Resources/config/services.yml
index e5c8290..462c77e 100644
--- a/src/Bundle/Resources/config/services.yml
+++ b/src/Bundle/Resources/config/services.yml
@@ -42,7 +42,7 @@ services:
     class: Netzmacht\Contao\Leaflet\Frontend\ValueFilter
 
   netzmacht.contao_leaflet.map.assets:
-    class: Netzmacht\Contao\Leaflet\ContaoAssets
+    class: Netzmacht\Contao\Leaflet\Encoder\ContaoAssets
     arguments:
       - '@netzmacht.contao_toolkit.assets_manager'
 
diff --git a/src/ContaoAssets.php b/src/Encoder/ContaoAssets.php
similarity index 98%
rename from src/ContaoAssets.php
rename to src/Encoder/ContaoAssets.php
index 6b43f1b..6f95aed 100644
--- a/src/ContaoAssets.php
+++ b/src/Encoder/ContaoAssets.php
@@ -10,7 +10,7 @@
  * @filesource
  */
 
-namespace Netzmacht\Contao\Leaflet;
+namespace Netzmacht\Contao\Leaflet\Encoder;
 
 use Netzmacht\Contao\Toolkit\View\Assets\AssetsManager;
 use Netzmacht\LeafletPHP\Assets;
diff --git a/src/Listener/LoadAssetsListener.php b/src/Listener/LoadAssetsListener.php
index 2aec697..1781aae 100644
--- a/src/Listener/LoadAssetsListener.php
+++ b/src/Listener/LoadAssetsListener.php
@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace Netzmacht\Contao\Leaflet\Listener;
 
-use Netzmacht\Contao\Leaflet\ContaoAssets;
+use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets;
 use Netzmacht\Contao\Leaflet\Frontend\Assets\LibrariesConfiguration;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Model\IconModel;
diff --git a/src/MapProvider.php b/src/MapProvider.php
index 41f2ab5..8d9ba9b 100644
--- a/src/MapProvider.php
+++ b/src/MapProvider.php
@@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet;
 
 use Contao\Input;
 use Doctrine\Common\Cache\Cache;
+use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets;
 use Netzmacht\Contao\Leaflet\Event\GetJavascriptEvent;
 use Netzmacht\Contao\Leaflet\Filter\Filter;
 use Netzmacht\Contao\Leaflet\Filter\FilterFactory;
diff --git a/src/Mapper/Layer/MarkerClusterLayerMapper.php b/src/Mapper/Layer/MarkerClusterLayerMapper.php
index a71b8c2..28e5016 100644
--- a/src/Mapper/Layer/MarkerClusterLayerMapper.php
+++ b/src/Mapper/Layer/MarkerClusterLayerMapper.php
@@ -13,7 +13,7 @@
 namespace Netzmacht\Contao\Leaflet\Mapper\Layer;
 
 use Contao\Model;
-use Netzmacht\Contao\Leaflet\ContaoAssets;
+use Netzmacht\Contao\Leaflet\Encoder\ContaoAssets;
 use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
 use Netzmacht\Contao\Leaflet\Model\LayerModel;
 use Netzmacht\Contao\Leaflet\Request\Request;