diff --git a/module/Rest/config/dependencies.config.php b/module/Rest/config/dependencies.config.php
index e0d9ede9..d5de2114 100644
--- a/module/Rest/config/dependencies.config.php
+++ b/module/Rest/config/dependencies.config.php
@@ -20,7 +20,7 @@ return [
             ApiKeyService::class => ConfigAbstractFactory::class,
 
             Action\AuthenticateAction::class => ConfigAbstractFactory::class,
-            Action\CreateShortCodeAction::class => ConfigAbstractFactory::class,
+            Action\ShortCode\CreateShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ShortCode\SingleStepCreateShortCodeAction::class => ConfigAbstractFactory::class,
             Action\EditShortCodeAction::class => ConfigAbstractFactory::class,
             Action\ResolveUrlAction::class => ConfigAbstractFactory::class,
@@ -44,7 +44,7 @@ return [
         ApiKeyService::class => ['em'],
 
         Action\AuthenticateAction::class => [ApiKeyService::class, JWTService::class, 'translator', 'Logger_Shlink'],
-        Action\CreateShortCodeAction::class => [
+        Action\ShortCode\CreateShortCodeAction::class => [
             Service\UrlShortener::class,
             'translator',
             'config.url_shortener.domain',
diff --git a/module/Rest/config/routes.config.php b/module/Rest/config/routes.config.php
index f11078ce..1b90fd01 100644
--- a/module/Rest/config/routes.config.php
+++ b/module/Rest/config/routes.config.php
@@ -9,7 +9,7 @@ return [
         Action\AuthenticateAction::getRouteDef(),
 
         // Short codes
-        Action\CreateShortCodeAction::getRouteDef(),
+        Action\ShortCode\CreateShortCodeAction::getRouteDef(),
         Action\ShortCode\SingleStepCreateShortCodeAction::getRouteDef(),
         Action\EditShortCodeAction::getRouteDef(),
         Action\ResolveUrlAction::getRouteDef(),
diff --git a/module/Rest/src/Action/CreateShortCodeAction.php b/module/Rest/src/Action/ShortCode/CreateShortCodeAction.php
similarity index 93%
rename from module/Rest/src/Action/CreateShortCodeAction.php
rename to module/Rest/src/Action/ShortCode/CreateShortCodeAction.php
index 3e8ad560..da556420 100644
--- a/module/Rest/src/Action/CreateShortCodeAction.php
+++ b/module/Rest/src/Action/ShortCode/CreateShortCodeAction.php
@@ -1,13 +1,12 @@
 <?php
 declare(strict_types=1);
 
-namespace Shlinkio\Shlink\Rest\Action;
+namespace Shlinkio\Shlink\Rest\Action\ShortCode;
 
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Shlinkio\Shlink\Core\Exception\InvalidArgumentException;
 use Shlinkio\Shlink\Core\Model\CreateShortCodeData;
 use Shlinkio\Shlink\Core\Model\ShortUrlMeta;
-use Shlinkio\Shlink\Rest\Action\ShortCode\AbstractCreateShortCodeAction;
 use Zend\Diactoros\Uri;
 
 class CreateShortCodeAction extends AbstractCreateShortCodeAction
diff --git a/module/Rest/test/Action/CreateShortCodeActionTest.php b/module/Rest/test/Action/CreateShortCodeActionTest.php
index 609b28a5..a75a248a 100644
--- a/module/Rest/test/Action/CreateShortCodeActionTest.php
+++ b/module/Rest/test/Action/CreateShortCodeActionTest.php
@@ -9,7 +9,7 @@ use Prophecy\Prophecy\ObjectProphecy;
 use Shlinkio\Shlink\Core\Exception\InvalidUrlException;
 use Shlinkio\Shlink\Core\Exception\NonUniqueSlugException;
 use Shlinkio\Shlink\Core\Service\UrlShortener;
-use Shlinkio\Shlink\Rest\Action\CreateShortCodeAction;
+use Shlinkio\Shlink\Rest\Action\ShortCode\CreateShortCodeAction;
 use Shlinkio\Shlink\Rest\Util\RestUtils;
 use Zend\Diactoros\ServerRequestFactory;
 use Zend\Diactoros\Uri;