diff --git a/composer.json b/composer.json
index 65edeae5..2f7b201b 100644
--- a/composer.json
+++ b/composer.json
@@ -75,7 +75,8 @@
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
             "Shlinkio\\Shlink\\Common\\": "module/Common/src",
             "Shlinkio\\Shlink\\EventDispatcher\\": "module/EventDispatcher/src",
-            "Shlinkio\\Shlink\\IpGeolocation\\": "module/IpGeolocation/src/"
+            "Shlinkio\\Shlink\\IpGeolocation\\": "module/IpGeolocation/src/",
+            "Shlinkio\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/src/"
         },
         "files": [
             "module/Common/functions/functions.php",
@@ -94,6 +95,7 @@
             "ShlinkioTest\\Shlink\\Common\\": "module/Common/test",
             "ShlinkioTest\\Shlink\\EventDispatcher\\": "module/EventDispatcher/test",
             "ShlinkioTest\\Shlink\\IpGeolocation\\": "module/IpGeolocation/test",
+            "ShlinkioTest\\Shlink\\PreviewGenerator\\": "module/PreviewGenerator/test",
             "Shlinkio\\Shlink\\TestUtils\\": "module/TestUtils/src"
         }
     },
diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php
index f014bcb2..2376e5af 100644
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -7,10 +7,10 @@ use Doctrine\DBAL\Connection;
 use GeoIp2\Database\Reader;
 use Shlinkio\Shlink\CLI\Util\GeolocationDbUpdater;
 use Shlinkio\Shlink\Common\Doctrine\NoDbNameConnectionFactory;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Service;
 use Shlinkio\Shlink\IpGeolocation\GeoLite2\DbUpdater;
 use Shlinkio\Shlink\IpGeolocation\Resolver\IpLocationResolverInterface;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Shlinkio\Shlink\Rest\Service\ApiKeyService;
 use Symfony\Component\Console as SymfonyCli;
 use Symfony\Component\Lock\Factory as Locker;
diff --git a/module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php b/module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php
index 9cabe664..3f33f7b0 100644
--- a/module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php
+++ b/module/CLI/src/Command/ShortUrl/GeneratePreviewCommand.php
@@ -5,8 +5,8 @@ namespace Shlinkio\Shlink\CLI\Command\ShortUrl;
 
 use Shlinkio\Shlink\CLI\Util\ExitCodes;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGeneratorInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
diff --git a/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php b/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
index 478977d5..80e7222f 100644
--- a/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
+++ b/module/CLI/test/Command/ShortUrl/GeneratePreviewCommandTest.php
@@ -8,9 +8,9 @@ use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\CLI\Command\ShortUrl\GeneratePreviewCommand;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Symfony\Component\Console\Application;
 use Symfony\Component\Console\Tester\CommandTester;
 use Zend\Paginator\Adapter\ArrayAdapter;
diff --git a/module/Common/config/dependencies.config.php b/module/Common/config/dependencies.config.php
index fec932e1..d4d3110d 100644
--- a/module/Common/config/dependencies.config.php
+++ b/module/Common/config/dependencies.config.php
@@ -25,10 +25,6 @@ return [
             Middleware\LocaleMiddleware::class => ConfigAbstractFactory::class,
             Middleware\CloseDbConnectionMiddleware::class => ConfigAbstractFactory::class,
             IpAddress::class => Middleware\IpAddressMiddlewareFactory::class,
-
-            Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
-
-            Service\PreviewGenerator::class => ConfigAbstractFactory::class,
         ],
         'aliases' => [
             'httpClient' => GuzzleClient::class,
@@ -47,12 +43,6 @@ return [
         Template\Extension\TranslatorExtension::class => ['translator'],
         Middleware\LocaleMiddleware::class => ['translator'],
         Middleware\CloseDbConnectionMiddleware::class => ['em'],
-
-        Service\PreviewGenerator::class => [
-            Image\ImageBuilder::class,
-            Filesystem::class,
-            'config.preview_generation.files_location',
-        ],
     ],
 
 ];
