diff --git a/composer.json b/composer.json
index 9965ebe6..91f340c1 100644
--- a/composer.json
+++ b/composer.json
@@ -2,6 +2,7 @@
     "name": "shlinkio/shlink",
     "type": "project",
     "homepage": "http://shlink.io",
+    "description": "A PHP-based URL shortener application with analytics and management",
     "license": "MIT",
     "authors": [
         {
@@ -36,12 +37,18 @@
     },
     "autoload": {
         "psr-4": {
-            "Acelaya\\UrlShortener\\": "src"
+            "Acelaya\\UrlShortener\\": "src",
+            "Shlinkio\\Shlink\\CLI\\": "module/CLI/src",
+            "Shlinkio\\Shlink\\Rest\\": "module/Rest/src",
+            "Shlinkio\\Shlink\\Core\\": "module/Core/src"
         }
     },
     "autoload-dev": {
         "psr-4": {
-            "AcelayaTest\\UrlShortener\\": "tests"
+            "AcelayaTest\\UrlShortener\\": "tests",
+            "ShlinkioTest\\Shlink\\CLI\\": "module/CLI/test",
+            "ShlinkioTest\\Shlink\\Rest\\": "module/Rest/test",
+            "ShlinkioTest\\Shlink\\Core\\": "module/Core/test"
         }
     },
     "scripts": {
diff --git a/config/autoload/services.global.php b/config/autoload/services.global.php
index 4d6cc40e..3277159e 100644
--- a/config/autoload/services.global.php
+++ b/config/autoload/services.global.php
@@ -1,5 +1,5 @@
 <?php
-use Acelaya\UrlShortener\CLI;
+use Shlinkio\Shlink\CLI;
 use Acelaya\UrlShortener\Factory\CacheFactory;
 use Acelaya\UrlShortener\Factory\EntityManagerFactory;
 use Acelaya\UrlShortener\Middleware;
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 f835a11c..b27d8173 100644
--- a/config/config.php
+++ b/config/config.php
@@ -1,4 +1,5 @@
 <?php
+use Shlinkio\Shlink\CLI;
 use Zend\Expressive\ConfigManager\ConfigManager;
 use Zend\Expressive\ConfigManager\ZendConfigProvider;
 
@@ -13,6 +14,7 @@ use Zend\Expressive\ConfigManager\ZendConfigProvider;
 
 return call_user_func(function () {
     $configManager = new ConfigManager([
+        CLI\Config\ConfigProvider::class,
         new ZendConfigProvider('config/autoload/{{,*.}global,{,*.}local}.php')
     ], 'data/cache/app_config.php');
 
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/src/CLI/Command/GenerateShortcodeCommand.php b/module/CLI/src/Command/GenerateShortcodeCommand.php
similarity index 98%
rename from src/CLI/Command/GenerateShortcodeCommand.php
rename to module/CLI/src/Command/GenerateShortcodeCommand.php
index ffc355db..ef40525a 100644
--- a/src/CLI/Command/GenerateShortcodeCommand.php
+++ b/module/CLI/src/Command/GenerateShortcodeCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
 use Acelaya\UrlShortener\Exception\InvalidUrlException;
 use Acelaya\UrlShortener\Service\UrlShortener;
diff --git a/src/CLI/Command/GetVisitsCommand.php b/module/CLI/src/Command/GetVisitsCommand.php
similarity index 98%
rename from src/CLI/Command/GetVisitsCommand.php
rename to module/CLI/src/Command/GetVisitsCommand.php
index 3c4e796d..5fe84a78 100644
--- a/src/CLI/Command/GetVisitsCommand.php
+++ b/module/CLI/src/Command/GetVisitsCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
 use Acelaya\UrlShortener\Service\VisitsTracker;
 use Acelaya\UrlShortener\Service\VisitsTrackerInterface;
diff --git a/src/CLI/Command/ListShortcodesCommand.php b/module/CLI/src/Command/ListShortcodesCommand.php
similarity index 98%
rename from src/CLI/Command/ListShortcodesCommand.php
rename to module/CLI/src/Command/ListShortcodesCommand.php
index ac85d50f..f3efa3d1 100644
--- a/src/CLI/Command/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/ListShortcodesCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
 use Acelaya\UrlShortener\Paginator\Adapter\PaginableRepositoryAdapter;
 use Acelaya\UrlShortener\Paginator\Util\PaginatorUtilsTrait;
diff --git a/src/CLI/Command/ResolveUrlCommand.php b/module/CLI/src/Command/ResolveUrlCommand.php
similarity index 98%
rename from src/CLI/Command/ResolveUrlCommand.php
rename to module/CLI/src/Command/ResolveUrlCommand.php
index 4eb5ff41..b5feffca 100644
--- a/src/CLI/Command/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/ResolveUrlCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Acelaya\UrlShortener\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command;
 
 use Acelaya\UrlShortener\Exception\InvalidShortCodeException;
 use Acelaya\UrlShortener\Service\UrlShortener;
diff --git a/module/CLI/src/Config/ConfigProvider.php b/module/CLI/src/Config/ConfigProvider.php
new file mode 100644
index 00000000..fa269d6c
--- /dev/null
+++ b/module/CLI/src/Config/ConfigProvider.php
@@ -0,0 +1,13 @@
+<?php
+namespace Shlinkio\Shlink\CLI\Config;
+
+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/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>