diff --git a/AlgebraicDataflowArchitectureModel/src/code/ast/IExpressionVisitor.java b/AlgebraicDataflowArchitectureModel/src/code/ast/IExpressionVisitor.java
deleted file mode 100644
index fe01735..0000000
--- a/AlgebraicDataflowArchitectureModel/src/code/ast/IExpressionVisitor.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.ast;
-
-import models.algebra.Constant;
-import models.algebra.Field;
-import models.algebra.Term;
-import models.algebra.Variable;
-import models.dataConstraintModel.JsonAccessor;
-import models.dataConstraintModel.JsonTerm;
-
-public interface IExpressionVisitor<T> {
-	T visit(Term term, String[] sideEffects);
-	
-	T visit(Field field, String[] sideEffects);
-	
-	T visit(Constant constant, String[] sideEffects);
-	
-	T visit(Variable variable, String[] sideEffects);
-	
-	T visit(JsonTerm jsonTerm, String[] sideEffects);
-	
-	T visit(JsonAccessor jsonAccessor, String[] sideEffects);
-}
diff --git a/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java b/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
index 3888b41..6d2230e 100644
--- a/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
+++ b/AlgebraicDataflowArchitectureModel/src/generators/JavaImplementationVisitor.java
@@ -1,6 +1,6 @@
 package generators;
 
-import code.ast.IExpressionVisitor;
+import models.algebra.IExpressionVisitor;
 import models.algebra.*;
 import models.dataConstraintModel.DataConstraintModel;
 import models.dataConstraintModel.JsonAccessor;
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
index 3433b19..836600c 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Constant.java
@@ -1,6 +1,5 @@
 package models.algebra;
 
-import code.ast.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 
 import java.util.ArrayList;
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Expression.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Expression.java
index a30a164..910518e 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Expression.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Expression.java
@@ -1,7 +1,5 @@
 package models.algebra;
 
-import code.ast.IExpressionVisitor;
-
 import java.util.HashMap;
 
 public abstract class Expression implements Cloneable {
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Field.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Field.java
index cca367a..3fcc269 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Field.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Field.java
@@ -1,6 +1,5 @@
 package models.algebra;
 
-import code.ast.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 
 /**
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/IExpressionVisitor.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/IExpressionVisitor.java
new file mode 100644
index 0000000..4c30c09
--- /dev/null
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/IExpressionVisitor.java
@@ -0,0 +1,18 @@
+package models.algebra;
+
+import models.dataConstraintModel.JsonAccessor;
+import models.dataConstraintModel.JsonTerm;
+
+public interface IExpressionVisitor<T> {
+	T visit(Term term, String[] sideEffects);
+	
+	T visit(Field field, String[] sideEffects);
+	
+	T visit(Constant constant, String[] sideEffects);
+	
+	T visit(Variable variable, String[] sideEffects);
+	
+	T visit(JsonTerm jsonTerm, String[] sideEffects);
+	
+	T visit(JsonAccessor jsonAccessor, String[] sideEffects);
+}
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
index edc2d78..e753b2e 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Term.java
@@ -1,6 +1,5 @@
 package models.algebra;
 
-import code.ast.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 
 import java.util.ArrayList;
diff --git a/AlgebraicDataflowArchitectureModel/src/models/algebra/Variable.java b/AlgebraicDataflowArchitectureModel/src/models/algebra/Variable.java
index 426d067..dbe441b 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/algebra/Variable.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/algebra/Variable.java
@@ -1,6 +1,5 @@
 package models.algebra;
 
-import code.ast.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 
 import java.util.HashMap;
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
index e8c525b..2ff827b 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonAccessor.java
@@ -1,6 +1,6 @@
 package models.dataConstraintModel;
 
-import code.ast.IExpressionVisitor;
+import models.algebra.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 import models.algebra.*;
 
diff --git a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java
index 96cf029..9489f06 100644
--- a/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java
+++ b/AlgebraicDataflowArchitectureModel/src/models/dataConstraintModel/JsonTerm.java
@@ -1,6 +1,6 @@
 package models.dataConstraintModel;
 
-import code.ast.IExpressionVisitor;
+import models.algebra.IExpressionVisitor;
 import generators.JavaImplementationVisitor;
 import models.algebra.*;
 import parser.Parser;