diff --git a/module/CLI/config/cli.config.php b/module/CLI/config/cli.config.php
index adc49fa9..699d4275 100644
--- a/module/CLI/config/cli.config.php
+++ b/module/CLI/config/cli.config.php
@@ -5,10 +5,10 @@ return [
 
     'cli' => [
         'commands' => [
-            Command\GenerateShortcodeCommand::class,
-            Command\ResolveUrlCommand::class,
-            Command\ListShortcodesCommand::class,
-            Command\GetVisitsCommand::class,
+            Command\Shortcode\GenerateShortcodeCommand::class,
+            Command\Shortcode\ResolveUrlCommand::class,
+            Command\Shortcode\ListShortcodesCommand::class,
+            Command\Shortcode\GetVisitsCommand::class,
             Command\ProcessVisitsCommand::class,
             Command\Config\GenerateCharsetCommand::class,
             Command\Config\GenerateSecretCommand::class,
diff --git a/module/CLI/config/dependencies.config.php b/module/CLI/config/dependencies.config.php
index 18e05dcb..682204b4 100644
--- a/module/CLI/config/dependencies.config.php
+++ b/module/CLI/config/dependencies.config.php
@@ -10,11 +10,10 @@ return [
         'factories' => [
             Application::class => ApplicationFactory::class,
 
-            Command\GenerateShortcodeCommand::class => AnnotatedFactory::class,
-            Command\ResolveUrlCommand::class => AnnotatedFactory::class,
-            Command\ListShortcodesCommand::class => AnnotatedFactory::class,
-            Command\GetVisitsCommand::class => AnnotatedFactory::class,
-            Command\ProcessVisitsCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\GenerateShortcodeCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\ResolveUrlCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\ListShortcodesCommand::class => AnnotatedFactory::class,
+            Command\Shortcode\GetVisitsCommand::class => AnnotatedFactory::class,
             Command\ProcessVisitsCommand::class => AnnotatedFactory::class,
             Command\Config\GenerateCharsetCommand::class => AnnotatedFactory::class,
             Command\Config\GenerateSecretCommand::class => AnnotatedFactory::class,
diff --git a/module/CLI/src/Command/GenerateShortcodeCommand.php b/module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
similarity index 97%
rename from module/CLI/src/Command/GenerateShortcodeCommand.php
rename to module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
index f02c110b..2830fb40 100644
--- a/module/CLI/src/Command/GenerateShortcodeCommand.php
+++ b/module/CLI/src/Command/Shortcode/GenerateShortcodeCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
@@ -31,7 +31,7 @@ class GenerateShortcodeCommand extends Command
 
     /**
      * GenerateShortcodeCommand constructor.
-     * @param UrlShortenerInterface|UrlShortener $urlShortener
+     * @param UrlShortenerInterface $urlShortener
      * @param TranslatorInterface $translator
      * @param array $domainConfig
      *
diff --git a/module/CLI/src/Command/GetVisitsCommand.php b/module/CLI/src/Command/Shortcode/GetVisitsCommand.php
similarity index 97%
rename from module/CLI/src/Command/GetVisitsCommand.php
rename to module/CLI/src/Command/Shortcode/GetVisitsCommand.php
index c25ba27a..5943e4aa 100644
--- a/module/CLI/src/Command/GetVisitsCommand.php
+++ b/module/CLI/src/Command/Shortcode/GetVisitsCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Util\DateRange;
@@ -28,7 +28,7 @@ class GetVisitsCommand extends Command
 
     /**
      * GetVisitsCommand constructor.
-     * @param VisitsTrackerInterface|VisitsTracker $visitsTracker
+     * @param VisitsTrackerInterface $visitsTracker
      * @param TranslatorInterface $translator
      *
      * @Inject({VisitsTracker::class, "translator"})
diff --git a/module/CLI/src/Command/ListShortcodesCommand.php b/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
similarity index 96%
rename from module/CLI/src/Command/ListShortcodesCommand.php
rename to module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
index e59aa903..d57d3311 100644
--- a/module/CLI/src/Command/ListShortcodesCommand.php
+++ b/module/CLI/src/Command/Shortcode/ListShortcodesCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Common\Paginator\Adapter\PaginableRepositoryAdapter;
@@ -30,7 +30,7 @@ class ListShortcodesCommand extends Command
 
     /**
      * ListShortcodesCommand constructor.
-     * @param ShortUrlServiceInterface|ShortUrlService $shortUrlService
+     * @param ShortUrlServiceInterface $shortUrlService
      * @param TranslatorInterface $translator
      *
      * @Inject({ShortUrlService::class, "translator"})
diff --git a/module/CLI/src/Command/ResolveUrlCommand.php b/module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
similarity index 96%
rename from module/CLI/src/Command/ResolveUrlCommand.php
rename to module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
index 62d81f41..a94b47ad 100644
--- a/module/CLI/src/Command/ResolveUrlCommand.php
+++ b/module/CLI/src/Command/Shortcode/ResolveUrlCommand.php
@@ -1,5 +1,5 @@
 <?php
-namespace Shlinkio\Shlink\CLI\Command;
+namespace Shlinkio\Shlink\CLI\Command\Shortcode;
 
 use Acelaya\ZsmAnnotatedServices\Annotation\Inject;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
@@ -26,7 +26,7 @@ class ResolveUrlCommand extends Command
 
     /**
      * ResolveUrlCommand constructor.
-     * @param UrlShortenerInterface|UrlShortener $urlShortener
+     * @param UrlShortenerInterface $urlShortener
      * @param TranslatorInterface $translator
      *
      * @Inject({UrlShortener::class, "translator"})
diff --git a/module/CLI/test/Command/GenerateShortcodeCommandTest.php b/module/CLI/test/Command/GenerateShortcodeCommandTest.php
index 45cb8130..011dcb32 100644
--- a/module/CLI/test/Command/GenerateShortcodeCommandTest.php
+++ b/module/CLI/test/Command/GenerateShortcodeCommandTest.php
@@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\GenerateShortcodeCommand;
+use Shlinkio\Shlink\CLI\Command\Shortcode\GenerateShortcodeCommand;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;
diff --git a/module/CLI/test/Command/GetVisitsCommandTest.php b/module/CLI/test/Command/GetVisitsCommandTest.php
index 4294823b..5657a91c 100644
--- a/module/CLI/test/Command/GetVisitsCommandTest.php
+++ b/module/CLI/test/Command/GetVisitsCommandTest.php
@@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\GetVisitsCommand;
+use Shlinkio\Shlink\CLI\Command\Shortcode\GetVisitsCommand;
 use Shlinkio\Shlink\Common\Util\DateRange;
 use Shlinkio\Shlink\Core\Entity\Visit;
 use Shlinkio\Shlink\Core\Service\VisitsTrackerInterface;
diff --git a/module/CLI/test/Command/ListShortcodesCommandTest.php b/module/CLI/test/Command/ListShortcodesCommandTest.php
index 7ec0e5af..1a1884ec 100644
--- a/module/CLI/test/Command/ListShortcodesCommandTest.php
+++ b/module/CLI/test/Command/ListShortcodesCommandTest.php
@@ -4,7 +4,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Argument;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\ListShortcodesCommand;
+use Shlinkio\Shlink\CLI\Command\Shortcode\ListShortcodesCommand;
 use Shlinkio\Shlink\Core\Entity\ShortUrl;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
 use Symfony\Component\Console\Application;
diff --git a/module/CLI/test/Command/ResolveUrlCommandTest.php b/module/CLI/test/Command/ResolveUrlCommandTest.php
index a2f47c92..06b5d350 100644
--- a/module/CLI/test/Command/ResolveUrlCommandTest.php
+++ b/module/CLI/test/Command/ResolveUrlCommandTest.php
@@ -3,7 +3,7 @@ namespace ShlinkioTest\Shlink\CLI\Command;
 
 use PHPUnit_Framework_TestCase as TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
-use Shlinkio\Shlink\CLI\Command\ResolveUrlCommand;
+use Shlinkio\Shlink\CLI\Command\Shortcode\ResolveUrlCommand;
 use Shlinkio\Shlink\Core\Exception\InvalidShortCodeException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
 use Symfony\Component\Console\Application;