diff --git a/composer.json b/composer.json
index a64197a6..0211ed05 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,6 @@
     },
     "autoload": {
         "psr-4": {
-            "Acelaya\\UrlShortener\\": "src",
             "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
             "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
             "Shlinkio\\Shlink\\Core\\": "module/Core/src",
@@ -46,7 +45,6 @@
     },
     "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",
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index 00304e5f..dc99033c 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -1,7 +1,4 @@
 <?php
-use Acelaya\UrlShortener\Middleware;
-use Acelaya\UrlShortener\Service;
-use Acelaya\ZsmAnnotatedServices\Factory\V3\AnnotatedFactory;
 use Zend\Expressive;
 use Zend\Expressive\Container;
 use Zend\Expressive\Helper;
@@ -26,14 +23,6 @@ return [
             // View
             'Zend\Expressive\FinalHandler' => Container\TemplatedErrorHandlerFactory::class,
             Template\TemplateRendererInterface::class => Twig\TwigRendererFactory::class,
-
-            // Services
-            Service\UrlShortener::class => AnnotatedFactory::class,
-            Service\VisitsTracker::class => AnnotatedFactory::class,
-            Service\ShortUrlService::class => AnnotatedFactory::class,
-
-            // Middleware
-            Middleware\Routable\RedirectMiddleware::class => AnnotatedFactory::class,
         ],
         'aliases' => [
             Router\RouterInterface::class => Router\FastRouteRouter::class,
diff --git a/config/config.php b/config/config.php
index 5b1fedf9..736b8fd4 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,6 +1,7 @@
 <?php
 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;
@@ -18,6 +19,7 @@ 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');
diff --git a/module/CLI/src/Command/GenerateShortcodeCommand.php b/module/CLI/src/Command/GenerateShortcodeCommand.php
index ef40525a..91cbd228 100644
--- a/module/CLI/src/Command/GenerateShortcodeCommand.php
+++ b/module/CLI/src/Command/GenerateShortcodeCommand.php
@@ -1,16 +1,15 @@
 <?php
 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/module/CLI/src/Command/GetVisitsCommand.php b/module/CLI/src/Command/GetVisitsCommand.php
index 5fe84a78..ee4cf3ad 100644
--- a/module/CLI/src/Command/GetVisitsCommand.php
+++ b/module/CLI/src/Command/GetVisitsCommand.php
@@ -1,9 +1,9 @@
 <?php
 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/module/CLI/src/Command/ListShortcodesCommand.php b/module/CLI/src/Command/ListShortcodesCommand.php
index 449e20a7..1db1f3fb 100644
--- a/module/CLI/src/Command/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/ListShortcodesCommand.php
@@ -1,11 +1,11 @@
 <?php
 namespace Shlinkio\Shlink\CLI\Command;
 
-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/module/CLI/src/Command/ResolveUrlCommand.php b/module/CLI/src/Command/ResolveUrlCommand.php
index b5feffca..01dad903 100644
--- a/module/CLI/src/Command/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/ResolveUrlCommand.php
@@ -1,10 +1,10 @@
 <?php
 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/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/config/autoload/routes.global.php b/module/Core/config/routes.config.php
similarity index 63%
rename from config/autoload/routes.global.php
rename to module/Core/config/routes.config.php
index 40a3d20b..8e9ac66d 100644
--- a/config/autoload/routes.global.php
+++ b/module/Core/config/routes.config.php
@@ -1,5 +1,5 @@
 <?php
-use Acelaya\UrlShortener\Middleware\Routable;
+use Shlinkio\Shlink\Core\Action\RedirectMiddleware;
 
 return [
 
@@ -7,7 +7,7 @@ return [
         [
             'name' => 'long-url-redirect',
             'path' => '/{shortCode}',
-            'middleware' => Routable\RedirectMiddleware::class,
+            '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/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 95%
rename from src/Entity/RestToken.php
rename to module/Core/src/Entity/RestToken.php
index 7f122ea4..865c83b9 100644
--- a/src/Entity/RestToken.php
+++ b/module/Core/src/Entity/RestToken.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;
 use Shlinkio\Shlink\Common\Util\StringUtilsTrait;
 
 /**
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 83%
rename from src/Repository/ShortUrlRepositoryInterface.php
rename to module/Core/src/Repository/ShortUrlRepositoryInterface.php
index af92b6ef..5096e065 100644
--- a/src/Repository/ShortUrlRepositoryInterface.php
+++ b/module/Core/src/Repository/ShortUrlRepositoryInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\Repository;
+namespace Shlinkio\Shlink\Core\Repository;
 
 use Doctrine\Common\Persistence\ObjectRepository;
 use Shlinkio\Shlink\Common\Repository\PaginableRepositoryInterface;
diff --git a/src/Service/ShortUrlService.php b/module/Core/src/Service/ShortUrlService.php
similarity index 88%
rename from src/Service/ShortUrlService.php
rename to module/Core/src/Service/ShortUrlService.php
index 0b200838..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\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 94%
rename from src/Service/UrlShortener.php
rename to module/Core/src/Service/UrlShortener.php
index c538110d..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
 {
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/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 96%
rename from tests/Service/UrlShortenerTest.php
rename to module/Core/test/Service/UrlShortenerTest.php
index 61580e0e..0c4bae4d 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
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/src/Action/CreateShortcodeMiddleware.php b/module/Rest/src/Action/CreateShortcodeMiddleware.php
index 823a2b49..fdb0ade3 100644
--- a/module/Rest/src/Action/CreateShortcodeMiddleware.php
+++ b/module/Rest/src/Action/CreateShortcodeMiddleware.php
@@ -1,12 +1,12 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidUrlException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
 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/module/Rest/src/Action/GetVisitsMiddleware.php b/module/Rest/src/Action/GetVisitsMiddleware.php
index 285b469a..02f8df63 100644
--- a/module/Rest/src/Action/GetVisitsMiddleware.php
+++ b/module/Rest/src/Action/GetVisitsMiddleware.php
@@ -1,12 +1,12 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
-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\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;
 
diff --git a/module/Rest/src/Action/ListShortcodesMiddleware.php b/module/Rest/src/Action/ListShortcodesMiddleware.php
index 2bea8189..4361ab89 100644
--- a/module/Rest/src/Action/ListShortcodesMiddleware.php
+++ b/module/Rest/src/Action/ListShortcodesMiddleware.php
@@ -1,12 +1,12 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Service\ShortUrlService;
-use Acelaya\UrlShortener\Service\ShortUrlServiceInterface;
 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;
 
diff --git a/module/Rest/src/Action/ResolveUrlMiddleware.php b/module/Rest/src/Action/ResolveUrlMiddleware.php
index 8c90e510..92a1e5c2 100644
--- a/module/Rest/src/Action/ResolveUrlMiddleware.php
+++ b/module/Rest/src/Action/ResolveUrlMiddleware.php
@@ -1,12 +1,12 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Action;
 
-use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
-use Acelaya\UrlShortener\Service\UrlShortener;
-use Acelaya\UrlShortener\Service\UrlShortenerInterface;
 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;
 
diff --git a/module/Rest/src/Exception/AuthenticationException.php b/module/Rest/src/Exception/AuthenticationException.php
index 51644fc3..e650636e 100644
--- a/module/Rest/src/Exception/AuthenticationException.php
+++ b/module/Rest/src/Exception/AuthenticationException.php
@@ -1,7 +1,7 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Exception;
 
-use Acelaya\UrlShortener\Exception\ExceptionInterface;
+use Shlinkio\Shlink\Core\Exception\ExceptionInterface;
 
 class AuthenticationException extends \RuntimeException implements ExceptionInterface
 {
diff --git a/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
index b8dee44e..0de25f8f 100644
--- a/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
+++ b/module/Rest/src/Middleware/CheckAuthenticationMiddleware.php
@@ -1,10 +1,10 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Middleware;
 
-use Acelaya\UrlShortener\Exception\InvalidArgumentException;
 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;
diff --git a/module/Rest/src/Service/RestTokenService.php b/module/Rest/src/Service/RestTokenService.php
index 07fc495a..83585404 100644
--- a/module/Rest/src/Service/RestTokenService.php
+++ b/module/Rest/src/Service/RestTokenService.php
@@ -1,10 +1,10 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Service;
 
-use Acelaya\UrlShortener\Entity\RestToken;
-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/module/Rest/src/Service/RestTokenServiceInterface.php b/module/Rest/src/Service/RestTokenServiceInterface.php
index 184a265b..d70973fb 100644
--- a/module/Rest/src/Service/RestTokenServiceInterface.php
+++ b/module/Rest/src/Service/RestTokenServiceInterface.php
@@ -1,8 +1,8 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Service;
 
-use Acelaya\UrlShortener\Entity\RestToken;
-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/module/Rest/src/Util/RestUtils.php b/module/Rest/src/Util/RestUtils.php
index 720d683d..ca24fbbe 100644
--- a/module/Rest/src/Util/RestUtils.php
+++ b/module/Rest/src/Util/RestUtils.php
@@ -1,7 +1,7 @@
 <?php
 namespace Shlinkio\Shlink\Rest\Util;
 
-use Acelaya\UrlShortener\Exception as Core;
+use Shlinkio\Shlink\Core\Exception as Core;
 use Shlinkio\Shlink\Rest\Exception as Rest;
 
 class RestUtils
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
-{
-}