diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/AccessNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/AccessNode.java
index 2cbe41d..a4bc9c7 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/AccessNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/AccessNode.java
@@ -1,6 +1,7 @@
 package com.annimon.hotarufx.parser.ast;
 
 import com.annimon.hotarufx.lib.Value;
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import java.util.List;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/Accessible.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/Accessible.java
index 0c93a6a..13c22a7 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/Accessible.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/Accessible.java
@@ -1,6 +1,7 @@
 package com.annimon.hotarufx.parser.ast;
 
 import com.annimon.hotarufx.lib.Value;
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 
 public interface Accessible extends Node {
 
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/AssignNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/AssignNode.java
index 793b010..3f41b37 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/AssignNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/AssignNode.java
@@ -1,5 +1,6 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/BlockNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/BlockNode.java
index 61563b1..cd643c5 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/BlockNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/BlockNode.java
@@ -1,5 +1,6 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/FunctionNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/FunctionNode.java
index 2c92ce0..b61f39c 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/FunctionNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/FunctionNode.java
@@ -1,5 +1,6 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/MapNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/MapNode.java
index 3e45079..7caeadb 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/MapNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/MapNode.java
@@ -1,5 +1,6 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import java.util.Map;
 import lombok.RequiredArgsConstructor;
 
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/Node.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/Node.java
index 01c0a81..0890399 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/Node.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/Node.java
@@ -1,5 +1,7 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
+
 public interface Node {
 
     <R, T> R accept(ResultVisitor<R, T> visitor, T input);
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/UnaryNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/UnaryNode.java
index 438ab8f..dd205d2 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/UnaryNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/UnaryNode.java
@@ -1,5 +1,6 @@
 package com.annimon.hotarufx.parser.ast;
 
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/ValueNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/ValueNode.java
index c080265..4ea912f 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/ValueNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/ValueNode.java
@@ -3,6 +3,7 @@ package com.annimon.hotarufx.parser.ast;
 import com.annimon.hotarufx.lib.NumberValue;
 import com.annimon.hotarufx.lib.StringValue;
 import com.annimon.hotarufx.lib.Value;
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/VariableNode.java b/app/src/main/java/com/annimon/hotarufx/parser/ast/VariableNode.java
index d4089a2..f746d99 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/VariableNode.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/ast/VariableNode.java
@@ -1,6 +1,7 @@
 package com.annimon.hotarufx.parser.ast;
 
 import com.annimon.hotarufx.lib.Value;
+import com.annimon.hotarufx.parser.visitors.ResultVisitor;
 import lombok.RequiredArgsConstructor;
 
 @RequiredArgsConstructor
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/visitors/InterpreterVisitor.java b/app/src/main/java/com/annimon/hotarufx/parser/visitors/InterpreterVisitor.java
index b56953c..b37008d 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/visitors/InterpreterVisitor.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/visitors/InterpreterVisitor.java
@@ -4,7 +4,6 @@ import com.annimon.hotarufx.exceptions.FunctionNotFoundException;
 import com.annimon.hotarufx.exceptions.TypeException;
 import com.annimon.hotarufx.exceptions.VariableNotFoundException;
 import com.annimon.hotarufx.lib.Context;
-import com.annimon.hotarufx.lib.Function;
 import com.annimon.hotarufx.lib.MapValue;
 import com.annimon.hotarufx.lib.NumberValue;
 import com.annimon.hotarufx.lib.StringValue;
diff --git a/app/src/main/java/com/annimon/hotarufx/parser/ast/ResultVisitor.java b/app/src/main/java/com/annimon/hotarufx/parser/visitors/ResultVisitor.java
similarity index 54%
rename from app/src/main/java/com/annimon/hotarufx/parser/ast/ResultVisitor.java
rename to app/src/main/java/com/annimon/hotarufx/parser/visitors/ResultVisitor.java
index 7f07ab7..6b8f945 100644
--- a/app/src/main/java/com/annimon/hotarufx/parser/ast/ResultVisitor.java
+++ b/app/src/main/java/com/annimon/hotarufx/parser/visitors/ResultVisitor.java
@@ -1,6 +1,14 @@
-package com.annimon.hotarufx.parser.ast;
+package com.annimon.hotarufx.parser.visitors;
 
 import com.annimon.hotarufx.lib.Value;
+import com.annimon.hotarufx.parser.ast.AccessNode;
+import com.annimon.hotarufx.parser.ast.AssignNode;
+import com.annimon.hotarufx.parser.ast.BlockNode;
+import com.annimon.hotarufx.parser.ast.FunctionNode;
+import com.annimon.hotarufx.parser.ast.MapNode;
+import com.annimon.hotarufx.parser.ast.UnaryNode;
+import com.annimon.hotarufx.parser.ast.ValueNode;
+import com.annimon.hotarufx.parser.ast.VariableNode;
 
 public interface ResultVisitor<R, T> {