diff --git a/src/TypeSystem/Narrower/ExpressionTypeNarrower.php b/src/TypeSystem/Narrower/Expression/ExpressionTypeNarrower.php
similarity index 96%
rename from src/TypeSystem/Narrower/ExpressionTypeNarrower.php
rename to src/TypeSystem/Narrower/Expression/ExpressionTypeNarrower.php
index 26594586..ab65da98 100644
--- a/src/TypeSystem/Narrower/ExpressionTypeNarrower.php
+++ b/src/TypeSystem/Narrower/Expression/ExpressionTypeNarrower.php
@@ -20,13 +20,15 @@
 
 declare(strict_types=1);
 
-namespace PackageFactory\ComponentEngine\TypeSystem\Narrower;
+namespace PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression;
 
 use PackageFactory\ComponentEngine\Definition\BinaryOperator;
 use PackageFactory\ComponentEngine\Parser\Ast\BinaryOperationNode;
 use PackageFactory\ComponentEngine\Parser\Ast\BooleanLiteralNode;
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Parser\Ast\IdentifierNode;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\Resolver\Expression\ExpressionTypeResolver;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;
diff --git a/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php b/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php
index 4615e071..6e7ab53f 100644
--- a/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php
+++ b/src/TypeSystem/Scope/TernaryBranchScope/TernaryBranchScope.php
@@ -25,7 +25,7 @@
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Parser\Ast\TypeReferenceNode;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
-use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\ScopeInterface;
 use PackageFactory\ComponentEngine\TypeSystem\TypeInterface;
diff --git a/test/Unit/TypeSystem/Narrower/ExpressionTypeNarrowerTest.php b/test/Unit/TypeSystem/Narrower/Expression/ExpressionTypeNarrowerTest.php
similarity index 99%
rename from test/Unit/TypeSystem/Narrower/ExpressionTypeNarrowerTest.php
rename to test/Unit/TypeSystem/Narrower/Expression/ExpressionTypeNarrowerTest.php
index 94a0f7ba..bc02555b 100644
--- a/test/Unit/TypeSystem/Narrower/ExpressionTypeNarrowerTest.php
+++ b/test/Unit/TypeSystem/Narrower/Expression/ExpressionTypeNarrowerTest.php
@@ -20,12 +20,12 @@
 
 declare(strict_types=1);
 
-namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower;
+namespace PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Narrower\Expression;
 
 
 use PackageFactory\ComponentEngine\Parser\Ast\ExpressionNode;
 use PackageFactory\ComponentEngine\Test\Unit\TypeSystem\Scope\Fixtures\DummyScope;
-use PackageFactory\ComponentEngine\TypeSystem\Narrower\ExpressionTypeNarrower;
+use PackageFactory\ComponentEngine\TypeSystem\Narrower\Expression\ExpressionTypeNarrower;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\NarrowedTypes;
 use PackageFactory\ComponentEngine\TypeSystem\Narrower\TypeNarrowerContext;
 use PackageFactory\ComponentEngine\TypeSystem\Type\NullType\NullType;