diff --git a/Classes/Domain/Model/Changes/AbstractCreate.php b/Classes/Domain/Model/Changes/AbstractCreate.php
index 03efd293ee..afb6855d7c 100644
--- a/Classes/Domain/Model/Changes/AbstractCreate.php
+++ b/Classes/Domain/Model/Changes/AbstractCreate.php
@@ -25,9 +25,9 @@
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Neos\Ui\Domain\Service\NodePropertyConversionService;
 use Neos\Neos\Ui\Exception\InvalidNodeCreationHandlerException;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationCommands;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationElements;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 use Neos\Utility\PositionalArraySorter;
 
 /**
diff --git a/Classes/NodeCreationHandler/NodeCreationCommands.php b/Classes/Domain/NodeCreation/NodeCreationCommands.php
similarity index 99%
rename from Classes/NodeCreationHandler/NodeCreationCommands.php
rename to Classes/Domain/NodeCreation/NodeCreationCommands.php
index 6b5a9e8b49..82446501ba 100644
--- a/Classes/NodeCreationHandler/NodeCreationCommands.php
+++ b/Classes/Domain/NodeCreation/NodeCreationCommands.php
@@ -1,6 +1,6 @@
 <?php
 declare(strict_types=1);
-namespace Neos\Neos\Ui\NodeCreationHandler;
+namespace Neos\Neos\Ui\Domain\NodeCreation;
 
 /*
  * This file is part of the Neos.Neos.Ui package.
diff --git a/Classes/NodeCreationHandler/NodeCreationElements.php b/Classes/Domain/NodeCreation/NodeCreationElements.php
similarity index 97%
rename from Classes/NodeCreationHandler/NodeCreationElements.php
rename to Classes/Domain/NodeCreation/NodeCreationElements.php
index b422b6dc0b..c35e9a2184 100644
--- a/Classes/NodeCreationHandler/NodeCreationElements.php
+++ b/Classes/Domain/NodeCreation/NodeCreationElements.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\NodeCreationHandler;
+namespace Neos\Neos\Ui\Domain\NodeCreation;
 
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIds;
 
diff --git a/Classes/NodeCreationHandler/NodeCreationHandlerInterface.php b/Classes/Domain/NodeCreation/NodeCreationHandlerInterface.php
similarity index 96%
rename from Classes/NodeCreationHandler/NodeCreationHandlerInterface.php
rename to Classes/Domain/NodeCreation/NodeCreationHandlerInterface.php
index 5fc56bae42..79c0b36782 100644
--- a/Classes/NodeCreationHandler/NodeCreationHandlerInterface.php
+++ b/Classes/Domain/NodeCreation/NodeCreationHandlerInterface.php
@@ -1,5 +1,5 @@
 <?php
-namespace Neos\Neos\Ui\NodeCreationHandler;
+namespace Neos\Neos\Ui\Domain\NodeCreation;
 
 /*
  * This file is part of the Neos.Neos.Ui package.
diff --git a/Classes/Domain/Service/NodePropertyConversionService.php b/Classes/Domain/Service/NodePropertyConversionService.php
index c81e062b4b..1f0b417a2e 100644
--- a/Classes/Domain/Service/NodePropertyConversionService.php
+++ b/Classes/Domain/Service/NodePropertyConversionService.php
@@ -18,7 +18,7 @@
 use Neos\Flow\ObjectManagement\ObjectManagerInterface;
 use Neos\Flow\Property\PropertyMapper;
 use Neos\Flow\Property\TypeConverter\PersistentObjectConverter;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationElements;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
 use Neos\Utility\Exception\InvalidTypeException;
 use Neos\Utility\TypeHandling;
 
diff --git a/Classes/NodeCreationHandler/Factory/PromotedElementsCreationHandlerFactory.php b/Classes/Infrastructure/NodeCreation/PromotedElementsCreationHandlerFactory.php
similarity index 91%
rename from Classes/NodeCreationHandler/Factory/PromotedElementsCreationHandlerFactory.php
rename to Classes/Infrastructure/NodeCreation/PromotedElementsCreationHandlerFactory.php
index be567db543..aa8760c455 100644
--- a/Classes/NodeCreationHandler/Factory/PromotedElementsCreationHandlerFactory.php
+++ b/Classes/Infrastructure/NodeCreation/PromotedElementsCreationHandlerFactory.php
@@ -2,14 +2,14 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\NodeCreationHandler\Factory;
+namespace Neos\Neos\Ui\Infrastructure\NodeCreation;
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationCommands;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationElements;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 
 /**
  * Generic creation dialog node creation handler that iterates
diff --git a/Classes/NodeCreationHandler/Factory/UriPathSegmentNodeCreationHandlerFactory.php b/Classes/Infrastructure/NodeCreation/UriPathSegmentNodeCreationHandlerFactory.php
similarity index 95%
rename from Classes/NodeCreationHandler/Factory/UriPathSegmentNodeCreationHandlerFactory.php
rename to Classes/Infrastructure/NodeCreation/UriPathSegmentNodeCreationHandlerFactory.php
index 514c5333e2..cfaf41294a 100644
--- a/Classes/NodeCreationHandler/Factory/UriPathSegmentNodeCreationHandlerFactory.php
+++ b/Classes/Infrastructure/NodeCreation/UriPathSegmentNodeCreationHandlerFactory.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Ui\NodeCreationHandler\Factory;
+namespace Neos\Neos\Ui\Infrastructure\NodeCreation;
 
 use Behat\Transliterator\Transliterator;
 use Neos\ContentRepository\Core\Dimension\ContentDimensionId;
@@ -14,9 +14,9 @@
 use Neos\Flow\I18n\Exception\InvalidLocaleIdentifierException;
 use Neos\Flow\I18n\Locale;
 use Neos\Neos\Service\TransliterationService;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationCommands;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationElements;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 
 /**
  * Node creation handler that
diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
index 0ea3eb2a3b..984ebca389 100644
--- a/Configuration/NodeTypes.yaml
+++ b/Configuration/NodeTypes.yaml
@@ -19,15 +19,15 @@
   options:
     nodeCreationHandlers:
       uriPathSegment:
-        factoryClassName: 'Neos\Neos\Ui\NodeCreationHandler\Factory\UriPathSegmentNodeCreationHandlerFactory'
+        factoryClassName: 'Neos\Neos\Ui\Infrastructure\NodeCreation\UriPathSegmentNodeCreationHandlerFactory'
       promotedElements:
-        factoryClassName: 'Neos\Neos\Ui\NodeCreationHandler\Factory\PromotedElementsCreationHandlerFactory'
+        factoryClassName: 'Neos\Neos\Ui\Infrastructure\NodeCreation\PromotedElementsCreationHandlerFactory'
 
 'Neos.Neos:Content':
   options:
     nodeCreationHandlers:
       promotedElements:
-        factoryClassName: 'Neos\Neos\Ui\NodeCreationHandler\Factory\PromotedElementsCreationHandlerFactory'
+        factoryClassName: 'Neos\Neos\Ui\Infrastructure\NodeCreation\PromotedElementsCreationHandlerFactory'
 
 'Neos.Neos:ContentCollection':
   ui:
diff --git a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes/Classes/NodeCreationHandler/ImagePropertyNodeCreationHandlerFactory.php b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes/Classes/NodeCreationHandler/ImagePropertyNodeCreationHandlerFactory.php
index d9043de5dc..914da930d9 100644
--- a/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes/Classes/NodeCreationHandler/ImagePropertyNodeCreationHandlerFactory.php
+++ b/Tests/IntegrationTests/TestDistribution/DistributionPackages/Neos.TestNodeTypes/Classes/NodeCreationHandler/ImagePropertyNodeCreationHandlerFactory.php
@@ -6,9 +6,9 @@
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryDependencies;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryServiceFactoryInterface;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationCommands;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationElements;
-use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
+use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
 
 /**
  * @implements ContentRepositoryServiceFactoryInterface<NodeCreationHandlerInterface>