diff --git a/module/Core/config/dependencies.config.php b/module/Core/config/dependencies.config.php
index 28ea8a56..283205c3 100644
--- a/module/Core/config/dependencies.config.php
+++ b/module/Core/config/dependencies.config.php
@@ -5,8 +5,8 @@ namespace Shlinkio\Shlink\Core;
 
 use Doctrine\Common\Cache\Cache;
 use Psr\EventDispatcher\EventDispatcherInterface;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Response\NotFoundHandler;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Zend\Expressive\Router\RouterInterface;
 use Zend\Expressive\Template\TemplateRendererInterface;
 use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
diff --git a/module/Core/src/Action/PreviewAction.php b/module/Core/src/Action/PreviewAction.php
index a86a3358..5ada47ec 100644
--- a/module/Core/src/Action/PreviewAction.php
+++ b/module/Core/src/Action/PreviewAction.php
@@ -11,11 +11,11 @@ use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 use Shlinkio\Shlink\Common\Response\ResponseUtilsTrait;
-use Shlinkio\Shlink\Common\Service\PreviewGeneratorInterface;
 use Shlinkio\Shlink\Core\Action\Util\ErrorResponseBuilderTrait;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGeneratorInterface;
 
 /** @deprecated */
 class PreviewAction implements MiddlewareInterface
diff --git a/module/Core/test/Action/PreviewActionTest.php b/module/Core/test/Action/PreviewActionTest.php
index 3fba9948..f8f74d88 100644
--- a/module/Core/test/Action/PreviewActionTest.php
+++ b/module/Core/test/Action/PreviewActionTest.php
@@ -8,12 +8,12 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Psr\Http\Server\RequestHandlerInterface;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
 use Shlinkio\Shlink\Core\Action\PreviewAction;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Exception\EntityDoesNotExistException;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use ShlinkioTest\Shlink\Common\Util\TestUtils;
 use Zend\Diactoros\Response;
 use Zend\Diactoros\ServerRequest;
diff --git a/module/PreviewGenerator/config/dependencies.config.php b/module/PreviewGenerator/config/dependencies.config.php
new file mode 100644
index 00000000..03b92fc0
--- /dev/null
+++ b/module/PreviewGenerator/config/dependencies.config.php
@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\PreviewGenerator;
+
+use Symfony\Component\Filesystem\Filesystem;
+use Zend\ServiceManager\AbstractFactory\ConfigAbstractFactory;
+
+return [
+
+    'dependencies' => [
+        'factories' => [
+            Image\ImageBuilder::class => Image\ImageBuilderFactory::class,
+            Service\PreviewGenerator::class => ConfigAbstractFactory::class,
+        ],
+    ],
+
+    ConfigAbstractFactory::class => [
+        Service\PreviewGenerator::class => [
+            Image\ImageBuilder::class,
+            Filesystem::class,
+            'config.preview_generation.files_location',
+        ],
+    ],
+
+];
diff --git a/module/PreviewGenerator/src/ConfigProvider.php b/module/PreviewGenerator/src/ConfigProvider.php
new file mode 100644
index 00000000..2a51f6c3
--- /dev/null
+++ b/module/PreviewGenerator/src/ConfigProvider.php
@@ -0,0 +1,15 @@
+<?php
+declare(strict_types=1);
+
+namespace Shlinkio\Shlink\PreviewGenerator;
+
+use function Shlinkio\Shlink\Common\loadConfigFromGlob;
+
+/** @deprecated */
+class ConfigProvider
+{
+    public function __invoke(): array
+    {
+        return loadConfigFromGlob(__DIR__ . '/../config/{,*.}config.php');
+    }
+}
diff --git a/module/Common/src/Image/ImageBuilder.php b/module/PreviewGenerator/src/Image/ImageBuilder.php
similarity index 83%
rename from module/Common/src/Image/ImageBuilder.php
rename to module/PreviewGenerator/src/Image/ImageBuilder.php
index 06940327..4703bdee 100644
--- a/module/Common/src/Image/ImageBuilder.php
+++ b/module/PreviewGenerator/src/Image/ImageBuilder.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Image;
+namespace Shlinkio\Shlink\PreviewGenerator\Image;
 
 use mikehaertl\wkhtmlto\Image;
 use Zend\ServiceManager\AbstractPluginManager;
