diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index 7b55290c..273399da 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -25,7 +25,7 @@ return [
             Action\ShortCode\EditShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ResolveUrlAction::class => ConfigAbstractFactory::class,
             Action\GetVisitsAction::class => ConfigAbstractFactory::class,
-            Action\ListShortCodesAction::class => ConfigAbstractFactory::class,
+            Action\ShortCode\ListShortCodesAction::class => ConfigAbstractFactory::class,
             Action\EditShortCodeTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\ListTagsAction::class => ConfigAbstractFactory::class,
             Action\Tag\DeleteTagsAction::class => ConfigAbstractFactory::class,
@@ -60,7 +60,7 @@ return [
         Action\ShortCode\EditShortCodeAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink',],
         Action\ResolveUrlAction::class => [Service\UrlShortener::class, 'translator'],
         Action\GetVisitsAction::class => [Service\VisitsTracker::class, 'translator', 'Logger_Shlink'],
-        Action\ListShortCodesAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
+        Action\ShortCode\ListShortCodesAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
         Action\EditShortCodeTagsAction::class => [Service\ShortUrlService::class, 'translator', 'Logger_Shlink'],
         Action\Tag\ListTagsAction::class => [Service\Tag\TagService::class, LoggerInterface::class],
         Action\Tag\DeleteTagsAction::class => [Service\Tag\TagService::class, LoggerInterface::class],
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index cb06e7ae..d652bfb4 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -13,7 +13,7 @@ return [
         Action\ShortCode\SingleStepCreateShortCodeAction::getRouteDef(),
         Action\ShortCode\EditShortCodeAction::getRouteDef(),
         Action\ResolveUrlAction::getRouteDef(),
-        Action\ListShortCodesAction::getRouteDef(),
+        Action\ShortCode\ListShortCodesAction::getRouteDef(),
         Action\EditShortCodeTagsAction::getRouteDef(),
 
         // Visits
diff --git a/module/Rest/src/Action/ListShortCodesAction.php b/module/Rest/src/Action/ShortCode/ListShortCodesAction.php
similarity index 95%
rename from module/Rest/src/Action/ListShortCodesAction.php
rename to module/Rest/src/Action/ShortCode/ListShortCodesAction.php
index b2864e16..58f26d77 100644
--- a/module/Rest/src/Action/ListShortCodesAction.php
+++ b/module/Rest/src/Action/ShortCode/ListShortCodesAction.php
@@ -1,13 +1,14 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action;
+namespace Shlinkio\Shlink\Rest\Action\ShortCode;
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Psr\Log\LoggerInterface;
 use Shlinkio\Shlink\Common\Paginator\Util\PaginatorUtilsTrait;
 use Shlinkio\Shlink\Core\Service\ShortUrlServiceInterface;
+use Shlinkio\Shlink\Rest\Action\AbstractRestAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\Response\JsonResponse;
 use Zend\I18n\Translator\TranslatorInterface;
diff --git a/module/Rest/test/Action/ListShortCodesActionTest.php b/module/Rest/test/Action/ListShortCodesActionTest.php
index 05305d9e..8905cc66 100644
--- a/module/Rest/test/Action/ListShortCodesActionTest.php
+++ b/module/Rest/test/Action/ListShortCodesActionTest.php
@@ -6,7 +6,7 @@ namespace ShlinkioTest\Shlink\Rest\Action;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Service\ShortUrlService;
-use Shlinkio\Shlink\Rest\Action\ListShortCodesAction;
+use Shlinkio\Shlink\Rest\Action\ShortCode\ListShortCodesAction;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\I18n\Translator\Translator;
 use Zend\Paginator\Adapter\ArrayAdapter;