diff --git a/config/services.php b/config/services.php
index ac6f240..e9b96ac 100644
--- a/config/services.php
+++ b/config/services.php
@@ -3,19 +3,18 @@
 use FOS\HttpCacheBundle\CacheManager;
 use Neusta\Pimcore\HttpCacheBundle\Adapter\FOSHttpCache\CacheInvalidatorAdapter;
 use Neusta\Pimcore\HttpCacheBundle\Adapter\FOSHttpCache\ResponseTaggerAdapter;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator\OnlyWhenActiveCacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator\RemoveDisabledTagsCacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\ElementCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\StaticCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger\OnlyWhenActiveResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger\RemoveDisabledTagsResponseTagger;
 use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator\OnlyWhenActiveCacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator\RemoveDisabledTagsCacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker\ElementCacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker\StaticCacheTagChecker;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementRepository;
-use Neusta\Pimcore\HttpCacheBundle\Element\InvalidateElementListener;
-use Neusta\Pimcore\HttpCacheBundle\Element\TagElementListener;
+use Neusta\Pimcore\HttpCacheBundle\Element\EventListener\InvalidateElementListener;
+use Neusta\Pimcore\HttpCacheBundle\Element\EventListener\TagElementListener;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger\OnlyWhenActiveResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger\RemoveDisabledTagsResponseTagger;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\abstract_arg;
 use function Symfony\Component\DependencyInjection\Loader\Configurator\inline_service;
@@ -24,48 +23,51 @@
 return static function (ContainerConfigurator $configurator) {
     $services = $configurator->services();
 
-    $services->set(CacheActivator::class);
+    $services->set('neusta_pimcore_http_cache.cache_activator', CacheActivator::class)
+        ->alias(CacheActivator::class, 'neusta_pimcore_http_cache.cache_activator');
 
-    $services->set(CacheInvalidator::class, CacheInvalidatorAdapter::class)
+    $services->set('neusta_pimcore_http_cache.cache_invalidator', CacheInvalidatorAdapter::class)
         ->arg('$invalidator', service(CacheManager::class));
 
-    $services->set(RemoveDisabledTagsCacheInvalidator::class)
-        ->decorate(CacheInvalidator::class, null, -99)
-        ->args([service('.inner'), service(CacheTagChecker::class)]);
+    $services->set(null, RemoveDisabledTagsCacheInvalidator::class)
+        ->decorate('neusta_pimcore_http_cache.cache_invalidator', null, -99)
+        ->args([service('.inner'), service('neusta_pimcore_http_cache.cache_tag_checker')]);
 
-    $services->set(OnlyWhenActiveCacheInvalidator::class)
-        ->decorate(CacheInvalidator::class, null, -100)
-        ->args([service('.inner'), service(CacheActivator::class)]);
+    $services->set(null, OnlyWhenActiveCacheInvalidator::class)
+        ->decorate('neusta_pimcore_http_cache.cache_invalidator', null, -100)
+        ->args([service('.inner'), service('neusta_pimcore_http_cache.cache_activator')]);
 
-    $services->set(ResponseTagger::class, ResponseTaggerAdapter::class)
+    $services->alias(CacheInvalidator::class, 'neusta_pimcore_http_cache.cache_invalidator');
+
+    $services->set('neusta_pimcore_http_cache.response_tagger', ResponseTaggerAdapter::class)
         ->arg('$responseTagger', service('fos_http_cache.http.symfony_response_tagger'));
 
-    $services->set(RemoveDisabledTagsResponseTagger::class)
-        ->decorate(ResponseTagger::class, null, -99)
-        ->args([service('.inner'), service(CacheTagChecker::class)]);
+    $services->set(null, RemoveDisabledTagsResponseTagger::class)
+        ->decorate('neusta_pimcore_http_cache.response_tagger', null, -99)
+        ->args([service('.inner'), service('neusta_pimcore_http_cache.cache_tag_checker')]);
+
+    $services->set(null, OnlyWhenActiveResponseTagger::class)
+        ->decorate('neusta_pimcore_http_cache.response_tagger', null, -100)
+        ->args([service('.inner'), service('neusta_pimcore_http_cache.cache_activator')]);
 
-    $services->set(OnlyWhenActiveResponseTagger::class)
-        ->decorate(ResponseTagger::class, null, -100)
-        ->args([service('.inner'), service(CacheActivator::class)]);
+    $services->alias(ResponseTagger::class, 'neusta_pimcore_http_cache.response_tagger');
 
-    $services->set(StaticCacheTagChecker::class)
+    $services->set('neusta_pimcore_http_cache.cache_tag_checker', StaticCacheTagChecker::class)
         ->arg('$types', abstract_arg('Set in the extension'));
 
-    $services->set(ElementCacheTagChecker::class)
-        ->decorate(StaticCacheTagChecker::class)
+    $services->set('neusta_pimcore_http_cache.cache_tag_checker.element', ElementCacheTagChecker::class)
+        ->decorate('neusta_pimcore_http_cache.cache_tag_checker')
         ->arg('$inner', service('.inner'))
         ->arg('$repository', inline_service(ElementRepository::class))
         ->arg('$assets', ['enabled' => false, 'types' => []])
         ->arg('$documents', ['enabled' => false, 'types' => []])
         ->arg('$objects', ['enabled' => false, 'types' => [], 'classes' => []]);
 
-    $services->alias(CacheTagChecker::class, StaticCacheTagChecker::class);
-
-    $services->set(TagElementListener::class)
-        ->arg('$responseTagger', service(ResponseTagger::class))
+    $services->set('neusta_pimcore_http_cache.element.tag_listener', TagElementListener::class)
+        ->arg('$responseTagger', service('neusta_pimcore_http_cache.response_tagger'))
         ->arg('$dispatcher', service('event_dispatcher'));
 
-    $services->set(InvalidateElementListener::class)
-        ->arg('$cacheInvalidator', service(CacheInvalidator::class))
+    $services->set('neusta_pimcore_http_cache.element.invalidate_listener', InvalidateElementListener::class)
+        ->arg('$cacheInvalidator', service('neusta_pimcore_http_cache.cache_invalidator'))
         ->arg('$dispatcher', service('event_dispatcher'));
 };