diff --git a/module/Common/src/Image/ImageBuilderFactory.php b/module/PreviewGenerator/src/Image/ImageBuilderFactory.php
similarity index 95%
rename from module/Common/src/Image/ImageBuilderFactory.php
rename to module/PreviewGenerator/src/Image/ImageBuilderFactory.php
index 93c369bb..fca5aa18 100644
--- a/module/Common/src/Image/ImageBuilderFactory.php
+++ b/module/PreviewGenerator/src/Image/ImageBuilderFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Image;
+namespace Shlinkio\Shlink\PreviewGenerator\Image;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
diff --git a/module/Common/src/Image/ImageBuilderInterface.php b/module/PreviewGenerator/src/Image/ImageBuilderInterface.php
similarity index 77%
rename from module/Common/src/Image/ImageBuilderInterface.php
rename to module/PreviewGenerator/src/Image/ImageBuilderInterface.php
index c2d3c820..559ed29e 100644
--- a/module/Common/src/Image/ImageBuilderInterface.php
+++ b/module/PreviewGenerator/src/Image/ImageBuilderInterface.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Image;
+namespace Shlinkio\Shlink\PreviewGenerator\Image;
 
 use Zend\ServiceManager\ServiceLocatorInterface;
 
diff --git a/module/Common/src/Image/ImageFactory.php b/module/PreviewGenerator/src/Image/ImageFactory.php
similarity index 95%
rename from module/Common/src/Image/ImageFactory.php
rename to module/PreviewGenerator/src/Image/ImageFactory.php
index b02cde04..87dc2a39 100644
--- a/module/Common/src/Image/ImageFactory.php
+++ b/module/PreviewGenerator/src/Image/ImageFactory.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Image;
+namespace Shlinkio\Shlink\PreviewGenerator\Image;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
diff --git a/module/Common/src/Service/PreviewGenerator.php b/module/PreviewGenerator/src/Service/PreviewGenerator.php
similarity index 93%
rename from module/Common/src/Service/PreviewGenerator.php
rename to module/PreviewGenerator/src/Service/PreviewGenerator.php
index 8c44b2eb..e6a46389 100644
--- a/module/Common/src/Service/PreviewGenerator.php
+++ b/module/PreviewGenerator/src/Service/PreviewGenerator.php
@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Service;
+namespace Shlinkio\Shlink\PreviewGenerator\Service;
 
 use mikehaertl\wkhtmlto\Image;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Image\ImageBuilderInterface;
+use Shlinkio\Shlink\PreviewGenerator\Image\ImageBuilderInterface;
 use Symfony\Component\Filesystem\Filesystem;
 
 use function sprintf;
diff --git a/module/Common/src/Service/PreviewGeneratorInterface.php b/module/PreviewGenerator/src/Service/PreviewGeneratorInterface.php
similarity index 87%
rename from module/Common/src/Service/PreviewGeneratorInterface.php
rename to module/PreviewGenerator/src/Service/PreviewGeneratorInterface.php
index 2c9c0c72..831d6bd9 100644
--- a/module/Common/src/Service/PreviewGeneratorInterface.php
+++ b/module/PreviewGenerator/src/Service/PreviewGeneratorInterface.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Common\Service;
+namespace Shlinkio\Shlink\PreviewGenerator\Service;
 
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
 
diff --git a/module/PreviewGenerator/test/ConfigProviderTest.php b/module/PreviewGenerator/test/ConfigProviderTest.php
new file mode 100644
index 00000000..d7d7e13c
--- /dev/null
+++ b/module/PreviewGenerator/test/ConfigProviderTest.php
@@ -0,0 +1,26 @@
+<?php
+declare(strict_types=1);
+
+namespace ShlinkioTest\Shlink\PreviewGenerator;
+
+use PHPUnit\Framework\TestCase;
+use Shlinkio\Shlink\PreviewGenerator\ConfigProvider;
+
+class ConfigProviderTest extends TestCase
+{
+    /** @var ConfigProvider */
+    private $configProvider;
+
+    public function setUp(): void
+    {
+        $this->configProvider = new ConfigProvider();
+    }
+
+    /** @test */
+    public function configIsReturned(): void
+    {
+        $config = ($this->configProvider)();
+
+        $this->assertArrayHasKey('dependencies', $config);
+    }
+}
diff --git a/module/Common/test/Image/ImageBuilderFactoryTest.php b/module/PreviewGenerator/test/Image/ImageBuilderFactoryTest.php
similarity index 74%
rename from module/Common/test/Image/ImageBuilderFactoryTest.php
rename to module/PreviewGenerator/test/Image/ImageBuilderFactoryTest.php
index 8a5aaab1..935e4526 100644
--- a/module/Common/test/Image/ImageBuilderFactoryTest.php
+++ b/module/PreviewGenerator/test/Image/ImageBuilderFactoryTest.php
@@ -1,11 +1,11 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Image;
+namespace ShlinkioTest\Shlink\PreviewGenerator\Image;
 
 use PHPUnit\Framework\TestCase;
