diff --git a/VAR.ExpressionEvaluator/ExpressionBinaryNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionBinaryNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionBinaryNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionBinaryNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionBooleanNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionBooleanNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionBooleanNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionBooleanNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionDivisionNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionDivisionNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionDivisionNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionDivisionNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionFunctionNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionFunctionNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionFunctionNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionFunctionNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionMinusNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMinusNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionMinusNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMinusNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionMultiplyNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMultiplyNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionMultiplyNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionMultiplyNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionNumberNegateNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionNumberNegateNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionNumberNegateNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionNumberNegateNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionNumberNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionNumberNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionNumberNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionNumberNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionPlusNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionPlusNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionPlusNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionPlusNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionStringNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionStringNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionStringNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionStringNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionUnaryNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionUnaryNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionUnaryNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionUnaryNode.cs
diff --git a/VAR.ExpressionEvaluator/ExpressionVariableNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/ExpressionVariableNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/ExpressionVariableNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/ExpressionVariableNode.cs
diff --git a/VAR.ExpressionEvaluator/IExpressionNode.cs b/VAR.ExpressionEvaluator/ExpressionNodes/IExpressionNode.cs
similarity index 100%
rename from VAR.ExpressionEvaluator/IExpressionNode.cs
rename to VAR.ExpressionEvaluator/ExpressionNodes/IExpressionNode.cs
diff --git a/VAR.ExpressionEvaluator/VAR.ExpressionEvaluator.csproj b/VAR.ExpressionEvaluator/VAR.ExpressionEvaluator.csproj
index e123fad..08ac712 100644
--- a/VAR.ExpressionEvaluator/VAR.ExpressionEvaluator.csproj
+++ b/VAR.ExpressionEvaluator/VAR.ExpressionEvaluator.csproj
@@ -42,20 +42,20 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EvaluationContext.cs" />
-    <Compile Include="ExpressionBooleanNode.cs" />
-    <Compile Include="ExpressionDivisionNode.cs" />
-    <Compile Include="ExpressionFunctionNode.cs" />
-    <Compile Include="ExpressionMultiplyNode.cs" />
-    <Compile Include="ExpressionUnaryNode.cs" />
-    <Compile Include="ExpressionBinaryNode.cs" />
-    <Compile Include="ExpressionMinusNode.cs" />
-    <Compile Include="ExpressionNumberNegateNode.cs" />
-    <Compile Include="ExpressionPlusNode.cs" />
-    <Compile Include="ExpressionStringNode.cs" />
-    <Compile Include="ExpressionNumberNode.cs" />
-    <Compile Include="ExpressionVariableNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionBooleanNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionDivisionNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionFunctionNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionMultiplyNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionUnaryNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionBinaryNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionMinusNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionNumberNegateNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionPlusNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionStringNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionNumberNode.cs" />
+    <Compile Include="ExpressionNodes\ExpressionVariableNode.cs" />
     <Compile Include="IEvaluationContext.cs" />
-    <Compile Include="IExpressionNode.cs" />
+    <Compile Include="ExpressionNodes\IExpressionNode.cs" />
     <Compile Include="ITokenizer.cs" />
     <Compile Include="Parser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />