diff --git a/composer.json b/composer.json
index 374fed26..0211ed05 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,8 @@
 {
-    "name": "acelaya/url-shortener",
+    "name": "shlinkio/shlink",
     "type": "project",
-    "homepage": "https://github.com/acelaya/url-shortener",
+    "homepage": "http://shlink.io",
+    "description": "A PHP-based URL shortener application with analytics and management",
     "license": "MIT",
     "authors": [
         {
@@ -19,6 +20,8 @@
         "zendframework/zend-stdlib": "^2.7",
         "zendframework/zend-servicemanager": "^3.0",
         "zendframework/zend-paginator": "^2.6",
+        "zendframework/zend-config": "^2.6",
+        "mtymek/expressive-config-manager": "^0.4",
         "doctrine/orm": "^2.5",
         "guzzlehttp/guzzle": "^6.2",
         "acelaya/zsm-annotated-services": "^0.2.0",
@@ -34,12 +37,18 @@
     },
     "autoload": {
         "psr-4": {
-            "Acelaya\\UrlShortener\\": "src"
+            "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
+            "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
+            "Shlinkio\\Shlink\\Core\\": "module/Core/src",
+            "Shlinkio\\Shlink\\Common\\": "module/Common/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "AcelayaTest\\UrlShortener\\": "tests"
+            "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
+            "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test",
+            "ShlinkioTest\\Shlink\\Common\\": "module/Common/test"
         }
     },
     "scripts": {
diff --git a/config/autoload/middleware-pipeline.global.php b/config/autoload/middleware-pipeline.global.php
index fc6f85f0..ca116a95 100644
--- a/config/autoload/middleware-pipeline.global.php
+++ b/config/autoload/middleware-pipeline.global.php
@@ -1,5 +1,4 @@
 <?php
-use Acelaya\UrlShortener\Middleware;
 use Zend\Expressive\Container\ApplicationFactory;
 use Zend\Expressive\Helper;
 
@@ -20,15 +19,6 @@ return [
             'priority' => 10,
         ],
 
-        'rest' => [
-            'path' => '/rest',
-            'middleware' => [
-                Middleware\CheckAuthenticationMiddleware::class,
-                Middleware\CrossDomainMiddleware::class,
-            ],
-            'priority' => 5,
-        ],
-
         'post-routing' => [
             'middleware' => [
                 Helper\UrlHelperMiddleware::class,
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index 4d6cc40e..dc99033c 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -1,13 +1,4 @@
 <?php
-use Acelaya\UrlShortener\CLI;
-use Acelaya\UrlShortener\Factory\CacheFactory;
-use Acelaya\UrlShortener\Factory\EntityManagerFactory;
-use Acelaya\UrlShortener\Middleware;
-use Acelaya\UrlShortener\Service;
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
-use Doctrine\Common\Cache\Cache;
-use Doctrine\ORM\EntityManager;
-use Symfony\Component\Console;
 use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
@@ -21,7 +12,6 @@ return [
     'services' => [
         'factories' => [
             Expressive\Application::class => Container\ApplicationFactory::class,
-            Console\Application::class => CLI\Factory\ApplicationFactory::class,
 
             // Url helpers
             Helper\UrlHelper::class => Helper\UrlHelperFactory::class,
@@ -33,38 +23,10 @@ return [
             // View
             'Zend\Expressive\FinalHandler' => Container\TemplatedErrorHandlerFactory::class,
             Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
-
-            // Services
-            EntityManager::class => EntityManagerFactory::class,
-            GuzzleHttp\Client::class => InvokableFactory::class,
-            Service\UrlShortener::class => AnnotatedFactory::class,
-            Service\VisitsTracker::class => AnnotatedFactory::class,
-            Service\ShortUrlService::class => AnnotatedFactory::class,
-            Service\RestTokenService::class => AnnotatedFactory::class,
-            Cache::class => CacheFactory::class,
-
-            // Cli commands
-            CLI\Command\GenerateShortcodeCommand::class => AnnotatedFactory::class,
-            CLI\Command\ResolveUrlCommand::class => AnnotatedFactory::class,
-            CLI\Command\ListShortcodesCommand::class => AnnotatedFactory::class,
-            CLI\Command\GetVisitsCommand::class => AnnotatedFactory::class,
-
-            // Middleware
-            Middleware\Routable\RedirectMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\AuthenticateMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\CreateShortcodeMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\ResolveUrlMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\GetVisitsMiddleware::class => AnnotatedFactory::class,
-            Middleware\Rest\ListShortcodesMiddleware::class => AnnotatedFactory::class,
-            Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
-            Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
         ],
         'aliases' => [
-            'em' => EntityManager::class,
-            'httpClient' => GuzzleHttp\Client::class,
             Router\RouterInterface::class => Router\FastRouteRouter::class,
-            AnnotatedFactory::CACHE_SERVICE => Cache::class,
-        ]
+        ],
     ],
 
 ];
diff --git a/config/autoload/templates.global.php b/config/autoload/templates.global.php
index 2beb9918..f102baa0 100644
--- a/config/autoload/templates.global.php
+++ b/config/autoload/templates.global.php
@@ -2,12 +2,6 @@
 
 return [
 
-    'templates' => [
-        'paths' => [
-            'templates'
-        ],
-    ],
-
     'twig' => [
         'cache_dir'  => 'data/cache/twig',
         'extensions' => [
diff --git a/config/autoload/zend-expressive.global.php b/config/autoload/zend-expressive.global.php
index db5e3f38..aa2e9d3b 100644
--- a/config/autoload/zend-expressive.global.php
+++ b/config/autoload/zend-expressive.global.php
@@ -1,14 +1,8 @@
 <?php
 
 return [
+
     'debug' => false,
+    'config_cache_enabled' => true,
 
-    'config_cache_enabled' => false,
-
-    'zend-expressive' => [
-        'error_handler' => [
-            'template_404'   => 'error/404.html.twig',
-            'template_error' => 'error/error.html.twig',
-        ],
-    ],
 ];
diff --git a/cli-config.php b/config/cli-config.php
similarity index 83%
rename from cli-config.php
rename to config/cli-config.php
index be9b8b82..30e31a93 100644
--- a/cli-config.php
+++ b/config/cli-config.php
@@ -4,7 +4,7 @@ use Doctrine\ORM\Tools\Console\ConsoleRunner;
 use Interop\Container\ContainerInterface;
 
 /** @var ContainerInterface $container */
-$container = include __DIR__ . '/config/container.php';
+$container = include __DIR__ . '/container.php';
 /** @var EntityManager $em */
 $em = $container->get(EntityManager::class);
 
diff --git a/config/config.php b/config/config.php
index a3d0e7ac..736b8fd4 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,6 +1,10 @@
 <?php
-use Zend\Stdlib\ArrayUtils;
-use Zend\Stdlib\Glob;
+use Shlinkio\Shlink\CLI;
+use Shlinkio\Shlink\Common;
+use Shlinkio\Shlink\Core;
+use Shlinkio\Shlink\Rest;
+use Zend\Expressive\ConfigManager\ConfigManager;
+use Zend\Expressive\ConfigManager\ZendConfigProvider;
 
 /**
  * Configuration files are loaded in a specific order. First ``global.php``, then ``*.global.php``.
@@ -11,22 +15,14 @@ use Zend\Stdlib\Glob;
  * Obviously, if you use closures in your config you can't cache it.
  */
 
-$cachedConfigFile = 'data/cache/app_config.php';
+return call_user_func(function () {
+    $configManager = new ConfigManager([
+        new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php'),
+        Common\ConfigProvider::class,
+        Core\ConfigProvider::class,
+        CLI\ConfigProvider::class,
+        Rest\ConfigProvider::class,
+    ], 'data/cache/app_config.php');
 
-$config = [];
-if (is_file($cachedConfigFile)) {
-    // Try to load the cached config
-    $config = include $cachedConfigFile;
-} else {
-    // Load configuration from autoload path
-    foreach (Glob::glob('config/autoload/{{,*.}global,{,*.}local}.php', Glob::GLOB_BRACE) as $file) {
-        $config = ArrayUtils::merge($config, include $file);
-    }
-
-    // Cache config if enabled
-    if (isset($config['config_cache_enabled']) && $config['config_cache_enabled'] === true) {
-        file_put_contents($cachedConfigFile, '<?php return ' . var_export($config, true) . ';');
-    }
-}
-
-return $config;
+    return $configManager->getMergedConfig();
+});
diff --git a/config/autoload/cli.global.php b/module/CLI/config/cli.config.php
similarity index 87%
rename from config/autoload/cli.global.php
rename to module/CLI/config/cli.config.php
index 1276cc9e..6c34f19c 100644
--- a/config/autoload/cli.global.php
+++ b/module/CLI/config/cli.config.php
@@ -1,5 +1,5 @@
 <?php
-use Acelaya\UrlShortener\CLI\Command;
+use Shlinkio\Shlink\CLI\Command;
 
 return [
 
diff --git a/module/CLI/config/services.config.php b/module/CLI/config/services.config.php
new file mode 100644
index 00000000..839e92f8
--- /dev/null
+++ b/module/CLI/config/services.config.php
@@ -0,0 +1,19 @@
+<?php
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+use Shlinkio\Shlink\CLI;
+use Symfony\Component\Console;
+
+return [
+
+    'services' => [
+        'factories' => [
+            Console\Application::class => CLI\Factory\ApplicationFactory::class,
+
+            CLI\Command\GenerateShortcodeCommand::class => AnnotatedFactory::class,
+            CLI\Command\ResolveUrlCommand::class => AnnotatedFactory::class,
+            CLI\Command\ListShortcodesCommand::class => AnnotatedFactory::class,
+            CLI\Command\GetVisitsCommand::class => AnnotatedFactory::class,
+        ],
+    ],
+
+];
diff --git a/src/CLI/Command/GenerateShortcodeCommand.php b/module/CLI/src/Command/GenerateShortcodeCommand.php
similarity index 91%
rename from src/CLI/Command/GenerateShortcodeCommand.php
rename to module/CLI/src/Command/GenerateShortcodeCommand.php
index ffc355db..91cbd228 100644
--- a/src/CLI/Command/GenerateShortcodeCommand.php
+++ b/module/CLI/src/Command/GenerateShortcodeCommand.php
@@ -1,16 +1,15 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
-use Acelaya\UrlShortener\Exception\InvalidUrlException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\Console\Question\ChoiceQuestion;
 use Symfony\Component\Console\Question\Question;
 use Zend\Diactoros\Uri;
 
diff --git a/src/CLI/Command/GetVisitsCommand.php b/module/CLI/src/Command/GetVisitsCommand.php
similarity index 93%
rename from src/CLI/Command/GetVisitsCommand.php
rename to module/CLI/src/Command/GetVisitsCommand.php
index 3c4e796d..ee4cf3ad 100644
--- a/src/CLI/Command/GetVisitsCommand.php
+++ b/module/CLI/src/Command/GetVisitsCommand.php
@@ -1,9 +1,9 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
-use Acelaya\UrlShortener\Service\VisitsTracker;
-use Acelaya\UrlShortener\Service\VisitsTrackerInterface;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Core\Service\VisitsTracker;
+use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Helper\Table;
diff --git a/src/CLI/Command/ListShortcodesCommand.php b/module/CLI/src/Command/ListShortcodesCommand.php
similarity index 89%
rename from src/CLI/Command/ListShortcodesCommand.php
rename to module/CLI/src/Command/ListShortcodesCommand.php
index ac85d50f..1db1f3fb 100644
--- a/src/CLI/Command/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/ListShortcodesCommand.php
@@ -1,11 +1,11 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
-use Acelaya\UrlShortener\Paginator\Adapter\PaginableRepositoryAdapter;
-use Acelaya\UrlShortener\Paginator\Util\PaginatorUtilsTrait;
-use Acelaya\UrlShortener\Service\ShortUrlService;
-use Acelaya\UrlShortener\Service\ShortUrlServiceInterface;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
+use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
+use Shlinkio\Shlink\Core\Service\ShortUrlService;
+use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Helper\Table;
diff --git a/src/CLI/Command/ResolveUrlCommand.php b/module/CLI/src/Command/ResolveUrlCommand.php
similarity index 91%
rename from src/CLI/Command/ResolveUrlCommand.php
rename to module/CLI/src/Command/ResolveUrlCommand.php
index 4eb5ff41..01dad903 100644
--- a/src/CLI/Command/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/ResolveUrlCommand.php
@@ -1,10 +1,10 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Helper\QuestionHelper;
 use Symfony\Component\Console\Input\InputArgument;
diff --git a/module/CLI/src/ConfigProvider.php b/module/CLI/src/ConfigProvider.php
new file mode 100644
index 00000000..a35c98b6
--- /dev/null
+++ b/module/CLI/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\CLI;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/src/CLI/Factory/ApplicationFactory.php b/module/CLI/src/Factory/ApplicationFactory.php
similarity index 96%
rename from src/CLI/Factory/ApplicationFactory.php
rename to module/CLI/src/Factory/ApplicationFactory.php
index d44150d1..51d5fdb3 100644
--- a/src/CLI/Factory/ApplicationFactory.php
+++ b/module/CLI/src/Factory/ApplicationFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Factory;
+namespace Shlinkio\Shlink\CLI\Factory;
 
 use Interop\Container\ContainerInterface;
 use Interop\Container\Exception\ContainerException;
diff --git a/module/CLI/test/Factory/ApplicationFactoryTest.php b/module/CLI/test/Factory/ApplicationFactoryTest.php
new file mode 100644
index 00000000..1c486e55
--- /dev/null
+++ b/module/CLI/test/Factory/ApplicationFactoryTest.php
@@ -0,0 +1,60 @@
+<?php
+namespace ShlinkioTest\Shlink\CLI\Factory;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Shlinkio\Shlink\CLI\Factory\ApplicationFactory;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Command\Command;
+use Zend\ServiceManager\ServiceManager;
+
+class ApplicationFactoryTest extends TestCase
+{
+    /**
+     * @var ApplicationFactory
+     */
+    protected $factory;
+
+    public function setUp()
+    {
+        $this->factory = new ApplicationFactory();
+    }
+
+    /**
+     * @test
+     */
+    public function serviceIsCreated()
+    {
+        $instance = $this->factory->__invoke($this->createServiceManager(), '');
+        $this->assertInstanceOf(Application::class, $instance);
+    }
+
+    /**
+     * @test
+     */
+    public function allCommandsWhichAreServicesAreAdded()
+    {
+        $sm = $this->createServiceManager([
+            'commands' => [
+                'foo',
+                'bar',
+                'baz',
+            ],
+        ]);
+        $sm->setService('foo', $this->prophesize(Command::class)->reveal());
+        $sm->setService('baz', $this->prophesize(Command::class)->reveal());
+
+        /** @var Application $instance */
+        $instance = $this->factory->__invoke($sm, '');
+        $this->assertInstanceOf(Application::class, $instance);
+        $this->assertCount(2, $instance->all());
+    }
+
+    protected function createServiceManager($config = [])
+    {
+        return new ServiceManager(['services' => [
+            'config' => [
+                'cli' => $config,
+            ],
+        ]]);
+    }
+}
diff --git a/module/Common/config/services.config.php b/module/Common/config/services.config.php
new file mode 100644
index 00000000..b3c4e14d
--- /dev/null
+++ b/module/Common/config/services.config.php
@@ -0,0 +1,24 @@
+<?php
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+use Doctrine\Common\Cache\Cache;
+use Doctrine\ORM\EntityManager;
+use Shlinkio\Shlink\Common\Factory\CacheFactory;
+use Shlinkio\Shlink\Common\Factory\EntityManagerFactory;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+
+    'services' => [
+        'factories' => [
+            EntityManager::class => EntityManagerFactory::class,
+            GuzzleHttp\Client::class => InvokableFactory::class,
+            Cache::class => CacheFactory::class,
+        ],
+        'aliases' => [
+            'em' => EntityManager::class,
+            'httpClient' => GuzzleHttp\Client::class,
+            AnnotatedFactory::CACHE_SERVICE => Cache::class,
+        ],
+    ],
+
+];
diff --git a/module/Common/src/ConfigProvider.php b/module/Common/src/ConfigProvider.php
new file mode 100644
index 00000000..9af040c2
--- /dev/null
+++ b/module/Common/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\Common;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/src/Entity/AbstractEntity.php b/module/Common/src/Entity/AbstractEntity.php
similarity index 92%
rename from src/Entity/AbstractEntity.php
rename to module/Common/src/Entity/AbstractEntity.php
index 0fc810ef..67e15f60 100644
--- a/src/Entity/AbstractEntity.php
+++ b/module/Common/src/Entity/AbstractEntity.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Entity;
+namespace Shlinkio\Shlink\Common\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
 
diff --git a/src/Factory/CacheFactory.php b/module/Common/src/Factory/CacheFactory.php
similarity index 96%
rename from src/Factory/CacheFactory.php
rename to module/Common/src/Factory/CacheFactory.php
index 86c88e6b..33949dc3 100644
--- a/src/Factory/CacheFactory.php
+++ b/module/Common/src/Factory/CacheFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Factory;
+namespace Shlinkio\Shlink\Common\Factory;
 
 use Doctrine\Common\Cache\ApcuCache;
 use Doctrine\Common\Cache\ArrayCache;
diff --git a/src/Factory/EntityManagerFactory.php b/module/Common/src/Factory/EntityManagerFactory.php
similarity index 94%
rename from src/Factory/EntityManagerFactory.php
rename to module/Common/src/Factory/EntityManagerFactory.php
index 8716b3f8..e42abb40 100644
--- a/src/Factory/EntityManagerFactory.php
+++ b/module/Common/src/Factory/EntityManagerFactory.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Factory;
+namespace Shlinkio\Shlink\Common\Factory;
 
 use Doctrine\Common\Cache\ArrayCache;
 use Doctrine\Common\Cache\Cache;
@@ -33,7 +33,7 @@ class EntityManagerFactory implements FactoryInterface
         $dbConfig = isset($globalConfig['database']) ? $globalConfig['database'] : [];
 
         return EntityManager::create($dbConfig, Setup::createAnnotationMetadataConfiguration(
-            ['src/Entity'],
+            ['module/Core/src/Entity'],
             $isDevMode,
             'data/proxies',
             $cache,
diff --git a/src/Paginator/Adapter/PaginableRepositoryAdapter.php b/module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php
similarity index 91%
rename from src/Paginator/Adapter/PaginableRepositoryAdapter.php
rename to module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php
index 243e4a1b..ade0c0c9 100644
--- a/src/Paginator/Adapter/PaginableRepositoryAdapter.php
+++ b/module/Common/src/Paginator/Adapter/PaginableRepositoryAdapter.php
@@ -1,7 +1,7 @@
 <?php
-namespace Acelaya\UrlShortener\Paginator\Adapter;
+namespace Shlinkio\Shlink\Common\Paginator\Adapter;
 
-use Acelaya\UrlShortener\Repository\PaginableRepositoryInterface;
+use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
 use Zend\Paginator\Adapter\AdapterInterface;
 
 class PaginableRepositoryAdapter implements AdapterInterface
diff --git a/src/Paginator/Util/PaginatorUtilsTrait.php b/module/Common/src/Paginator/Util/PaginatorUtilsTrait.php
similarity index 93%
rename from src/Paginator/Util/PaginatorUtilsTrait.php
rename to module/Common/src/Paginator/Util/PaginatorUtilsTrait.php
index 270aaea4..a1e0ec5c 100644
--- a/src/Paginator/Util/PaginatorUtilsTrait.php
+++ b/module/Common/src/Paginator/Util/PaginatorUtilsTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Paginator\Util;
+namespace Shlinkio\Shlink\Common\Paginator\Util;
 
 use Zend\Paginator\Paginator;
 use Zend\Stdlib\ArrayUtils;
diff --git a/src/Repository/PaginableRepositoryInterface.php b/module/Common/src/Repository/PaginableRepositoryInterface.php
similarity index 92%
rename from src/Repository/PaginableRepositoryInterface.php
rename to module/Common/src/Repository/PaginableRepositoryInterface.php
index 99c8696e..b9a75aea 100644
--- a/src/Repository/PaginableRepositoryInterface.php
+++ b/module/Common/src/Repository/PaginableRepositoryInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Repository;
+namespace Shlinkio\Shlink\Common\Repository;
 
 interface PaginableRepositoryInterface
 {
diff --git a/src/Util/StringUtilsTrait.php b/module/Common/src/Util/StringUtilsTrait.php
similarity index 96%
rename from src/Util/StringUtilsTrait.php
rename to module/Common/src/Util/StringUtilsTrait.php
index 2b4bf625..648dbfcb 100644
--- a/src/Util/StringUtilsTrait.php
+++ b/module/Common/src/Util/StringUtilsTrait.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Util;
+namespace Shlinkio\Shlink\Common\Util;
 
 trait StringUtilsTrait
 {
diff --git a/tests/Factory/CacheFactoryTest.php b/module/Common/test/Factory/CacheFactoryTest.php
similarity index 91%
rename from tests/Factory/CacheFactoryTest.php
rename to module/Common/test/Factory/CacheFactoryTest.php
index a6920d56..6f23aa0b 100644
--- a/tests/Factory/CacheFactoryTest.php
+++ b/module/Common/test/Factory/CacheFactoryTest.php
@@ -1,10 +1,10 @@
 <?php
-namespace AcelayaTest\UrlShortener\Factory;
+namespace ShlinkioTest\Shlink\Common\Factory;
 
-use Acelaya\UrlShortener\Factory\CacheFactory;
 use Doctrine\Common\Cache\ApcuCache;
 use Doctrine\Common\Cache\ArrayCache;
 use PHPUnit_Framework_TestCase as TestCase;
+use Shlinkio\Shlink\Common\Factory\CacheFactory;
 use Zend\ServiceManager\ServiceManager;
 
 class CacheFactoryTest extends TestCase
diff --git a/tests/Factory/EntityManagerFactoryTest.php b/module/Common/test/Factory/EntityManagerFactoryTest.php
similarity index 88%
rename from tests/Factory/EntityManagerFactoryTest.php
rename to module/Common/test/Factory/EntityManagerFactoryTest.php
index 4b9bd82f..53c839ed 100644
--- a/tests/Factory/EntityManagerFactoryTest.php
+++ b/module/Common/test/Factory/EntityManagerFactoryTest.php
@@ -1,9 +1,9 @@
 <?php
-namespace AcelayaTest\UrlShortener\Factory;
+namespace ShlinkioTest\Shlink\Common\Factory;
 
-use Acelaya\UrlShortener\Factory\EntityManagerFactory;
 use Doctrine\ORM\EntityManager;
 use PHPUnit_Framework_TestCase as TestCase;
+use Shlinkio\Shlink\Common\Factory\EntityManagerFactory;
 use Zend\ServiceManager\ServiceManager;
 
 class EntityManagerFactoryTest extends TestCase
diff --git a/module/Core/config/routes.config.php b/module/Core/config/routes.config.php
new file mode 100644
index 00000000..8e9ac66d
--- /dev/null
+++ b/module/Core/config/routes.config.php
@@ -0,0 +1,15 @@
+<?php
+use Shlinkio\Shlink\Core\Action\RedirectMiddleware;
+
+return [
+
+    'routes' => [
+        [
+            'name' => 'long-url-redirect',
+            'path' => '/{shortCode}',
+            'middleware' => RedirectMiddleware::class,
+            'allowed_methods' => ['GET'],
+        ],
+    ],
+
+];
diff --git a/module/Core/config/services.config.php b/module/Core/config/services.config.php
new file mode 100644
index 00000000..cab7ca41
--- /dev/null
+++ b/module/Core/config/services.config.php
@@ -0,0 +1,20 @@
+<?php
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+use Shlinkio\Shlink\Core\Action\RedirectMiddleware;
+use Shlinkio\Shlink\Core\Service;
+
+return [
+
+    'services' => [
+        'factories' => [
+            // Services
+            Service\UrlShortener::class => AnnotatedFactory::class,
+            Service\VisitsTracker::class => AnnotatedFactory::class,
+            Service\ShortUrlService::class => AnnotatedFactory::class,
+
+            // Middleware
+            RedirectMiddleware::class => AnnotatedFactory::class,
+        ],
+    ],
+
+];
diff --git a/module/Core/config/templates.config.php b/module/Core/config/templates.config.php
new file mode 100644
index 00000000..da3623c1
--- /dev/null
+++ b/module/Core/config/templates.config.php
@@ -0,0 +1,11 @@
+<?php
+
+return [
+
+    'templates' => [
+        'paths' => [
+            'module/Core/templates',
+        ],
+    ],
+
+];
diff --git a/module/Core/config/zend-expressive.config.php b/module/Core/config/zend-expressive.config.php
new file mode 100644
index 00000000..c5fefe8f
--- /dev/null
+++ b/module/Core/config/zend-expressive.config.php
@@ -0,0 +1,12 @@
+<?php
+
+return [
+
+    'zend-expressive' => [
+        'error_handler' => [
+            'template_404'   => 'core/error/404.html.twig',
+            'template_error' => 'core/error/error.html.twig',
+        ],
+    ],
+
+];
diff --git a/src/Middleware/Routable/RedirectMiddleware.php b/module/Core/src/Action/RedirectMiddleware.php
similarity index 91%
rename from src/Middleware/Routable/RedirectMiddleware.php
rename to module/Core/src/Action/RedirectMiddleware.php
index 85b42eb6..5b1907ca 100644
--- a/src/Middleware/Routable/RedirectMiddleware.php
+++ b/module/Core/src/Action/RedirectMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Routable;
+namespace Shlinkio\Shlink\Core\Action;
 
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
-use Acelaya\UrlShortener\Service\VisitsTracker;
-use Acelaya\UrlShortener\Service\VisitsTrackerInterface;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Core\Service\VisitsTracker;
+use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
 use Zend\Diactoros\Response\RedirectResponse;
 use Zend\Stratigility\MiddlewareInterface;
 
diff --git a/module/Core/src/ConfigProvider.php b/module/Core/src/ConfigProvider.php
new file mode 100644
index 00000000..927e126d
--- /dev/null
+++ b/module/Core/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\Core;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/src/Entity/RestToken.php b/module/Core/src/Entity/RestToken.php
similarity index 93%
rename from src/Entity/RestToken.php
rename to module/Core/src/Entity/RestToken.php
index 90a70f0e..865c83b9 100644
--- a/src/Entity/RestToken.php
+++ b/module/Core/src/Entity/RestToken.php
@@ -1,8 +1,9 @@
 <?php
-namespace Acelaya\UrlShortener\Entity;
+namespace Shlinkio\Shlink\Core\Entity;
 
-use Acelaya\UrlShortener\Util\StringUtilsTrait;
 use Doctrine\ORM\Mapping as ORM;
+use Shlinkio\Shlink\Common\Entity\AbstractEntity;
+use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 
 /**
  * Class RestToken
diff --git a/src/Entity/ShortUrl.php b/module/Core/src/Entity/ShortUrl.php
similarity index 95%
rename from src/Entity/ShortUrl.php
rename to module/Core/src/Entity/ShortUrl.php
index 9f63af68..b1f524bc 100644
--- a/src/Entity/ShortUrl.php
+++ b/module/Core/src/Entity/ShortUrl.php
@@ -1,16 +1,17 @@
 <?php
-namespace Acelaya\UrlShortener\Entity;
+namespace Shlinkio\Shlink\Core\Entity;
 
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Shlinkio\Shlink\Common\Entity\AbstractEntity;
 
 /**
  * Class ShortUrl
  * @author
  * @link
  *
- * @ORM\Entity(repositoryClass="Acelaya\UrlShortener\Repository\ShortUrlRepository")
+ * @ORM\Entity(repositoryClass="Shlinkio\Shlink\Core\Repository\ShortUrlRepository")
  * @ORM\Table(name="short_urls")
  */
 class ShortUrl extends AbstractEntity implements \JsonSerializable
diff --git a/src/Entity/Visit.php b/module/Core/src/Entity/Visit.php
similarity index 97%
rename from src/Entity/Visit.php
rename to module/Core/src/Entity/Visit.php
index 42aebec5..04cfbe68 100644
--- a/src/Entity/Visit.php
+++ b/module/Core/src/Entity/Visit.php
@@ -1,7 +1,8 @@
 <?php
-namespace Acelaya\UrlShortener\Entity;
+namespace Shlinkio\Shlink\Core\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Shlinkio\Shlink\Common\Entity\AbstractEntity;
 
 /**
  * Class Visit
diff --git a/module/Core/src/Exception/ExceptionInterface.php b/module/Core/src/Exception/ExceptionInterface.php
new file mode 100644
index 00000000..4d61c4d3
--- /dev/null
+++ b/module/Core/src/Exception/ExceptionInterface.php
@@ -0,0 +1,6 @@
+<?php
+namespace Shlinkio\Shlink\Core\Exception;
+
+interface ExceptionInterface
+{
+}
diff --git a/src/Exception/InvalidArgumentException.php b/module/Core/src/Exception/InvalidArgumentException.php
similarity index 71%
rename from src/Exception/InvalidArgumentException.php
rename to module/Core/src/Exception/InvalidArgumentException.php
index 4b851930..5ebcab2e 100644
--- a/src/Exception/InvalidArgumentException.php
+++ b/module/Core/src/Exception/InvalidArgumentException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Core\Exception;
 
 class InvalidArgumentException extends \InvalidArgumentException implements ExceptionInterface
 {
diff --git a/src/Exception/InvalidShortCodeException.php b/module/Core/src/Exception/InvalidShortCodeException.php
similarity index 90%
rename from src/Exception/InvalidShortCodeException.php
rename to module/Core/src/Exception/InvalidShortCodeException.php
index b41038a1..32e5b2d4 100644
--- a/src/Exception/InvalidShortCodeException.php
+++ b/module/Core/src/Exception/InvalidShortCodeException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Core\Exception;
 
 class InvalidShortCodeException extends RuntimeException
 {
diff --git a/src/Exception/InvalidUrlException.php b/module/Core/src/Exception/InvalidUrlException.php
similarity index 88%
rename from src/Exception/InvalidUrlException.php
rename to module/Core/src/Exception/InvalidUrlException.php
index a19eedab..864c6575 100644
--- a/src/Exception/InvalidUrlException.php
+++ b/module/Core/src/Exception/InvalidUrlException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Core\Exception;
 
 class InvalidUrlException extends RuntimeException
 {
diff --git a/src/Exception/RuntimeException.php b/module/Core/src/Exception/RuntimeException.php
similarity index 68%
rename from src/Exception/RuntimeException.php
rename to module/Core/src/Exception/RuntimeException.php
index 32e61356..195284f5 100644
--- a/src/Exception/RuntimeException.php
+++ b/module/Core/src/Exception/RuntimeException.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Core\Exception;
 
 class RuntimeException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Repository/ShortUrlRepository.php b/module/Core/src/Repository/ShortUrlRepository.php
similarity index 93%
rename from src/Repository/ShortUrlRepository.php
rename to module/Core/src/Repository/ShortUrlRepository.php
index 7ba68d82..e2d81cba 100644
--- a/src/Repository/ShortUrlRepository.php
+++ b/module/Core/src/Repository/ShortUrlRepository.php
@@ -1,9 +1,8 @@
 <?php
-namespace Acelaya\UrlShortener\Repository;
+namespace Shlinkio\Shlink\Core\Repository;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\ORM\QueryBuilder;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
 
 class ShortUrlRepository extends EntityRepository implements ShortUrlRepositoryInterface
 {
diff --git a/src/Repository/ShortUrlRepositoryInterface.php b/module/Core/src/Repository/ShortUrlRepositoryInterface.php
similarity index 58%
rename from src/Repository/ShortUrlRepositoryInterface.php
rename to module/Core/src/Repository/ShortUrlRepositoryInterface.php
index be7f3fff..5096e065 100644
--- a/src/Repository/ShortUrlRepositoryInterface.php
+++ b/module/Core/src/Repository/ShortUrlRepositoryInterface.php
@@ -1,7 +1,8 @@
 <?php
-namespace Acelaya\UrlShortener\Repository;
+namespace Shlinkio\Shlink\Core\Repository;
 
 use Doctrine\Common\Persistence\ObjectRepository;
+use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
 
 interface ShortUrlRepositoryInterface extends ObjectRepository, PaginableRepositoryInterface
 {
diff --git a/src/Service/ShortUrlService.php b/module/Core/src/Service/ShortUrlService.php
similarity index 81%
rename from src/Service/ShortUrlService.php
rename to module/Core/src/Service/ShortUrlService.php
index 9dbc176b..84552115 100644
--- a/src/Service/ShortUrlService.php
+++ b/module/Core/src/Service/ShortUrlService.php
@@ -1,11 +1,11 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Paginator\Adapter\PaginableRepositoryAdapter;
-use Acelaya\UrlShortener\Repository\ShortUrlRepository;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
 use Zend\Paginator\Paginator;
 
 class ShortUrlService implements ShortUrlServiceInterface
diff --git a/src/Service/ShortUrlServiceInterface.php b/module/Core/src/Service/ShortUrlServiceInterface.php
similarity index 70%
rename from src/Service/ShortUrlServiceInterface.php
rename to module/Core/src/Service/ShortUrlServiceInterface.php
index a9d182d2..c6885c39 100644
--- a/src/Service/ShortUrlServiceInterface.php
+++ b/module/Core/src/Service/ShortUrlServiceInterface.php
@@ -1,7 +1,7 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Zend\Paginator\Paginator;
 
 interface ShortUrlServiceInterface
diff --git a/src/Service/UrlShortener.php b/module/Core/src/Service/UrlShortener.php
similarity index 93%
rename from src/Service/UrlShortener.php
rename to module/Core/src/Service/UrlShortener.php
index 3c15a0f6..1f83a120 100644
--- a/src/Service/UrlShortener.php
+++ b/module/Core/src/Service/UrlShortener.php
@@ -1,16 +1,16 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
-use Acelaya\UrlShortener\Exception\InvalidUrlException;
-use Acelaya\UrlShortener\Exception\RuntimeException;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\ORMException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\GuzzleException;
 use Psr\Http\Message\UriInterface;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
+use Shlinkio\Shlink\Core\Exception\RuntimeException;
 
 class UrlShortener implements UrlShortenerInterface
 {
@@ -44,7 +44,7 @@ class UrlShortener implements UrlShortenerInterface
     ) {
         $this->httpClient = $httpClient;
         $this->em = $em;
-        $this->chars = $chars;
+        $this->chars = empty($chars) ? self::DEFAULT_CHARS : $chars;
     }
 
     /**
diff --git a/src/Service/UrlShortenerInterface.php b/module/Core/src/Service/UrlShortenerInterface.php
similarity index 74%
rename from src/Service/UrlShortenerInterface.php
rename to module/Core/src/Service/UrlShortenerInterface.php
index 6623f392..6cbb6723 100644
--- a/src/Service/UrlShortenerInterface.php
+++ b/module/Core/src/Service/UrlShortenerInterface.php
@@ -1,10 +1,10 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
-use Acelaya\UrlShortener\Exception\InvalidUrlException;
-use Acelaya\UrlShortener\Exception\RuntimeException;
 use Psr\Http\Message\UriInterface;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
+use Shlinkio\Shlink\Core\Exception\RuntimeException;
 
 interface UrlShortenerInterface
 {
diff --git a/src/Service/VisitsTracker.php b/module/Core/src/Service/VisitsTracker.php
similarity index 90%
rename from src/Service/VisitsTracker.php
rename to module/Core/src/Service/VisitsTracker.php
index 7fcdf5e6..7a7b5b67 100644
--- a/src/Service/VisitsTracker.php
+++ b/module/Core/src/Service/VisitsTracker.php
@@ -1,12 +1,11 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Entity\Visit;
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Entity\Visit;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
 use Zend\Paginator\Paginator;
 
 class VisitsTracker implements VisitsTrackerInterface
diff --git a/src/Service/VisitsTrackerInterface.php b/module/Core/src/Service/VisitsTrackerInterface.php
similarity index 86%
rename from src/Service/VisitsTrackerInterface.php
rename to module/Core/src/Service/VisitsTrackerInterface.php
index ce0a61cf..04966403 100644
--- a/src/Service/VisitsTrackerInterface.php
+++ b/module/Core/src/Service/VisitsTrackerInterface.php
@@ -1,7 +1,7 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\Visit;
+use Shlinkio\Shlink\Core\Entity\Visit;
 use Zend\Paginator\Paginator;
 
 interface VisitsTrackerInterface
diff --git a/templates/error/404.html.twig b/module/Core/templates/core/error/404.html.twig
similarity index 89%
rename from templates/error/404.html.twig
rename to module/Core/templates/core/error/404.html.twig
index 0e591e2a..0c28f29d 100644
--- a/templates/error/404.html.twig
+++ b/module/Core/templates/core/error/404.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout/default.html.twig' %}
+{% extends 'core/layout/default.html.twig' %}
 
 {% block title %}URL Not Found{% endblock %}
 
diff --git a/templates/error/error.html.twig b/module/Core/templates/core/error/error.html.twig
similarity index 91%
rename from templates/error/error.html.twig
rename to module/Core/templates/core/error/error.html.twig
index cd54354e..c93b3b7e 100644
--- a/templates/error/error.html.twig
+++ b/module/Core/templates/core/error/error.html.twig
@@ -1,4 +1,4 @@
-{% extends 'layout/default.html.twig' %}
+{% extends 'core/layout/default.html.twig' %}
 
 {% block title %}{{ status }} {{ reason }}{% endblock %}
 
diff --git a/templates/layout/default.html.twig b/module/Core/templates/core/layout/default.html.twig
similarity index 100%
rename from templates/layout/default.html.twig
rename to module/Core/templates/core/layout/default.html.twig
diff --git a/tests/Service/ShortUrlServiceTest.php b/module/Core/test/Service/ShortUrlServiceTest.php
similarity index 86%
rename from tests/Service/ShortUrlServiceTest.php
rename to module/Core/test/Service/ShortUrlServiceTest.php
index 3b77ee6a..1244d3a5 100644
--- a/tests/Service/ShortUrlServiceTest.php
+++ b/module/Core/test/Service/ShortUrlServiceTest.php
@@ -1,13 +1,13 @@
 <?php
-namespace AcelayaTest\UrlShortener\Service;
+namespace ShlinkioTest\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Repository\ShortUrlRepository;
-use Acelaya\UrlShortener\Service\ShortUrlService;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Repository\ShortUrlRepository;
+use Shlinkio\Shlink\Core\Service\ShortUrlService;
 
 class ShortUrlServiceTest extends TestCase
 {
diff --git a/tests/Service/UrlShortenerTest.php b/module/Core/test/Service/UrlShortenerTest.php
similarity index 92%
rename from tests/Service/UrlShortenerTest.php
rename to module/Core/test/Service/UrlShortenerTest.php
index 61580e0e..f67086b5 100644
--- a/tests/Service/UrlShortenerTest.php
+++ b/module/Core/test/Service/UrlShortenerTest.php
@@ -1,8 +1,6 @@
 <?php
-namespace AcelayaTest\UrlShortener\Service;
+namespace ShlinkioTest\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Service\UrlShortener;
 use Doctrine\Common\Persistence\ObjectRepository;
 use Doctrine\DBAL\Connection;
 use Doctrine\ORM\EntityManagerInterface;
@@ -10,10 +8,11 @@ use Doctrine\ORM\ORMException;
 use GuzzleHttp\ClientInterface;
 use GuzzleHttp\Exception\ClientException;
 use GuzzleHttp\Psr7\Request;
-use GuzzleHttp\Psr7\Response;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Zend\Diactoros\Uri;
 
 class UrlShortenerTest extends TestCase
@@ -66,7 +65,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\RuntimeException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\RuntimeException
      */
     public function exceptionIsThrownWhenOrmThrowsException()
     {
@@ -82,7 +81,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\InvalidUrlException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\InvalidUrlException
      */
     public function exceptionIsThrownWhenUrlDoesNotExist()
     {
@@ -127,7 +126,7 @@ class UrlShortenerTest extends TestCase
 
     /**
      * @test
-     * @expectedException \Acelaya\UrlShortener\Exception\InvalidShortCodeException
+     * @expectedException \Shlinkio\Shlink\Core\Exception\InvalidShortCodeException
      */
     public function invalidCharSetThrowsException()
     {
diff --git a/tests/Service/VisitsTrackerTest.php b/module/Core/test/Service/VisitsTrackerTest.php
similarity index 85%
rename from tests/Service/VisitsTrackerTest.php
rename to module/Core/test/Service/VisitsTrackerTest.php
index 7e6707c7..2a441e04 100644
--- a/tests/Service/VisitsTrackerTest.php
+++ b/module/Core/test/Service/VisitsTrackerTest.php
@@ -1,12 +1,12 @@
 <?php
-namespace AcelayaTest\UrlShortener\Service;
+namespace ShlinkioTest\Shlink\Core\Service;
 
-use Acelaya\UrlShortener\Entity\ShortUrl;
-use Acelaya\UrlShortener\Service\VisitsTracker;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityRepository;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
+use Shlinkio\Shlink\Core\Entity\ShortUrl;
+use Shlinkio\Shlink\Core\Service\VisitsTracker;
 
 class VisitsTrackerTest extends TestCase
 {
diff --git a/module/Rest/config/middleware-pipeline.config.php b/module/Rest/config/middleware-pipeline.config.php
new file mode 100644
index 00000000..78c20c38
--- /dev/null
+++ b/module/Rest/config/middleware-pipeline.config.php
@@ -0,0 +1,16 @@
+<?php
+use Shlinkio\Shlink\Rest\Middleware;
+
+return [
+
+    'middleware_pipeline' => [
+        'rest' => [
+            'path' => '/rest',
+            'middleware' => [
+                Middleware\CheckAuthenticationMiddleware::class,
+                Middleware\CrossDomainMiddleware::class,
+            ],
+            'priority' => 5,
+        ],
+    ],
+];
diff --git a/config/autoload/rest.global.php b/module/Rest/config/rest.config.php
similarity index 100%
rename from config/autoload/rest.global.php
rename to module/Rest/config/rest.config.php
diff --git a/config/autoload/routes.global.php b/module/Rest/config/routes.config.php
similarity index 54%
rename from config/autoload/routes.global.php
rename to module/Rest/config/routes.config.php
index 87133f09..e8abb6fe 100644
--- a/config/autoload/routes.global.php
+++ b/module/Rest/config/routes.config.php
@@ -1,46 +1,37 @@
 <?php
-use Acelaya\UrlShortener\Middleware\Routable;
-use Acelaya\UrlShortener\Middleware\Rest;
+use Shlinkio\Shlink\Rest\Action;
 
 return [
 
     'routes' => [
-        [
-            'name' => 'long-url-redirect',
-            'path' => '/{shortCode}',
-            'middleware' => Routable\RedirectMiddleware::class,
-            'allowed_methods' => ['GET'],
-        ],
-
-        // Rest
         [
             'name' => 'rest-authenticate',
             'path' => '/rest/authenticate',
-            'middleware' => Rest\AuthenticateMiddleware::class,
+            'middleware' => Action\AuthenticateMiddleware::class,
             'allowed_methods' => ['POST', 'OPTIONS'],
         ],
         [
             'name' => 'rest-create-shortcode',
             'path' => '/rest/short-codes',
-            'middleware' => Rest\CreateShortcodeMiddleware::class,
+            'middleware' => Action\CreateShortcodeMiddleware::class,
             'allowed_methods' => ['POST', 'OPTIONS'],
         ],
         [
             'name' => 'rest-resolve-url',
             'path' => '/rest/short-codes/{shortCode}',
-            'middleware' => Rest\ResolveUrlMiddleware::class,
+            'middleware' => Action\ResolveUrlMiddleware::class,
             'allowed_methods' => ['GET', 'OPTIONS'],
         ],
         [
-            'name' => 'rest-list-shortened-url',
+            'name' => 'rest-lActionist-shortened-url',
             'path' => '/rest/short-codes',
-            'middleware' => Rest\ListShortcodesMiddleware::class,
+            'middleware' => Action\ListShortcodesMiddleware::class,
             'allowed_methods' => ['GET'],
         ],
         [
             'name' => 'rest-get-visits',
             'path' => '/rest/visits/{shortCode}',
-            'middleware' => Rest\GetVisitsMiddleware::class,
+            'middleware' => Action\GetVisitsMiddleware::class,
             'allowed_methods' => ['GET', 'OPTIONS'],
         ],
     ],
diff --git a/module/Rest/config/services.config.php b/module/Rest/config/services.config.php
new file mode 100644
index 00000000..aff4cc96
--- /dev/null
+++ b/module/Rest/config/services.config.php
@@ -0,0 +1,25 @@
+<?php
+use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
+use Shlinkio\Shlink\Rest\Action;
+use Shlinkio\Shlink\Rest\Middleware;
+use Shlinkio\Shlink\Rest\Service;
+use Zend\ServiceManager\Factory\InvokableFactory;
+
+return [
+
+    'services' => [
+        'factories' => [
+            Service\RestTokenService::class => AnnotatedFactory::class,
+
+            Action\AuthenticateMiddleware::class => AnnotatedFactory::class,
+            Action\CreateShortcodeMiddleware::class => AnnotatedFactory::class,
+            Action\ResolveUrlMiddleware::class => AnnotatedFactory::class,
+            Action\GetVisitsMiddleware::class => AnnotatedFactory::class,
+            Action\ListShortcodesMiddleware::class => AnnotatedFactory::class,
+
+            Middleware\CrossDomainMiddleware::class => InvokableFactory::class,
+            Middleware\CheckAuthenticationMiddleware::class => AnnotatedFactory::class,
+        ],
+    ],
+
+];
diff --git a/src/Middleware/Rest/AbstractRestMiddleware.php b/module/Rest/src/Action/AbstractRestMiddleware.php
similarity index 97%
rename from src/Middleware/Rest/AbstractRestMiddleware.php
rename to module/Rest/src/Action/AbstractRestMiddleware.php
index 1168ff60..9ef870f4 100644
--- a/src/Middleware/Rest/AbstractRestMiddleware.php
+++ b/module/Rest/src/Action/AbstractRestMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/src/Middleware/Rest/AuthenticateMiddleware.php b/module/Rest/src/Action/AuthenticateMiddleware.php
similarity index 86%
rename from src/Middleware/Rest/AuthenticateMiddleware.php
rename to module/Rest/src/Action/AuthenticateMiddleware.php
index 88c9df60..cbea1360 100644
--- a/src/Middleware/Rest/AuthenticateMiddleware.php
+++ b/module/Rest/src/Action/AuthenticateMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\AuthenticationException;
-use Acelaya\UrlShortener\Service\RestTokenService;
-use Acelaya\UrlShortener\Service\RestTokenServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
+use Shlinkio\Shlink\Rest\Service\RestTokenService;
+use Shlinkio\Shlink\Rest\Service\RestTokenServiceInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class AuthenticateMiddleware extends AbstractRestMiddleware
diff --git a/src/Middleware/Rest/CreateShortcodeMiddleware.php b/module/Rest/src/Action/CreateShortcodeMiddleware.php
similarity index 90%
rename from src/Middleware/Rest/CreateShortcodeMiddleware.php
rename to module/Rest/src/Action/CreateShortcodeMiddleware.php
index f5ee3228..fdb0ade3 100644
--- a/src/Middleware/Rest/CreateShortcodeMiddleware.php
+++ b/module/Rest/src/Action/CreateShortcodeMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidUrlException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Diactoros\Uri;
 
diff --git a/src/Middleware/Rest/GetVisitsMiddleware.php b/module/Rest/src/Action/GetVisitsMiddleware.php
similarity index 86%
rename from src/Middleware/Rest/GetVisitsMiddleware.php
rename to module/Rest/src/Action/GetVisitsMiddleware.php
index a6ca954e..02f8df63 100644
--- a/src/Middleware/Rest/GetVisitsMiddleware.php
+++ b/module/Rest/src/Action/GetVisitsMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
-use Acelaya\UrlShortener\Service\VisitsTracker;
-use Acelaya\UrlShortener\Service\VisitsTrackerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Core\Service\VisitsTracker;
+use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class GetVisitsMiddleware extends AbstractRestMiddleware
diff --git a/src/Middleware/Rest/ListShortcodesMiddleware.php b/module/Rest/src/Action/ListShortcodesMiddleware.php
similarity index 83%
rename from src/Middleware/Rest/ListShortcodesMiddleware.php
rename to module/Rest/src/Action/ListShortcodesMiddleware.php
index 99d82454..4361ab89 100644
--- a/src/Middleware/Rest/ListShortcodesMiddleware.php
+++ b/module/Rest/src/Action/ListShortcodesMiddleware.php
@@ -1,15 +1,14 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Paginator\Util\PaginatorUtilsTrait;
-use Acelaya\UrlShortener\Service\ShortUrlService;
-use Acelaya\UrlShortener\Service\ShortUrlServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
+use Shlinkio\Shlink\Core\Service\ShortUrlService;
+use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
-use Zend\Stdlib\ArrayUtils;
 
 class ListShortcodesMiddleware extends AbstractRestMiddleware
 {
diff --git a/src/Middleware/Rest/ResolveUrlMiddleware.php b/module/Rest/src/Action/ResolveUrlMiddleware.php
similarity index 88%
rename from src/Middleware/Rest/ResolveUrlMiddleware.php
rename to module/Rest/src/Action/ResolveUrlMiddleware.php
index 4529e973..92a1e5c2 100644
--- a/src/Middleware/Rest/ResolveUrlMiddleware.php
+++ b/module/Rest/src/Action/ResolveUrlMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware\Rest;
+namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
+use Shlinkio\Shlink\Core\Service\UrlShortener;
+use Shlinkio\Shlink\Core\Service\UrlShortenerInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 
 class ResolveUrlMiddleware extends AbstractRestMiddleware
diff --git a/module/Rest/src/ConfigProvider.php b/module/Rest/src/ConfigProvider.php
new file mode 100644
index 00000000..0ad10a94
--- /dev/null
+++ b/module/Rest/src/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\Rest;
+
+use Zend\Config\Factory;
+use Zend\Stdlib\Glob;
+
+class ConfigProvider
+{
+    public function __invoke()
+    {
+        return Factory::fromFiles(Glob::glob(__DIR__ . '/../config/{,*.}config.php', Glob::GLOB_BRACE));
+    }
+}
diff --git a/src/Exception/AuthenticationException.php b/module/Rest/src/Exception/AuthenticationException.php
similarity index 74%
rename from src/Exception/AuthenticationException.php
rename to module/Rest/src/Exception/AuthenticationException.php
index 0876be75..e650636e 100644
--- a/src/Exception/AuthenticationException.php
+++ b/module/Rest/src/Exception/AuthenticationException.php
@@ -1,5 +1,7 @@
 <?php
-namespace Acelaya\UrlShortener\Exception;
+namespace Shlinkio\Shlink\Rest\Exception;
+
+use Shlinkio\Shlink\Core\Exception\ExceptionInterface;
 
 class AuthenticationException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/src/Middleware/CheckAuthenticationMiddleware.php b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
similarity index 93%
rename from src/Middleware/CheckAuthenticationMiddleware.php
rename to module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
index 8f7327e7..0de25f8f 100644
--- a/src/Middleware/CheckAuthenticationMiddleware.php
+++ b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
@@ -1,13 +1,13 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware;
+namespace Shlinkio\Shlink\Rest\Middleware;
 
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
-use Acelaya\UrlShortener\Service\RestTokenService;
-use Acelaya\UrlShortener\Service\RestTokenServiceInterface;
-use Acelaya\UrlShortener\Util\RestUtils;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\Service\RestTokenService;
+use Shlinkio\Shlink\Rest\Service\RestTokenServiceInterface;
+use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\Expressive\Router\RouteResult;
 use Zend\Stratigility\MiddlewareInterface;
diff --git a/src/Middleware/CrossDomainMiddleware.php b/module/Rest/src/Middleware/CrossDomainMiddleware.php
similarity index 97%
rename from src/Middleware/CrossDomainMiddleware.php
rename to module/Rest/src/Middleware/CrossDomainMiddleware.php
index c76d4d73..ed3d333e 100644
--- a/src/Middleware/CrossDomainMiddleware.php
+++ b/module/Rest/src/Middleware/CrossDomainMiddleware.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Middleware;
+namespace Shlinkio\Shlink\Rest\Middleware;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
diff --git a/src/Service/RestTokenService.php b/module/Rest/src/Service/RestTokenService.php
similarity index 92%
rename from src/Service/RestTokenService.php
rename to module/Rest/src/Service/RestTokenService.php
index 26d7f34c..83585404 100644
--- a/src/Service/RestTokenService.php
+++ b/module/Rest/src/Service/RestTokenService.php
@@ -1,11 +1,11 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Rest\Service;
 
-use Acelaya\UrlShortener\Entity\RestToken;
-use Acelaya\UrlShortener\Exception\AuthenticationException;
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Doctrine\ORM\EntityManagerInterface;
+use Shlinkio\Shlink\Core\Entity\RestToken;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 
 class RestTokenService implements RestTokenServiceInterface
 {
diff --git a/src/Service/RestTokenServiceInterface.php b/module/Rest/src/Service/RestTokenServiceInterface.php
similarity index 75%
rename from src/Service/RestTokenServiceInterface.php
rename to module/Rest/src/Service/RestTokenServiceInterface.php
index 0cdec822..d70973fb 100644
--- a/src/Service/RestTokenServiceInterface.php
+++ b/module/Rest/src/Service/RestTokenServiceInterface.php
@@ -1,9 +1,9 @@
 <?php
-namespace Acelaya\UrlShortener\Service;
+namespace Shlinkio\Shlink\Rest\Service;
 
-use Acelaya\UrlShortener\Entity\RestToken;
-use Acelaya\UrlShortener\Exception\AuthenticationException;
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Core\Entity\RestToken;
+use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
+use Shlinkio\Shlink\Rest\Exception\AuthenticationException;
 
 interface RestTokenServiceInterface
 {
diff --git a/src/Util/RestUtils.php b/module/Rest/src/Util/RestUtils.php
similarity index 59%
rename from src/Util/RestUtils.php
rename to module/Rest/src/Util/RestUtils.php
index f0c37a00..ca24fbbe 100644
--- a/src/Util/RestUtils.php
+++ b/module/Rest/src/Util/RestUtils.php
@@ -1,7 +1,8 @@
 <?php
-namespace Acelaya\UrlShortener\Util;
+namespace Shlinkio\Shlink\Rest\Util;
 
-use Acelaya\UrlShortener\Exception;
+use Shlinkio\Shlink\Core\Exception as Core;
+use Shlinkio\Shlink\Rest\Exception as Rest;
 
 class RestUtils
 {
@@ -12,16 +13,16 @@ class RestUtils
     const INVALID_AUTH_TOKEN_ERROR = 'INVALID_AUTH_TOKEN_ERROR';
     const UNKNOWN_ERROR = 'UNKNOWN_ERROR';
 
-    public static function getRestErrorCodeFromException(Exception\ExceptionInterface $e)
+    public static function getRestErrorCodeFromException(Core\ExceptionInterface $e)
     {
         switch (true) {
-            case $e instanceof Exception\InvalidShortCodeException:
+            case $e instanceof Core\InvalidShortCodeException:
                 return self::INVALID_SHORTCODE_ERROR;
-            case $e instanceof Exception\InvalidUrlException:
+            case $e instanceof Core\InvalidUrlException:
                 return self::INVALID_URL_ERROR;
-            case $e instanceof Exception\InvalidArgumentException:
+            case $e instanceof Core\InvalidArgumentException:
                 return self::INVALID_ARGUMENT_ERROR;
-            case $e instanceof Exception\AuthenticationException:
+            case $e instanceof Rest\AuthenticationException:
                 return self::INVALID_CREDENTIALS_ERROR;
             default:
                 return self::UNKNOWN_ERROR;
diff --git a/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php b/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
new file mode 100644
index 00000000..92656c82
--- /dev/null
+++ b/module/Rest/test/Middleware/CrossDomainMiddlewareTest.php
@@ -0,0 +1,54 @@
+<?php
+namespace ShlinkioTest\Shlink\Rest\Middleware;
+
+use PHPUnit_Framework_TestCase as TestCase;
+use Shlinkio\Shlink\Rest\Middleware\CrossDomainMiddleware;
+use Zend\Diactoros\Response;
+use Zend\Diactoros\ServerRequestFactory;
+
+class CrossDomainMiddlewareTest extends TestCase
+{
+    /**
+     * @var CrossDomainMiddleware
+     */
+    protected $middleware;
+
+    public function setUp()
+    {
+        $this->middleware = new CrossDomainMiddleware();
+    }
+
+    /**
+     * @test
+     */
+    public function anyRequestIncludesTheAllowAccessHeader()
+    {
+        $response = $this->middleware->__invoke(
+            ServerRequestFactory::fromGlobals(),
+            new Response(),
+            function ($req, $resp) {
+                return $resp;
+            }
+        );
+
+        $headers = $response->getHeaders();
+        $this->assertArrayHasKey('Access-Control-Allow-Origin', $headers);
+        $this->assertArrayNotHasKey('Access-Control-Allow-Headers', $headers);
+    }
+
+    /**
+     * @test
+     */
+    public function optionsRequestIncludesMoreHeaders()
+    {
+        $request = ServerRequestFactory::fromGlobals(['REQUEST_METHOD' => 'OPTIONS']);
+
+        $response = $this->middleware->__invoke($request, new Response(), function ($req, $resp) {
+            return $resp;
+        });
+
+        $headers = $response->getHeaders();
+        $this->assertArrayHasKey('Access-Control-Allow-Origin', $headers);
+        $this->assertArrayHasKey('Access-Control-Allow-Headers', $headers);
+    }
+}
diff --git a/phpcs.xml b/phpcs.xml
index 51649659..ae134872 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -16,8 +16,7 @@
     </rule>
 
     <!-- Paths to check -->
-    <file>src</file>
-    <file>tests</file>
+    <file>module</file>
     <file>config</file>
     <file>public/index.php</file>
 </ruleset>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 0721b191..65d36865 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,7 +1,16 @@
 <phpunit bootstrap="./vendor/autoload.php" colors="true">
     <testsuites>
-        <testsuite name="AcelayaTest">
-            <directory>./tests</directory>
+        <testsuite name="Common">
+            <directory>./module/Common/test</directory>
+        </testsuite>
+        <testsuite name="Core">
+            <directory>./module/Core/test</directory>
+        </testsuite>
+        <testsuite name="Rest">
+            <directory>./module/Rest/test</directory>
+        </testsuite>
+        <testsuite name="CLI">
+            <directory>./module/CLI/test</directory>
         </testsuite>
     </testsuites>
 
diff --git a/src/Exception/ExceptionInterface.php b/src/Exception/ExceptionInterface.php
deleted file mode 100644
index d6bdc788..00000000
--- a/src/Exception/ExceptionInterface.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-namespace Acelaya\UrlShortener\Exception;
-
-interface ExceptionInterface
-{
-}