-use Shlinkio\Shlink\Common\Image\ImageBuilder;
-use Shlinkio\Shlink\Common\Image\ImageBuilderFactory;
+use Shlinkio\Shlink\PreviewGenerator\Image\ImageBuilder;
+use Shlinkio\Shlink\PreviewGenerator\Image\ImageBuilderFactory;
 use Zend\ServiceManager\ServiceManager;
 
 class ImageBuilderFactoryTest extends TestCase
diff --git a/module/Common/test/Image/ImageFactoryTest.php b/module/PreviewGenerator/test/Image/ImageFactoryTest.php
similarity index 92%
rename from module/Common/test/Image/ImageFactoryTest.php
rename to module/PreviewGenerator/test/Image/ImageFactoryTest.php
index eb0e4af0..ca66bff4 100644
--- a/module/Common/test/Image/ImageFactoryTest.php
+++ b/module/PreviewGenerator/test/Image/ImageFactoryTest.php
@@ -1,12 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Image;
+namespace ShlinkioTest\Shlink\PreviewGenerator\Image;
 
 use mikehaertl\wkhtmlto\Image;
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
-use Shlinkio\Shlink\Common\Image\ImageFactory;
+use Shlinkio\Shlink\PreviewGenerator\Image\ImageFactory;
 use Zend\ServiceManager\ServiceManager;
 
 class ImageFactoryTest extends TestCase
diff --git a/module/Common/test/Service/PreviewGeneratorTest.php b/module/PreviewGenerator/test/Service/PreviewGeneratorTest.php
similarity index 94%
rename from module/Common/test/Service/PreviewGeneratorTest.php
rename to module/PreviewGenerator/test/Service/PreviewGeneratorTest.php
index 4d6e9ea8..fddf5056 100644
--- a/module/Common/test/Service/PreviewGeneratorTest.php
+++ b/module/PreviewGenerator/test/Service/PreviewGeneratorTest.php
@@ -1,15 +1,15 @@
 <?php
 declare(strict_types=1);
 
-namespace ShlinkioTest\Shlink\Common\Service;
+namespace ShlinkioTest\Shlink\PreviewGenerator\Service;
 
 use mikehaertl\wkhtmlto\Image;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Common\Exception\PreviewGenerationException;
-use Shlinkio\Shlink\Common\Image\ImageBuilder;
-use Shlinkio\Shlink\Common\Service\PreviewGenerator;
+use Shlinkio\Shlink\PreviewGenerator\Image\ImageBuilder;
+use Shlinkio\Shlink\PreviewGenerator\Service\PreviewGenerator;
 use Symfony\Component\Filesystem\Filesystem;
 use Zend\ServiceManager\ServiceManager;
 
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 910cdc99..1f0636f5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -24,6 +24,9 @@
         <testsuite name="IpGeolocation">
             <directory>./module/IpGeolocation/test</directory>
         </testsuite>
+        <testsuite name="PreviewGenerator">
+            <directory>./module/PreviewGenerator/test</directory>
+        </testsuite>
     </testsuites>
 
     <filter>
@@ -32,6 +35,7 @@
 
             <exclude>
                 <directory suffix=".php">./module/Core/src/Repository</directory>
+                <directory suffix=".php">./module/TestUtils</directory>
             </exclude>
         </whitelist>
     </filter>