diff --git a/src/com/annimon/ownlang/parser/Optimizer.java b/src/com/annimon/ownlang/parser/Optimizer.java
index c753bed..d842c71 100644
--- a/src/com/annimon/ownlang/parser/Optimizer.java
+++ b/src/com/annimon/ownlang/parser/Optimizer.java
@@ -1,10 +1,10 @@
 package com.annimon.ownlang.parser;
 
 import com.annimon.ownlang.parser.ast.Statement;
-import com.annimon.ownlang.parser.visitors.ConstantFolding;
-import com.annimon.ownlang.parser.visitors.ConstantPropagation;
-import com.annimon.ownlang.parser.visitors.DeadCodeElimination;
-import com.annimon.ownlang.parser.visitors.ExpressionSimplification;
+import com.annimon.ownlang.parser.optimization.ConstantFolding;
+import com.annimon.ownlang.parser.optimization.ConstantPropagation;
+import com.annimon.ownlang.parser.optimization.DeadCodeElimination;
+import com.annimon.ownlang.parser.optimization.ExpressionSimplification;
 
 public final class Optimizer {
 
diff --git a/src/com/annimon/ownlang/parser/visitors/ConstantFolding.java b/src/com/annimon/ownlang/parser/optimization/ConstantFolding.java
similarity index 97%
rename from src/com/annimon/ownlang/parser/visitors/ConstantFolding.java
rename to src/com/annimon/ownlang/parser/optimization/ConstantFolding.java
index 405dec6..6d26ea2 100644
--- a/src/com/annimon/ownlang/parser/visitors/ConstantFolding.java
+++ b/src/com/annimon/ownlang/parser/optimization/ConstantFolding.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.optimization;
 
 import com.annimon.ownlang.exceptions.OperationIsNotSupportedException;
 import com.annimon.ownlang.parser.Optimizer;
@@ -8,6 +8,7 @@ import com.annimon.ownlang.parser.ast.FunctionDefineStatement;
 import com.annimon.ownlang.parser.ast.Node;
 import com.annimon.ownlang.parser.ast.UnaryExpression;
 import com.annimon.ownlang.parser.ast.ValueExpression;
+import com.annimon.ownlang.parser.visitors.VisitorUtils;
 import java.util.HashSet;
 import java.util.Set;
 
diff --git a/src/com/annimon/ownlang/parser/visitors/ConstantPropagation.java b/src/com/annimon/ownlang/parser/optimization/ConstantPropagation.java
similarity index 99%
rename from src/com/annimon/ownlang/parser/visitors/ConstantPropagation.java
rename to src/com/annimon/ownlang/parser/optimization/ConstantPropagation.java
index ca31242..6448d45 100644
--- a/src/com/annimon/ownlang/parser/visitors/ConstantPropagation.java
+++ b/src/com/annimon/ownlang/parser/optimization/ConstantPropagation.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.optimization;
 
 import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
diff --git a/src/com/annimon/ownlang/parser/visitors/DeadCodeElimination.java b/src/com/annimon/ownlang/parser/optimization/DeadCodeElimination.java
similarity index 98%
rename from src/com/annimon/ownlang/parser/visitors/DeadCodeElimination.java
rename to src/com/annimon/ownlang/parser/optimization/DeadCodeElimination.java
index f40729e..b1c8ca4 100644
--- a/src/com/annimon/ownlang/parser/visitors/DeadCodeElimination.java
+++ b/src/com/annimon/ownlang/parser/optimization/DeadCodeElimination.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.optimization;
 
 import com.annimon.ownlang.parser.Optimizer;
 import com.annimon.ownlang.parser.ast.ExprStatement;
diff --git a/src/com/annimon/ownlang/parser/visitors/ExpressionSimplification.java b/src/com/annimon/ownlang/parser/optimization/ExpressionSimplification.java
similarity index 97%
rename from src/com/annimon/ownlang/parser/visitors/ExpressionSimplification.java
rename to src/com/annimon/ownlang/parser/optimization/ExpressionSimplification.java
index 67ddfa6..1a41625 100644
--- a/src/com/annimon/ownlang/parser/visitors/ExpressionSimplification.java
+++ b/src/com/annimon/ownlang/parser/optimization/ExpressionSimplification.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.optimization;
 
 import com.annimon.ownlang.parser.Optimizer;
 import com.annimon.ownlang.parser.ast.BinaryExpression;
@@ -7,6 +7,7 @@ import com.annimon.ownlang.parser.ast.FunctionDefineStatement;
 import com.annimon.ownlang.parser.ast.Node;
 import com.annimon.ownlang.parser.ast.UnaryExpression;
 import com.annimon.ownlang.parser.ast.ValueExpression;
+import com.annimon.ownlang.parser.visitors.VisitorUtils;
 import static com.annimon.ownlang.parser.visitors.VisitorUtils.isIntegerValue;
 import static com.annimon.ownlang.parser.visitors.VisitorUtils.isSameVariables;
 import java.util.HashSet;
diff --git a/src/com/annimon/ownlang/parser/visitors/OptimizationVisitor.java b/src/com/annimon/ownlang/parser/optimization/OptimizationVisitor.java
similarity index 99%
rename from src/com/annimon/ownlang/parser/visitors/OptimizationVisitor.java
rename to src/com/annimon/ownlang/parser/optimization/OptimizationVisitor.java
index 18efdee..51983c0 100644
--- a/src/com/annimon/ownlang/parser/visitors/OptimizationVisitor.java
+++ b/src/com/annimon/ownlang/parser/optimization/OptimizationVisitor.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.optimization;
 
 import com.annimon.ownlang.parser.ast.*;
 import java.util.ArrayList;