diff --git a/src/Adapter/FOSHttpCache/CacheInvalidatorAdapter.php b/src/Adapter/FOSHttpCache/CacheInvalidatorAdapter.php
index afe08a0..89cce1c 100644
--- a/src/Adapter/FOSHttpCache/CacheInvalidatorAdapter.php
+++ b/src/Adapter/FOSHttpCache/CacheInvalidatorAdapter.php
@@ -3,8 +3,8 @@
 namespace Neusta\Pimcore\HttpCacheBundle\Adapter\FOSHttpCache;
 
 use FOS\HttpCache\CacheInvalidator as FosCacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 
 final class CacheInvalidatorAdapter implements CacheInvalidator
 {
diff --git a/src/Adapter/FOSHttpCache/ResponseTaggerAdapter.php b/src/Adapter/FOSHttpCache/ResponseTaggerAdapter.php
index 454b603..62348cf 100644
--- a/src/Adapter/FOSHttpCache/ResponseTaggerAdapter.php
+++ b/src/Adapter/FOSHttpCache/ResponseTaggerAdapter.php
@@ -4,8 +4,8 @@
 namespace Neusta\Pimcore\HttpCacheBundle\Adapter\FOSHttpCache;
 
 use FOS\HttpCache\ResponseTagger as FosResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 
 final class ResponseTaggerAdapter implements ResponseTagger
 {
diff --git a/src/Cache/CacheTypeFactory.php b/src/Cache/CacheTypeFactory.php
deleted file mode 100644
index e32e486..0000000
--- a/src/Cache/CacheTypeFactory.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
-
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\CustomCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\ElementCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\EmptyCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
-use Pimcore\Model\Element\ElementInterface;
-
-final class CacheTypeFactory
-{
-    public static function createEmpty(): EmptyCacheType
-    {
-        return new EmptyCacheType();
-    }
-
-    public static function createFromString(string $type): ElementCacheType|CustomCacheType
-    {
-        if ($elementType = ElementType::tryFrom($type)) {
-            return new ElementCacheType($elementType);
-        }
-
-        return new CustomCacheType($type);
-    }
-
-    public static function createFromElement(ElementInterface $element): ElementCacheType
-    {
-        return new ElementCacheType(ElementType::fromElement($element));
-    }
-}
diff --git a/src/Cache/CacheInvalidator.php b/src/CacheInvalidator.php
similarity index 71%
rename from src/Cache/CacheInvalidator.php
rename to src/CacheInvalidator.php
index 8e468ef..fca5aee 100644
--- a/src/Cache/CacheInvalidator.php
+++ b/src/CacheInvalidator.php
@@ -1,6 +1,6 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle;
 
 interface CacheInvalidator
 {
diff --git a/src/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php b/src/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php
similarity index 73%
rename from src/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php
rename to src/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php
index aeba428..d60d7ba 100644
--- a/src/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php
+++ b/src/CacheInvalidator/OnlyWhenActiveCacheInvalidator.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
 use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 
 final class OnlyWhenActiveCacheInvalidator implements CacheInvalidator
 {
diff --git a/src/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php b/src/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php
similarity index 63%
rename from src/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php
rename to src/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php
index ac5c58b..d683ad6 100644
--- a/src/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php
+++ b/src/CacheInvalidator/RemoveDisabledTagsCacheInvalidator.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 
 final class RemoveDisabledTagsCacheInvalidator implements CacheInvalidator
 {
diff --git a/src/Cache/CacheTag.php b/src/CacheTag.php
similarity index 54%
rename from src/Cache/CacheTag.php
rename to src/CacheTag.php
index 416d925..033b5f5 100644
--- a/src/Cache/CacheTag.php
+++ b/src/CacheTag.php
@@ -1,8 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\ElementCacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\ElementCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagTypeFactory;
 use Neusta\Pimcore\HttpCacheBundle\Exception\InvalidArgumentException;
 use Pimcore\Model\Element\ElementInterface;
 
@@ -10,20 +12,20 @@ final class CacheTag
 {
     private function __construct(
         public readonly string $tag,
-        public readonly CacheType $type,
+        public readonly CacheTagType $type,
     ) {
         if ('' === trim($tag)) {
             throw InvalidArgumentException::becauseCacheTagIsEmpty();
         }
 
-        if (!$type instanceof ElementCacheType && ElementCacheType::isReserved($type->toString())) {
+        if (!$type instanceof ElementCacheTagType && ElementCacheTagType::isReserved($type->toString())) {
             throw InvalidArgumentException::becauseCacheTypeIsReserved($type);
         }
     }
 
-    public static function fromString(string $tag, ?CacheType $type = null): self
+    public static function fromString(string $tag, ?CacheTagType $type = null): self
     {
-        return new self($tag, $type ?? CacheTypeFactory::createEmpty());
+        return new self($tag, $type ?? CacheTagTypeFactory::createEmpty());
     }
 
     public static function fromElement(ElementInterface $element): self
@@ -32,7 +34,7 @@ public static function fromElement(ElementInterface $element): self
             throw InvalidArgumentException::becauseElementHasNoId();
         }
 
-        return new self((string) $id, CacheTypeFactory::createFromElement($element));
+        return new self((string) $id, CacheTagTypeFactory::createFromElement($element));
     }
 
     public function toString(): string
diff --git a/src/Cache/CacheTagChecker.php b/src/CacheTag/CacheTagChecker.php
similarity index 54%
rename from src/Cache/CacheTagChecker.php
rename to src/CacheTag/CacheTagChecker.php
index 549e43f..cddcbc7 100644
--- a/src/Cache/CacheTagChecker.php
+++ b/src/CacheTag/CacheTagChecker.php
@@ -1,6 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag;
+
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
 
 interface CacheTagChecker
 {
diff --git a/src/Cache/CacheTagChecker/ElementCacheTagChecker.php b/src/CacheTag/CacheTagChecker/ElementCacheTagChecker.php
similarity index 88%
rename from src/Cache/CacheTagChecker/ElementCacheTagChecker.php
rename to src/CacheTag/CacheTagChecker/ElementCacheTagChecker.php
index 9b3a53a..f0e18a9 100644
--- a/src/Cache/CacheTagChecker/ElementCacheTagChecker.php
+++ b/src/CacheTag/CacheTagChecker/ElementCacheTagChecker.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\ElementCacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\ElementCacheTagType;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementRepository;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
 use Pimcore\Model\DataObject\Concrete;
@@ -27,7 +27,7 @@ public function __construct(
 
     public function isEnabled(CacheTag $tag): bool
     {
-        if (!$tag->type instanceof ElementCacheType) {
+        if (!$tag->type instanceof ElementCacheTagType) {
             return $this->inner->isEnabled($tag);
         }
 
diff --git a/src/Cache/CacheTagChecker/StaticCacheTagChecker.php b/src/CacheTag/CacheTagChecker/StaticCacheTagChecker.php
similarity index 71%
rename from src/Cache/CacheTagChecker/StaticCacheTagChecker.php
rename to src/CacheTag/CacheTagChecker/StaticCacheTagChecker.php
index 4583dec..2baa968 100644
--- a/src/Cache/CacheTagChecker/StaticCacheTagChecker.php
+++ b/src/CacheTag/CacheTagChecker/StaticCacheTagChecker.php
@@ -1,9 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
 
 final class StaticCacheTagChecker implements CacheTagChecker
 {
diff --git a/src/Cache/CacheType.php b/src/CacheTag/CacheTagType.php
similarity index 69%
rename from src/Cache/CacheType.php
rename to src/CacheTag/CacheTagType.php
index d6a14ce..f2b7b04 100644
--- a/src/Cache/CacheType.php
+++ b/src/CacheTag/CacheTagType.php
@@ -1,8 +1,8 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag;
 
-interface CacheType
+interface CacheTagType
 {
     public function applyTo(string $tag): string;
 
diff --git a/src/Cache/CacheType/CustomCacheType.php b/src/CacheTag/CacheTagType/CustomCacheTagType.php
similarity index 76%
rename from src/Cache/CacheType/CustomCacheType.php
rename to src/CacheTag/CacheTagType/CustomCacheTagType.php
index 2b15445..81d45cc 100644
--- a/src/Cache/CacheType/CustomCacheType.php
+++ b/src/CacheTag/CacheTagType/CustomCacheTagType.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 use Neusta\Pimcore\HttpCacheBundle\Exception\InvalidArgumentException;
 
-final class CustomCacheType implements CacheType
+final class CustomCacheTagType implements CacheTagType
 {
     public function __construct(
         private readonly string $type,
diff --git a/src/Cache/CacheType/ElementCacheType.php b/src/CacheTag/CacheTagType/ElementCacheTagType.php
similarity index 80%
rename from src/Cache/CacheType/ElementCacheType.php
rename to src/CacheTag/CacheTagType/ElementCacheTagType.php
index a406405..4d2815e 100644
--- a/src/Cache/CacheType/ElementCacheType.php
+++ b/src/CacheTag/CacheTagType/ElementCacheTagType.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
 
-final class ElementCacheType implements CacheType
+final class ElementCacheTagType implements CacheTagType
 {
     public function __construct(
         public readonly ElementType $type,
diff --git a/src/Cache/CacheType/EmptyCacheType.php b/src/CacheTag/CacheTagType/EmptyCacheTagType.php
similarity index 59%
rename from src/Cache/CacheType/EmptyCacheType.php
rename to src/CacheTag/CacheTagType/EmptyCacheTagType.php
index 672b932..2ceef49 100644
--- a/src/Cache/CacheType/EmptyCacheType.php
+++ b/src/CacheTag/CacheTagType/EmptyCacheTagType.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 
-final class EmptyCacheType implements CacheType
+final class EmptyCacheTagType implements CacheTagType
 {
     public function applyTo(string $tag): string
     {
diff --git a/src/CacheTag/CacheTagTypeFactory.php b/src/CacheTag/CacheTagTypeFactory.php
new file mode 100644
index 0000000..25d1228
--- /dev/null
+++ b/src/CacheTag/CacheTagTypeFactory.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace Neusta\Pimcore\HttpCacheBundle\CacheTag;
+
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\CustomCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\ElementCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\EmptyCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
+use Pimcore\Model\Element\ElementInterface;
+
+final class CacheTagTypeFactory
+{
+    public static function createEmpty(): EmptyCacheTagType
+    {
+        return new EmptyCacheTagType();
+    }
+
+    public static function createFromString(string $type): ElementCacheTagType|CustomCacheTagType
+    {
+        if ($elementType = ElementType::tryFrom($type)) {
+            return new ElementCacheTagType($elementType);
+        }
+
+        return new CustomCacheTagType($type);
+    }
+
+    public static function createFromElement(ElementInterface $element): ElementCacheTagType
+    {
+        return new ElementCacheTagType(ElementType::fromElement($element));
+    }
+}
diff --git a/src/Cache/CacheTags.php b/src/CacheTags.php
similarity index 86%
rename from src/Cache/CacheTags.php
rename to src/CacheTags.php
index 96deb3f..28d104b 100644
--- a/src/Cache/CacheTags.php
+++ b/src/CacheTags.php
@@ -1,7 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle;
 
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 use Pimcore\Model\Element\ElementInterface;
 
 /**
@@ -22,7 +24,7 @@ public function __construct(CacheTag ...$tags)
         $this->tags = $tags;
     }
 
-    public static function fromString(string $tag, ?CacheType $type = null): self
+    public static function fromString(string $tag, ?CacheTagType $type = null): self
     {
         return new self(CacheTag::fromString($tag, $type));
     }
@@ -30,7 +32,7 @@ public static function fromString(string $tag, ?CacheType $type = null): self
     /**
      * @param list<string> $tags
      */
-    public static function fromStrings(array $tags, ?CacheType $type = null): self
+    public static function fromStrings(array $tags, ?CacheTagType $type = null): self
     {
         return new self(...array_map(fn ($tag) => CacheTag::fromString($tag, $type), $tags));
     }
diff --git a/src/DependencyInjection/NeustaPimcoreHttpCacheExtension.php b/src/DependencyInjection/NeustaPimcoreHttpCacheExtension.php
index ac1d3ec..860edf0 100644
--- a/src/DependencyInjection/NeustaPimcoreHttpCacheExtension.php
+++ b/src/DependencyInjection/NeustaPimcoreHttpCacheExtension.php
@@ -2,10 +2,6 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\DependencyInjection;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\ElementCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\StaticCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Element\InvalidateElementListener;
-use Neusta\Pimcore\HttpCacheBundle\Element\TagElementListener;
 use Pimcore\Event\AssetEvents;
 use Pimcore\Event\DataObjectEvents;
 use Pimcore\Event\DocumentEvents;
@@ -25,7 +21,7 @@ public function loadInternal(array $mergedConfig, ContainerBuilder $container):
 
         $loader->load('services.php');
 
-        $container->getDefinition(StaticCacheTagChecker::class)
+        $container->getDefinition('neusta_pimcore_http_cache.cache_tag_checker')
             ->setArgument('$types', $mergedConfig['cache_types']);
 
         $this->registerElements($container, $mergedConfig['elements']);
@@ -36,9 +32,9 @@ public function loadInternal(array $mergedConfig, ContainerBuilder $container):
      */
     private function registerElements(ContainerBuilder $container, array $config): void
     {
-        $tagChecker = $container->getDefinition(ElementCacheTagChecker::class);
-        $tagListener = $container->getDefinition(TagElementListener::class);
-        $invalidateListener = $container->getDefinition(InvalidateElementListener::class);
+        $tagChecker = $container->getDefinition('neusta_pimcore_http_cache.cache_tag_checker.element');
+        $tagListener = $container->getDefinition('neusta_pimcore_http_cache.element.tag_listener');
+        $invalidateListener = $container->getDefinition('neusta_pimcore_http_cache.element.invalidate_listener');
 
         if ($config['assets']['enabled']) {
             $tagChecker->setArgument('$assets', $config['assets']);
diff --git a/src/Element/ElementInvalidationEvent.php b/src/Element/Event/ElementInvalidationEvent.php
similarity index 82%
rename from src/Element/ElementInvalidationEvent.php
rename to src/Element/Event/ElementInvalidationEvent.php
index 1e0fcaf..4f3c90b 100644
--- a/src/Element/ElementInvalidationEvent.php
+++ b/src/Element/Event/ElementInvalidationEvent.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Element;
+namespace Neusta\Pimcore\HttpCacheBundle\Element\Event;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
 use Pimcore\Model\Element\ElementInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
diff --git a/src/Element/ElementTaggingEvent.php b/src/Element/Event/ElementTaggingEvent.php
similarity index 82%
rename from src/Element/ElementTaggingEvent.php
rename to src/Element/Event/ElementTaggingEvent.php
index 4a31370..3678036 100644
--- a/src/Element/ElementTaggingEvent.php
+++ b/src/Element/Event/ElementTaggingEvent.php
@@ -1,9 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Element;
+namespace Neusta\Pimcore\HttpCacheBundle\Element\Event;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
 use Pimcore\Model\Element\ElementInterface;
 use Symfony\Contracts\EventDispatcher\Event;
 
diff --git a/src/Element/InvalidateElementListener.php b/src/Element/EventListener/InvalidateElementListener.php
similarity index 86%
rename from src/Element/InvalidateElementListener.php
rename to src/Element/EventListener/InvalidateElementListener.php
index d8a2d8f..6a2e9eb 100644
--- a/src/Element/InvalidateElementListener.php
+++ b/src/Element/EventListener/InvalidateElementListener.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Element;
+namespace Neusta\Pimcore\HttpCacheBundle\Element\EventListener;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementInvalidationEvent;
 use Pimcore\Event\Model\ElementEventInterface;
 use Pimcore\Model\Element\ElementInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
diff --git a/src/Element/TagElementListener.php b/src/Element/EventListener/TagElementListener.php
similarity index 79%
rename from src/Element/TagElementListener.php
rename to src/Element/EventListener/TagElementListener.php
index a91452d..183eb7e 100644
--- a/src/Element/TagElementListener.php
+++ b/src/Element/EventListener/TagElementListener.php
@@ -1,8 +1,9 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Element;
+namespace Neusta\Pimcore\HttpCacheBundle\Element\EventListener;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementTaggingEvent;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 use Pimcore\Event\Model\ElementEventInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
index 4d0b554..2b9920b 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/src/Exception/InvalidArgumentException.php
@@ -2,7 +2,7 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Exception;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType;
 
 final class InvalidArgumentException extends \InvalidArgumentException implements PimcoreHttpCacheException
 {
@@ -11,7 +11,7 @@ public static function becauseCacheTagIsEmpty(): self
         return new self('Cache tag must not be empty.');
     }
 
-    public static function becauseCacheTypeIsReserved(CacheType $type): self
+    public static function becauseCacheTypeIsReserved(CacheTagType $type): self
     {
         return new self(\sprintf(
             'The cache type "%s" is reserved for Pimcore elements.',
diff --git a/src/Exception/PimcoreHttpCacheException.php b/src/Exception/PimcoreHttpCacheException.php
index fa86351..a22658a 100644
--- a/src/Exception/PimcoreHttpCacheException.php
+++ b/src/Exception/PimcoreHttpCacheException.php
@@ -3,7 +3,7 @@
 namespace Neusta\Pimcore\HttpCacheBundle\Exception;
 
 /**
- *  Interface for all exceptions thrown by the PimcoreHttpCacheBundle.
+ * Interface for all exceptions thrown by the PimcoreHttpCacheBundle.
  */
 interface PimcoreHttpCacheException
 {
diff --git a/src/Cache/ResponseTagger.php b/src/ResponseTagger.php
similarity index 69%
rename from src/Cache/ResponseTagger.php
rename to src/ResponseTagger.php
index 8577d7a..cc4cf1d 100644
--- a/src/Cache/ResponseTagger.php
+++ b/src/ResponseTagger.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache;
+namespace Neusta\Pimcore\HttpCacheBundle;
 
 interface ResponseTagger
 {
diff --git a/src/Cache/ResponseTagger/OnlyWhenActiveResponseTagger.php b/src/ResponseTagger/OnlyWhenActiveResponseTagger.php
similarity index 73%
rename from src/Cache/ResponseTagger/OnlyWhenActiveResponseTagger.php
rename to src/ResponseTagger/OnlyWhenActiveResponseTagger.php
index 249fea4..6860403 100644
--- a/src/Cache/ResponseTagger/OnlyWhenActiveResponseTagger.php
+++ b/src/ResponseTagger/OnlyWhenActiveResponseTagger.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
+namespace Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
 use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 
 final class OnlyWhenActiveResponseTagger implements ResponseTagger
 {
diff --git a/src/Cache/ResponseTagger/RemoveDisabledTagsResponseTagger.php b/src/ResponseTagger/RemoveDisabledTagsResponseTagger.php
similarity index 62%
rename from src/Cache/ResponseTagger/RemoveDisabledTagsResponseTagger.php
rename to src/ResponseTagger/RemoveDisabledTagsResponseTagger.php
index c2669a1..cd2cff4 100644
--- a/src/Cache/ResponseTagger/RemoveDisabledTagsResponseTagger.php
+++ b/src/ResponseTagger/RemoveDisabledTagsResponseTagger.php
@@ -1,10 +1,10 @@
 <?php declare(strict_types=1);
 
-namespace Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
+namespace Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 
 final class RemoveDisabledTagsResponseTagger implements ResponseTagger
 {
diff --git a/tests/Integration/Helpers/ArrangeCacheTest.php b/tests/Integration/Helpers/ArrangeCacheTest.php
index 414f712..bedd907 100644
--- a/tests/Integration/Helpers/ArrangeCacheTest.php
+++ b/tests/Integration/Helpers/ArrangeCacheTest.php
@@ -17,7 +17,7 @@ trait ArrangeCacheTest
      */
     public static function arrange(\Closure $arrange): mixed
     {
-        $cacheActivator = self::getContainer()->get(CacheActivator::class);
+        $cacheActivator = self::getContainer()->get('test.cache_activator');
         \assert($cacheActivator instanceof CacheActivator);
 
         $wasActive = $cacheActivator->isCachingActive();
diff --git a/tests/Integration/Invalidation/CancelInvalidationTest.php b/tests/Integration/Invalidation/CancelInvalidationTest.php
index ec9364c..91c4e9e 100644
--- a/tests/Integration/Invalidation/CancelInvalidationTest.php
+++ b/tests/Integration/Invalidation/CancelInvalidationTest.php
@@ -3,7 +3,7 @@
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Invalidation;
 
 use FOS\HttpCacheBundle\CacheManager;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementInvalidationEvent;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementInvalidationEvent;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\ArrangeCacheTest;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestAssetFactory;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestDocumentFactory;
diff --git a/tests/Integration/Invalidation/InvalidateAdditionalTagTest.php b/tests/Integration/Invalidation/InvalidateAdditionalTagTest.php
index 55f8662..0c65396 100644
--- a/tests/Integration/Invalidation/InvalidateAdditionalTagTest.php
+++ b/tests/Integration/Invalidation/InvalidateAdditionalTagTest.php
@@ -3,9 +3,9 @@
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Invalidation;
 
 use FOS\HttpCacheBundle\CacheManager;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\CustomCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementInvalidationEvent;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\CustomCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementInvalidationEvent;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\ArrangeCacheTest;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestAssetFactory;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestDocumentFactory;
@@ -35,7 +35,7 @@ protected function setUp(): void
         self::getContainer()->get('event_dispatcher')->addListener(
             ElementInvalidationEvent::class,
             fn (ElementInvalidationEvent $event) => $event->addTag(
-                CacheTag::fromString('bar', new CustomCacheType('foo')),
+                CacheTag::fromString('bar', new CustomCacheTagType('foo')),
             ),
         );
     }
diff --git a/tests/Integration/Tagging/TagAdditionalTagTest.php b/tests/Integration/Tagging/TagAdditionalTagTest.php
index 5abf34f..d8a0af5 100644
--- a/tests/Integration/Tagging/TagAdditionalTagTest.php
+++ b/tests/Integration/Tagging/TagAdditionalTagTest.php
@@ -2,11 +2,11 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Tagging;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\CustomCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\ElementCacheType;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementTaggingEvent;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\CustomCacheTagType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\ElementCacheTagType;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementType;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementTaggingEvent;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\ArrangeCacheTest;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestAssetFactory;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\TestDocumentFactory;
@@ -50,7 +50,7 @@ public function response_is_tagged_with_additional_tag_when_asset_is_loaded(): v
         self::getContainer()->get('event_dispatcher')->addListener(
             ElementTaggingEvent::class,
             fn (ElementTaggingEvent $event) => $event->addTag(
-                CacheTag::fromString('17', new ElementCacheType(ElementType::Asset)),
+                CacheTag::fromString('17', new ElementCacheTagType(ElementType::Asset)),
             ),
         );
 
@@ -80,7 +80,7 @@ public function response_is_tagged_with_additional_tag_when_document_is_loaded()
         self::getContainer()->get('event_dispatcher')->addListener(
             ElementTaggingEvent::class,
             fn (ElementTaggingEvent $event) => $event->addTag(
-                CacheTag::fromString('23', new ElementCacheType(ElementType::Document)),
+                CacheTag::fromString('23', new ElementCacheTagType(ElementType::Document)),
             ),
         );
 
@@ -110,7 +110,7 @@ public function response_is_tagged_with_additional_tag_when_object_is_loaded():
         self::getContainer()->get('event_dispatcher')->addListener(
             ElementTaggingEvent::class,
             fn (ElementTaggingEvent $event) => $event->addTag(
-                CacheTag::fromString('17', new ElementCacheType(ElementType::Object)),
+                CacheTag::fromString('17', new ElementCacheTagType(ElementType::Object)),
             ),
         );
 
@@ -142,7 +142,7 @@ public function response_is_tagged_with_custom_tag_when_element_is_loaded(): voi
         self::getContainer()->get('event_dispatcher')->addListener(
             ElementTaggingEvent::class,
             fn (ElementTaggingEvent $event) => $event->addTag(
-                CacheTag::fromString('bar', new CustomCacheType('foo')),
+                CacheTag::fromString('bar', new CustomCacheTagType('foo')),
             ),
         );
 
diff --git a/tests/Unit/Adapter/FOSHttpCache/CacheInvalidatorAdapterTest.php b/tests/Unit/Adapter/FOSHttpCache/CacheInvalidatorAdapterTest.php
index 01656c2..ed90a79 100644
--- a/tests/Unit/Adapter/FOSHttpCache/CacheInvalidatorAdapterTest.php
+++ b/tests/Unit/Adapter/FOSHttpCache/CacheInvalidatorAdapterTest.php
@@ -4,7 +4,7 @@
 
 use FOS\HttpCache\CacheInvalidator as FosCacheInvalidator;
 use Neusta\Pimcore\HttpCacheBundle\Adapter\FOSHttpCache\CacheInvalidatorAdapter;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Unit/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidatorTest.php b/tests/Unit/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidatorTest.php
index 9f9de17..be4a651 100644
--- a/tests/Unit/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidatorTest.php
+++ b/tests/Unit/Cache/CacheInvalidator/OnlyWhenActiveCacheInvalidatorTest.php
@@ -2,10 +2,10 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\CacheInvalidator;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator\OnlyWhenActiveCacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
 use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator\OnlyWhenActiveCacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Unit/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidatorTest.php b/tests/Unit/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidatorTest.php
index 6f6441e..1780f51 100644
--- a/tests/Unit/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidatorTest.php
+++ b/tests/Unit/Cache/CacheInvalidator/RemoveDisabledTagsCacheInvalidatorTest.php
@@ -2,11 +2,11 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\CacheInvalidator;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator\RemoveDisabledTagsCacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator\RemoveDisabledTagsCacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/tests/Unit/Cache/CacheTagChecker/ElementCacheTagCheckerTest.php b/tests/Unit/Cache/CacheTagChecker/ElementCacheTagCheckerTest.php
index 259b2c2..e56c2d5 100644
--- a/tests/Unit/Cache/CacheTagChecker/ElementCacheTagCheckerTest.php
+++ b/tests/Unit/Cache/CacheTagChecker/ElementCacheTagCheckerTest.php
@@ -2,10 +2,10 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\CacheTagChecker;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\ElementCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\CustomCacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker\ElementCacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\CustomCacheTagType;
 use Neusta\Pimcore\HttpCacheBundle\Element\ElementRepository;
 use PHPUnit\Framework\TestCase;
 use Pimcore\Model\Asset;
@@ -35,7 +35,7 @@ protected function setUp(): void
      */
     public function it_delegates_cache_tag_check_to_next_cache_tag_checker(): void
     {
-        $tag = CacheTag::fromString('foo', new CustomCacheType('custom'));
+        $tag = CacheTag::fromString('foo', new CustomCacheTagType('custom'));
         $elementCacheTagChecker = new ElementCacheTagChecker(
             $this->innerCacheTagChecker->reveal(),
             $this->elementRepository->reveal(),
diff --git a/tests/Unit/Cache/CacheTagChecker/StaticCacheTagCheckerTest.php b/tests/Unit/Cache/CacheTagChecker/StaticCacheTagCheckerTest.php
index 023aafd..76303a5 100644
--- a/tests/Unit/Cache/CacheTagChecker/StaticCacheTagCheckerTest.php
+++ b/tests/Unit/Cache/CacheTagChecker/StaticCacheTagCheckerTest.php
@@ -2,9 +2,9 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\CacheTagChecker;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker\StaticCacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheType\CustomCacheType;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker\StaticCacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagType\CustomCacheTagType;
 use PHPUnit\Framework\TestCase;
 
 final class StaticCacheTagCheckerTest extends TestCase
@@ -28,7 +28,7 @@ public function it_returns_true_when_cache_type_is_enabled(): void
     {
         self::assertTrue(
             (new StaticCacheTagChecker(['foo' => true]))->isEnabled(
-                CacheTag::fromString('foo', new CustomCacheType('foo')),
+                CacheTag::fromString('foo', new CustomCacheTagType('foo')),
             ),
         );
     }
@@ -40,7 +40,7 @@ public function it_returns_false_when_cache_type_is_disabled(): void
     {
         self::assertFalse(
             (new StaticCacheTagChecker(['foo' => false]))->isEnabled(
-                CacheTag::fromString('foo', new CustomCacheType('foo')),
+                CacheTag::fromString('foo', new CustomCacheTagType('foo')),
             ),
         );
     }
@@ -52,7 +52,7 @@ public function it_returns_false_when_cache_type_is_not_set(): void
     {
         self::assertFalse(
             (new StaticCacheTagChecker(['bar' => true]))->isEnabled(
-                CacheTag::fromString('foo', new CustomCacheType('foo')),
+                CacheTag::fromString('foo', new CustomCacheTagType('foo')),
             ),
         );
     }
diff --git a/tests/Unit/Cache/ResponseTagger/OnlyWhenActiveResponseTaggerTest.php b/tests/Unit/Cache/ResponseTagger/OnlyWhenActiveResponseTaggerTest.php
index 3512462..fd2ea0b 100644
--- a/tests/Unit/Cache/ResponseTagger/OnlyWhenActiveResponseTaggerTest.php
+++ b/tests/Unit/Cache/ResponseTagger/OnlyWhenActiveResponseTaggerTest.php
@@ -2,10 +2,10 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\ResponseTagger;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger\OnlyWhenActiveResponseTagger;
 use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger\OnlyWhenActiveResponseTagger;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
diff --git a/tests/Unit/Cache/ResponseTagger/RemoveDisabledTagsResponseTaggerTest.php b/tests/Unit/Cache/ResponseTagger/RemoveDisabledTagsResponseTaggerTest.php
index 7cf836e..16a4a7c 100644
--- a/tests/Unit/Cache/ResponseTagger/RemoveDisabledTagsResponseTaggerTest.php
+++ b/tests/Unit/Cache/ResponseTagger/RemoveDisabledTagsResponseTaggerTest.php
@@ -2,11 +2,11 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Cache\ResponseTagger;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTagChecker;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger\RemoveDisabledTagsResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag\CacheTagChecker;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger\RemoveDisabledTagsResponseTagger;
 use PHPUnit\Framework\TestCase;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Prophecy\Prophecy\ObjectProphecy;
diff --git a/tests/Unit/Element/InvalidateElementListenerTest.php b/tests/Unit/Element/InvalidateElementListenerTest.php
index 21d541b..33f4bcc 100644
--- a/tests/Unit/Element/InvalidateElementListenerTest.php
+++ b/tests/Unit/Element/InvalidateElementListenerTest.php
@@ -2,11 +2,11 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Element;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheInvalidator;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementInvalidationEvent;
-use Neusta\Pimcore\HttpCacheBundle\Element\InvalidateElementListener;
+use Neusta\Pimcore\HttpCacheBundle\CacheInvalidator;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementInvalidationEvent;
+use Neusta\Pimcore\HttpCacheBundle\Element\EventListener\InvalidateElementListener;
 use PHPUnit\Framework\TestCase;
 use Pimcore\Event\Model\AssetEvent;
 use Pimcore\Event\Model\DataObjectEvent;
diff --git a/tests/Unit/Element/TagElementListenerTest.php b/tests/Unit/Element/TagElementListenerTest.php
index 0bc2dfc..fe0cb2e 100644
--- a/tests/Unit/Element/TagElementListenerTest.php
+++ b/tests/Unit/Element/TagElementListenerTest.php
@@ -2,11 +2,11 @@
 
 namespace Neusta\Pimcore\HttpCacheBundle\Tests\Unit\Element;
 
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTag;
-use Neusta\Pimcore\HttpCacheBundle\Cache\CacheTags;
-use Neusta\Pimcore\HttpCacheBundle\Cache\ResponseTagger;
-use Neusta\Pimcore\HttpCacheBundle\Element\ElementTaggingEvent;
-use Neusta\Pimcore\HttpCacheBundle\Element\TagElementListener;
+use Neusta\Pimcore\HttpCacheBundle\CacheTag;
+use Neusta\Pimcore\HttpCacheBundle\CacheTags;
+use Neusta\Pimcore\HttpCacheBundle\Element\Event\ElementTaggingEvent;
+use Neusta\Pimcore\HttpCacheBundle\Element\EventListener\TagElementListener;
+use Neusta\Pimcore\HttpCacheBundle\ResponseTagger;
 use PHPUnit\Framework\TestCase;
 use Pimcore\Event\Model\AssetEvent;
 use Pimcore\Event\Model\DataObjectEvent;
diff --git a/tests/app/config/services.php b/tests/app/config/services.php
index 1cccc0f..d9e71d1 100644
--- a/tests/app/config/services.php
+++ b/tests/app/config/services.php
@@ -2,7 +2,6 @@
 
 namespace Symfony\Component\DependencyInjection\Loader\Configurator;
 
-use Neusta\Pimcore\HttpCacheBundle\CacheActivator;
 use Neusta\Pimcore\HttpCacheBundle\Tests\Integration\Helpers\ClearRuntimeCacheListener;
 use Pimcore\Event\AssetEvents;
 use Pimcore\Event\DataObjectEvents;
@@ -25,6 +24,6 @@
         ->tag('kernel.event_listener', ['event' => DocumentEvents::POST_UPDATE])
         ->tag('kernel.event_listener', ['event' => DocumentEvents::POST_DELETE]);
 
-    $services->set(CacheActivator::class)
+    $services->alias('test.cache_activator', 'neusta_pimcore_http_cache.cache_activator')
         ->public();
 };