diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/misc/ConstructorCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/misc/ConstructorCall.html
index 721308ee..bcb2e140 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/misc/ConstructorCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/misc/ConstructorCall.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.MethodCall</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.MethodCall</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.misc.ConstructorCall</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.html
index f5c3e463..68dddbe6 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.ArgumentList</li>
+<li>de.dhbwstuttgart.syntaxtree.ArgumentList</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Assign.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Assign.html
index 93e31a3e..fab87c71 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Assign.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Assign.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Assign</li>
+<li>de.dhbwstuttgart.syntaxtree.Assign</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Binary.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Binary.html
index 0ecabaf2..8551babb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Binary.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Binary.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.BinaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.BinaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.Binary</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html
index 3ae61a2b..126e6b59 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html
@@ -97,7 +97,7 @@
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -106,7 +106,7 @@
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.BinaryExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.BinaryExpr</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Block.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Block.html
index 76c323e8..90ba9954 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Block.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Block.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Block</li>
+<li>de.dhbwstuttgart.syntaxtree.Block</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
index be892a1e..6362f90c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/BoolLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.BoolLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CastExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CastExpr.html
index 29d8855a..56747c18 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CastExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CastExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,10 +112,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.CastExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.CastExpr</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
index 7d0bcafb..beab003b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/CharLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.CharLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
index d367cd8a..4eebdf21 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/DoubleLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.DoubleLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.html
index 5d7c896d..8cd85dfc 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.EmptyStmt</li>
+<li>de.dhbwstuttgart.syntaxtree.EmptyStmt</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Expr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Expr.html
index b0f21424..3ffe417b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Expr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Expr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html
index a512baf2..a3937f8e 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.ExprStmt</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
index 2c88f19d..6879c044 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/FloatLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.FloatLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ForStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ForStmt.html
index 52fa7758..7f69a46c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ForStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ForStmt.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.ForStmt</li>
+<li>de.dhbwstuttgart.syntaxtree.ForStmt</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IfStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IfStmt.html
index c6890df6..16f7327c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IfStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IfStmt.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.IfStmt</li>
+<li>de.dhbwstuttgart.syntaxtree.IfStmt</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstVar.html
index b25fafa0..02bbe8ba 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstVar.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.html
index 8e1347c9..6b12241f 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,10 +112,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.BinaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.BinaryExpr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.InstanceOf</li>
+<li>de.dhbwstuttgart.syntaxtree.InstanceOf</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
index 7d7ef3eb..f7a1caa0 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/IntLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.NumberLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.html
index f8f5b7aa..64c22cce 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.LambdaExpression</li>
+<li>de.dhbwstuttgart.syntaxtree.LambdaExpression</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html
index 8fdde516..7c351b55 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Literal.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Literal</li>
+<li>de.dhbwstuttgart.syntaxtree.Literal</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.html
index 204c7422..60aa4d69 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalOrFieldVar.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.LocalVar</li>
+<li>de.dhbwstuttgart.syntaxtree.LocalVar</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.html
index ef0eefa1..c0314f1e 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl</li>
+<li>de.dhbwstuttgart.syntaxtree.LocalVarDecl</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
index ba044487..58397ebb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/LongLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.LongLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/MethodCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/MethodCall.html
index 9d719990..a6389d09 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/MethodCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/MethodCall.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.MethodCall</li>
+<li>de.dhbwstuttgart.syntaxtree.MethodCall</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html
index 7ddcc746..02b5034c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NegativeExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NegativeExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewArray.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewArray.html
index bb210b95..c14b2478 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewArray.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewArray.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.NewArray</li>
+<li>de.dhbwstuttgart.syntaxtree.NewArray</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewClass.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewClass.html
index 04f92b42..cd0e673b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewClass.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NewClass.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.NewClass</li>
+<li>de.dhbwstuttgart.syntaxtree.NewClass</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html
index 1eb88e1d..45ff7e7d 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/NotExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.NotExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
index 23f741de..01ed49b0 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Null.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.Null</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html
index e02874de..cbe36182 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PositivExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PositivExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html
index 9c293c66..c80b04c7 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostDecExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostDecExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html
index 4d52f399..d6492ce1 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PostIncExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PostIncExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html
index 3027535e..f73c5364 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreDecExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreDecExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html
index e2caa4bd..b1491666 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/PreIncExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.UnaryExpr</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.javaInternal.PreIncExpr</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Receiver.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Receiver.html
index 96c36988..c12a1ea0 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Receiver.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Receiver.html
@@ -100,7 +100,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Receiver</li>
+<li>de.dhbwstuttgart.syntaxtree.Receiver</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Return.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Return.html
index 923af7a6..34e4dbcd 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Return.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Return.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Return</li>
+<li>de.dhbwstuttgart.syntaxtree.Return</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Statement.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Statement.html
index 75f35e8c..8fa33f01 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Statement.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/Statement.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.Statement</li>
+<li>de.dhbwstuttgart.syntaxtree.Statement</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
index 89acbb3b..646a19ff 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/StringLiteral.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Literal</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Literal.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Literal</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.statement.literal.StringLiteral</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/SuperCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/SuperCall.html
index 2d9e960d..aecb57db 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/SuperCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/SuperCall.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,13 +112,13 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.MethodCall</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.MethodCall</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ThisCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ThisCall</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ThisCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.ThisCall</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.SuperCall</li>
+<li>de.dhbwstuttgart.syntaxtree.SuperCall</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/This.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/This.html
index ef46e32a..acb74394 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/This.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/This.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.This</li>
+<li>de.dhbwstuttgart.syntaxtree.This</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ThisCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ThisCall.html
index 4b1e8d69..03a94403 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ThisCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/ThisCall.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,10 +112,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.MethodCall</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/MethodCall.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.MethodCall</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.ThisCall</li>
+<li>de.dhbwstuttgart.syntaxtree.ThisCall</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html
index 1e7b1400..10407c6b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.html
@@ -103,7 +103,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/ExprStmt.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.ExprStmt</a></li>
@@ -112,7 +112,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Expr.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Expr</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</li>
+<li>de.dhbwstuttgart.syntaxtree.UnaryExpr</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.html
index 6bf83192..c025b269 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.html
@@ -103,10 +103,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.html" title="class in de.dhbwstuttgart.syntaxtree">de.dhbwstuttgart.syntaxtree.SyntaxTreeNode</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.statement.Statement</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/statement/Statement.html" title="class in de.dhbwstuttgart.syntaxtree.statement">de.dhbwstuttgart.syntaxtree.Statement</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.statement.WhileStmt</li>
+<li>de.dhbwstuttgart.syntaxtree.WhileStmt</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ArgumentList.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ArgumentList.html
index ea63413c..d86d5499 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ArgumentList.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ArgumentList.html
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.ArgumentList" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.ArgumentList</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.ArgumentList" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.ArgumentList</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Assign.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Assign.html
index 3c928843..76cb0c8d 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Assign.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Assign.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Assign</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Assign</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Assign" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Assign</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Assign" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Assign</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.Assign</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.Assign</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/BinaryExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/BinaryExpr.html
index 3a9bad17..43ebe4de 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/BinaryExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/BinaryExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.BinaryExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.BinaryExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.BinaryExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.BinaryExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.BinaryExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.BinaryExpr</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Block.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Block.html
index cbf35459..7c8b6017 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Block.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Block.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Block</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Block</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Block" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Block</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Block" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Block</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/CastExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/CastExpr.html
index 6c542e64..095caccd 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/CastExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/CastExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.CastExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.CastExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.CastExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.CastExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.CastExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.CastExpr</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.CastExpr</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.CastExpr</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/EmptyStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/EmptyStmt.html
index c73a7fce..88daf776 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/EmptyStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/EmptyStmt.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.EmptyStmt</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.EmptyStmt</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.EmptyStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.EmptyStmt</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.EmptyStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.EmptyStmt</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.EmptyStmt</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.EmptyStmt</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ForStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ForStmt.html
index 592a7342..20959419 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ForStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ForStmt.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.ForStmt</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.ForStmt</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.ForStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.ForStmt</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.ForStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.ForStmt</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.ForStmt</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.ForStmt</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/IfStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/IfStmt.html
index 0272b0aa..bd514f8c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/IfStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/IfStmt.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.IfStmt</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.IfStmt</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.IfStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.IfStmt</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.IfStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.IfStmt</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.IfStmt</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.IfStmt</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/InstanceOf.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/InstanceOf.html
index a2b96fb2..eab11015 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/InstanceOf.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/InstanceOf.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.InstanceOf</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.InstanceOf</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.InstanceOf" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.InstanceOf</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.InstanceOf" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.InstanceOf</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.InstanceOf</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.InstanceOf</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LambdaExpression.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LambdaExpression.html
index 503da362..bc770912 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LambdaExpression.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LambdaExpression.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.LambdaExpression</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.LambdaExpression</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.LambdaExpression" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.LambdaExpression</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.LambdaExpression" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.LambdaExpression</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.LambdaExpression</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.LambdaExpression</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
index 33eabfbd..018695c2 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Literal.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Literal</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Literal</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Literal" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Literal</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalOrFieldVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalOrFieldVar.html
index 74288c3b..69b03014 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalOrFieldVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalOrFieldVar.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.LocalVar</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.LocalVar</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.LocalVar" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.LocalOrFieldVar</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.LocalVar" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.LocalOrFieldVar</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.LocalVar</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.LocalVar</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalVarDecl.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalVarDecl.html
index f4eca5a4..7f8ef632 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalVarDecl.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/LocalVarDecl.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.LocalVarDecl</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.LocalVarDecl" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.LocalVarDecl</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/MethodCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/MethodCall.html
index efdb3bd3..90c5ca20 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/MethodCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/MethodCall.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.MethodCall</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.MethodCall</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.MethodCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.MethodCall</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.MethodCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.MethodCall</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewArray.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewArray.html
index 10d3b306..4a41719e 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewArray.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewArray.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NewArray</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.NewArray</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NewArray" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NewArray</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.NewArray" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.NewArray</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NewArray</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.NewArray</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewClass.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewClass.html
index 718da133..bfa624fa 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewClass.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/NewClass.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.NewClass</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.NewClass</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.NewClass" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.NewClass</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.NewClass" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.NewClass</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.NewClass</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.NewClass</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Receiver.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Receiver.html
index 8d231036..f4c6eeaa 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Receiver.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Receiver.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Receiver</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Receiver</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Receiver" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Receiver</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Receiver" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Receiver</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Return.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Return.html
index 75d3295c..a3fc7adb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Return.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Return.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Return</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Return</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Return" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Return</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Return" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Return</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Statement.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Statement.html
index 16ad2072..b5af3cfb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Statement.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/Statement.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.Statement</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Statement</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.Statement" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.Statement</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Statement" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Statement</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/SuperCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/SuperCall.html
index 822d009f..3b63bf6c 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/SuperCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/SuperCall.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.SuperCall</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.SuperCall</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.SuperCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.SuperCall</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.SuperCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.SuperCall</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.SuperCall</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.SuperCall</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/This.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/This.html
index 4c81d938..c3cbe724 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/This.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/This.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.This</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.This</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.This" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.This</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.This" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.This</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.This</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.This</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ThisCall.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ThisCall.html
index db203559..619cdbe7 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ThisCall.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/ThisCall.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.ThisCall</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.ThisCall</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.ThisCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.ThisCall</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.ThisCall" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.ThisCall</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/UnaryExpr.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/UnaryExpr.html
index 4502f6db..8a13bf72 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/UnaryExpr.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/UnaryExpr.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.UnaryExpr</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.UnaryExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.UnaryExpr</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.UnaryExpr" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.UnaryExpr</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/WhileStmt.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/WhileStmt.html
index fc1f01bf..14b05edb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/WhileStmt.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/statement/class-use/WhileStmt.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.statement.WhileStmt</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.WhileStmt</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,9 +70,9 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.statement.WhileStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.statement.WhileStmt</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.WhileStmt" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.WhileStmt</h2>
 </div>
-<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.statement.WhileStmt</div>
+<div class="classUseContainer">No usage of de.dhbwstuttgart.syntaxtree.WhileStmt</div>
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <div class="bottomNav"><a name="navbar.bottom">
 <!--   -->
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/BoundedGenericTypeVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/BoundedGenericTypeVar.html
index b378dc3b..04345969 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/BoundedGenericTypeVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/BoundedGenericTypeVar.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/ObjectType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.ObjectType</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.GenericRefType</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.GenericRefType</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.syntaxtree.GenericTypeVar</li>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.html
index 7bb2489a..3339e09d 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.html
@@ -106,10 +106,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/Type.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.Type</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/WildcardType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.WildcardType</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/WildcardType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.WildcardTypeInterface</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType</li>
+<li>de.dhbwstuttgart.syntaxtree.ExtendsWildcardType</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html
index f0c34d51..91df4897 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/GenericTypeVar.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/ObjectType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.ObjectType</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.GenericRefType</li>
+<li>de.dhbwstuttgart.syntaxtree.GenericRefType</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.html
index 94408c10..73862d3f 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.html
@@ -106,10 +106,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/Type.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.Type</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/WildcardType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.WildcardType</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/WildcardType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.WildcardTypeInterface</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.SuperWildcardType</li>
+<li>de.dhbwstuttgart.syntaxtree.SuperWildcardType</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.html
index 0e7ba353..b48185be 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.html
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/ObjectType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.ObjectType</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.TypePlaceholder</li>
+<li>de.dhbwstuttgart.syntaxtree.TypePlaceholder</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
index cc512b6c..5ce9e3b7 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/Void.html
@@ -109,10 +109,10 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/ObjectType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.ObjectType</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/RefType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric</a></li>
+<li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/RefType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.Void</li>
+<li>de.dhbwstuttgart.syntaxtree.Void</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/WildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/WildcardType.html
index 2313bad3..3cee5f6f 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/WildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/WildcardType.html
@@ -106,7 +106,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../../de/dhbwstuttgart/syntaxtree/type/Type.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.Type</a></li>
 <li>
 <ul class="inheritance">
-<li>de.dhbwstuttgart.syntaxtree.type.WildcardType</li>
+<li>de.dhbwstuttgart.syntaxtree.WildcardTypeInterface</li>
 </ul>
 </li>
 </ul>
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/ExtendsWildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/ExtendsWildcardType.html
index d21a6ce9..b22a22ef 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/ExtendsWildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/ExtendsWildcardType.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.ExtendsWildcardType</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.ExtendsWildcardType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.ExtendsWildcardType</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/GenericTypeVar.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/GenericTypeVar.html
index 7f094d03..8c6019a8 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/GenericTypeVar.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/GenericTypeVar.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.GenericRefType</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.GenericRefType</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.GenericRefType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.GenericTypeVar</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.GenericRefType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.GenericTypeVar</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
index 48825408..e03f41e2 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/RefType.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.RefType</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.RefType</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/SuperWildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/SuperWildcardType.html
index 854c139b..7fbd8efb 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/SuperWildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/SuperWildcardType.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.SuperWildcardType</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.SuperWildcardType</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.SuperWildcardType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.SuperWildcardType</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.SuperWildcardType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.SuperWildcardType</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/TypePlaceholder.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/TypePlaceholder.html
index 4a4583f2..afa0d529 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/TypePlaceholder.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/TypePlaceholder.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.TypePlaceholder</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.TypePlaceholder</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.TypePlaceholder" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.TypePlaceholder</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.TypePlaceholder" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.TypePlaceholder</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/Void.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/Void.html
index 5795a78e..3c1638ca 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/Void.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/Void.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.Void</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.Void</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.Void" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.Void</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.Void" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.Void</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/WildcardType.html b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/WildcardType.html
index e3574ae7..b4901c23 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/WildcardType.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/syntaxtree/type/class-use/WildcardType.html
@@ -3,7 +3,7 @@
 <html lang="de">
 <head>
 <!-- Generated by javadoc (1.8.0_05) on Tue May 12 19:56:24 CEST 2015 -->
-<title>Uses of Class de.dhbwstuttgart.syntaxtree.type.WildcardType</title>
+<title>Uses of Class de.dhbwstuttgart.syntaxtree.WildcardTypeInterface</title>
 <meta name="date" content="2015-05-12">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
@@ -70,7 +70,7 @@
 </a></div>
 <!-- ========= END OF TOP NAVBAR ========= -->
 <div class="header">
-<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.type.WildcardType" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.type.WildcardType</h2>
+<h2 title="Uses of Class de.dhbwstuttgart.syntaxtree.WildcardTypeInterface" class="title">Uses of Class<br>de.dhbwstuttgart.syntaxtree.WildcardTypeInterface</h2>
 </div>
 <div class="classUseContainer">
 <ul class="blockList">
diff --git a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
index d1742a81..d547734b 100644
--- a/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
+++ b/doc/LambdaJavadoc/de/dhbwstuttgart/typeinference/FunN.html
@@ -9,7 +9,7 @@
 <script type="text/javascript" src="../../../script.js"></script>
 </head>
 <body>
-<script type="text/javascript"><!--
+<script type="text/javascript">//<!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
             parent.document.title="FunN";
@@ -109,7 +109,7 @@ var activeTableTab = "activeTableTab";
 <li><a href="../../../de/dhbwstuttgart/syntaxtree/type/ObjectType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.ObjectType</a></li>
 <li>
 <ul class="inheritance">
-<li><a href="../../../de/dhbwstuttgart/syntaxtree/type/RefType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric</a></li>
+<li><a href="../../../de/dhbwstuttgart/syntaxtree/type/RefType.html" title="class in de.dhbwstuttgart.syntaxtree.type">de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric</a></li>
 <li>
 <ul class="inheritance">
 <li>de.dhbwstuttgart.typeinference.FunN</li>
diff --git a/src/main/antlr4/astRefactor/astRefactor.g4 b/src/main/antlr4/astRefactor/astRefactor.g4
new file mode 100644
index 00000000..db8b6e2b
--- /dev/null
+++ b/src/main/antlr4/astRefactor/astRefactor.g4
@@ -0,0 +1,152 @@
+grammar astRefactor;
+
+/*
+ * Parser Rules
+ */
+
+class               : ACCESSMODIFIER WHITESPACE CLASS WHITESPACE NAME '(' MODIFIER WHITESPACE WORD ')''{'NEWLINE classbody'}';
+classbody           : ( method NEWLINE | variable NEWLINE )+;
+
+variable            : ACCESSMODIFIER WHITESPACE ( MODIFIER WHITESPACE )? NAME WHITESPACE '=' WHITESPACE ( WORD | NUMBER) ';'
+                    | ACCESSMODIFIER WHITESPACE ( MODIFIER WHITESPACE )? NAME ';';
+
+method              : ACCESSMODIFIER WHITESPACE ( MODIFIER WHITESPACE )? NAME '(' MODIFIER WHITESPACE WORD ')';
+
+
+syntaxtreenode: typablestatement | reftypeortphorwildcardorgeneric | methodinterface | fieldinterface | formalparameter | parameterlist | generictypevar | sourcefile | genericdecllist | argumentlist | classorinterface;
+
+classorinterface: class;
+
+argumentlist: ARGUMENTLIST;
+
+genericdecllist: GENERICDECLLIST;
+
+sourcefile: SOURCEFILE;
+
+generictypevar: GENERICTYPEVAR;
+
+parameterlist: PARAMLIST;
+
+formalparameter: FORMALPARAMETER;
+
+fieldinterface: FIELDDECLARATION | FIELD;
+
+methodinterface: method | constructor;
+
+constructor: CONSTRUCTOR;
+
+reftypeortphorwildcardorgeneric: genericreftype | typeplaceholder | wildcardtypeinterface | refinterface;
+
+refinterface: reftype | void;
+
+void: VOID;
+
+reftype: REFTYPE;
+
+wildcardtypeinterface: superwildcardtype | wildcardtype | extendswildcardType;
+
+extendswildcardType: EXTENDSWILDARDARDARDTYPE;
+
+wildcardtype: WILDCARDTYPE;
+
+superwildcardtype: SUPERWILDCARDTYPE;
+
+typeplaceholder: TYPEPLACEHOLDER;
+
+genericreftype: GENERICREFTYPE;
+
+typablestatement: expression | assignleft;
+
+expression: statement | receiver | binaryexprinterface | THIS | SUPER | FIELDVAR | NEWARRAY | LITERAL | CASTEXPR | LAMBDAEXPRESSION;
+
+binaryexprinterface: binaryexpr | instanceof;
+
+instanceof: INSTANCEOF;
+
+binaryexpr: BINARYEXPR;
+
+receiver:  staticclassname | expressionreceiver;
+
+expressionreceiver: EXPRESSIONRECEIVER;
+
+staticclassname: STATICCLASSNAME;
+
+statement: whileinterface | methodcallinterface | returninterface | javainternalexpressioninterface | FORSMT | BLOCK | EMPTYSTMT | LOCALVARDECL | ASSIGN | IFSTMT | LOCALVAR;
+
+javainternalexpressioninterface: UNARYEXPR;
+
+returninterface: RETURN | RETRUNVOID;
+
+methodcallinterface: METHODCALL | THISCALL | SUPERCALL | NEWCLASS;
+
+whileinterface: WHILESTMT | DOSTMT;
+
+assignleft: assigntofield | ASSIGNLEFTSIDE;
+
+assigntofield: ASSIGNTOFIELD;
+
+
+/*
+ * Lexer Rules
+ */
+
+fragment LOWERCASE  : [a-z] ;
+fragment UPPERCASE  : [A-Z] ;
+NUMBER              : [0-9]+;
+CLASS               : 'class';
+ACCESSMODIFIER      : ('public' | 'private');
+MODIFIER            : ('int' | 'String' | 'char');
+WHITESPACE          : ' ';
+NEWLINE             : ('\r'? '\n' | '\r')+ ;
+ARGUMENTLIST        : 'argumentlist';
+GENERICDECLLIST     : 'genericdecllist';
+SOURCEFILE          : 'sourcefile';
+ASSIGNTOFIELD       : 'assigntofield';
+ASSIGNLEFTSIDE      : 'assignleftside';
+WHILESTMT           : 'whilestmt';
+DOSTMT              : 'dosstmt';
+GENERICTYPEVAR      : 'generictypevar';
+PARAMLIST           : 'paramlist';
+FORMALPARAMETER     : 'formalparameter';
+FIELDDECLARATION    : 'fielddeclaration';
+FIELD               : 'field';
+CONSTRUCTOR         : 'constructor';
+VOID                : 'void';
+REFTYPE             : 'reftype';
+EXTENDSWILDARDARDARDTYPE : 'extendwildcardType';
+WILDCARDTYPE        : 'wildcardtype';
+SUPERWILDCARDTYPE   : 'superwildcardtype';
+TYPEPLACEHOLDER     : 'typeplaceholder';
+GENERICREFTYPE      : 'genericreftype';
+THIS                : 'this';
+SUPER               : 'super';
+FIELDVAR            : 'fieldvar';
+NEWARRAY            : 'newarray';
+LITERAL             : 'literal';
+CASTEXPR            : 'castexpr';
+LAMBDAEXPRESSION    : 'lambdaexpression';
+INSTANCEOF          : 'instanceof';
+BINARYEXPR          : 'binaryexpr';
+EXPRESSIONRECEIVER  : 'expressionreceiver';
+STATICCLASSNAME     : 'staticclassname';
+FORSMT              : 'forstmt';
+BLOCK               : 'block';
+EMPTYSTMT           : 'emptystmt';
+LOCALVARDECL        : 'localvardecl';
+ASSIGN              : 'assign';
+IFSTMT              : 'ifstmt';
+LOCALVAR            : 'localvar';
+RETURN              : 'return';
+RETRUNVOID          : 'returnvoid';
+METHODCALL          : 'methodcall';
+THISCALL            : 'thiscall';
+SUPERCALL           : 'supercall';
+NEWCLASS            : 'newclass';
+UNARYEXPR           : 'unaryexpr';
+NAME                : (LOWERCASE)( LOWERCASE | UPPERCASE )+;
+WORD                : (LOWERCASE | UPPERCASE | '_')+ ;
+
+
+
+
+
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/AStatement.java b/src/main/java/de/dhbwstuttgart/bytecode/AStatement.java
index 5c28bf43..ee15c9aa 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/AStatement.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/AStatement.java
@@ -4,8 +4,8 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.BinaryExpr;
+import de.dhbwstuttgart.syntaxtree.Expression;
 
 public abstract class AStatement implements IStatement {
 	protected Expression expr;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/ArgumentExpr.java b/src/main/java/de/dhbwstuttgart/bytecode/ArgumentExpr.java
index b396e8d1..b00fd826 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/ArgumentExpr.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/ArgumentExpr.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.bytecode;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.Expression;
 
 public class ArgumentExpr extends AStatement {
 	
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/ArgumentVisitor.java b/src/main/java/de/dhbwstuttgart/bytecode/ArgumentVisitor.java
index 268e53b5..9625ec81 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/ArgumentVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/ArgumentVisitor.java
@@ -4,34 +4,34 @@ import java.util.List;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
+import de.dhbwstuttgart.syntaxtree.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.Assign;
+import de.dhbwstuttgart.syntaxtree.AssignToField;
+import de.dhbwstuttgart.syntaxtree.BinaryExpr;
+import de.dhbwstuttgart.syntaxtree.Block;
+import de.dhbwstuttgart.syntaxtree.CastExpr;
+import de.dhbwstuttgart.syntaxtree.DoStmt;
+import de.dhbwstuttgart.syntaxtree.EmptyStmt;
+import de.dhbwstuttgart.syntaxtree.ExpressionReceiver;
+import de.dhbwstuttgart.syntaxtree.FieldVar;
+import de.dhbwstuttgart.syntaxtree.ForStmt;
+import de.dhbwstuttgart.syntaxtree.IfStmt;
+import de.dhbwstuttgart.syntaxtree.InstanceOf;
+import de.dhbwstuttgart.syntaxtree.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.Literal;
+import de.dhbwstuttgart.syntaxtree.LocalVar;
+import de.dhbwstuttgart.syntaxtree.LocalVarDecl;
+import de.dhbwstuttgart.syntaxtree.MethodCall;
+import de.dhbwstuttgart.syntaxtree.NewArray;
+import de.dhbwstuttgart.syntaxtree.NewClass;
+import de.dhbwstuttgart.syntaxtree.Return;
+import de.dhbwstuttgart.syntaxtree.ReturnVoid;
+import de.dhbwstuttgart.syntaxtree.StaticClassName;
+import de.dhbwstuttgart.syntaxtree.Super;
+import de.dhbwstuttgart.syntaxtree.SuperCall;
+import de.dhbwstuttgart.syntaxtree.This;
+import de.dhbwstuttgart.syntaxtree.UnaryExpr;
+import de.dhbwstuttgart.syntaxtree.WhileStmt;
 
 public class ArgumentVisitor implements StatementVisitor {
 	private List<Boolean> argListMethCall;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/AssignStmt.java b/src/main/java/de/dhbwstuttgart/bytecode/AssignStmt.java
index 366c450a..349aeb6f 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/AssignStmt.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/AssignStmt.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.bytecode;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.Expression;
 
 public class AssignStmt extends AStatement {
 	
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java
index 04f408af..67f2c0d2 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGen.java
@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Optional;
 
 import de.dhbwstuttgart.parser.scope.JavaClassName;
+import de.dhbwstuttgart.syntaxtree.*;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.FieldVisitor;
 import org.objectweb.asm.MethodVisitor;
@@ -30,50 +31,7 @@ import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.Field;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 public class BytecodeGen implements ASTVisitor {
@@ -232,13 +190,13 @@ public class BytecodeGen implements ASTVisitor {
 
 		field.getParameterList().accept(this);
 
-		String id = MethodUtility.createID(resolver, field);
+		String id = MethodUtility.createID(resolver, field.getMethod());
 
 		if (methodNameAndParamsT.contains(id)) {
 			return;
 		}
 		methodNameAndParamsT.add(id);
-		System.out.println("Constructor: " + field.name + " , paramsType: " + id);
+		System.out.println("Constructor: " + field.name() + " , paramsType: " + id);
 
 		String desc = null;
 		boolean hasGen = false;
@@ -268,14 +226,14 @@ public class BytecodeGen implements ASTVisitor {
 		MethodVisitor mv = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", desc, sig, null);
 		mv.visitCode();
 
-		Block block = fieldInitializations.get().block;
+		Block block = fieldInitializations.get().block();
 
 		constructorPos += 1;
 
-		BytecodeGenMethod gen = new BytecodeGenMethod(className, superClass, resultSet, field, mv, paramsAndLocals, cw,
+		BytecodeGenMethod gen = new BytecodeGenMethod(className, superClass, resultSet, field.getMethod(), mv, paramsAndLocals, cw,
 				genericsAndBoundsMethod, genericsAndBounds, isInterface, classFiles, sf, path, block, constructorPos, classLoader);
 		if (!field.getParameterList().iterator().hasNext()
-				&& !(field.block.statements.get(field.block.statements.size() - 1) instanceof ReturnVoid)) {
+				&& !(field.block().statements().get(field.block().statements().size() - 1) instanceof ReturnVoid)) {
 			mv.visitInsn(Opcodes.RETURN);
 		}
 		mv.visitMaxs(0, 0);
@@ -295,7 +253,7 @@ public class BytecodeGen implements ASTVisitor {
 			return;
 		}
 		methodNameAndParamsT.add(id);
-		System.out.println("Method: " + method.name + " , paramsType: " + id);
+		System.out.println("Method: " + method.name() + " , paramsType: " + id);
 		// stores generics and their bounds of method
 		HashMap<String, String> genericsAndBoundsMethod = new HashMap<>();
 		
@@ -304,7 +262,7 @@ public class BytecodeGen implements ASTVisitor {
 		String methDesc = null;
 
 		// Method getModifiers() ?
-		int acc = isInterface ? Opcodes.ACC_ABSTRACT : method.modifier;
+		int acc = isInterface ? Opcodes.ACC_ABSTRACT : method.modifier();
 		System.out.println(acc);
 
 		/* Prüfe, ob die Rückgabe-Type der Methode eine Type-Variable ist */
@@ -414,7 +372,7 @@ public class BytecodeGen implements ASTVisitor {
 	public void visit(FieldVar fieldVar) {
 		System.out.println("In FieldVar ---");
 //		cw.newField(fieldVar.receiver.toString(), fieldVar.fieldVarName.toString(), fieldVar.getType().toString());
-		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, fieldVar.fieldVarName, "L" + fieldVar.getType() + ";",
+		FieldVisitor fv = cw.visitField(Opcodes.ACC_PRIVATE, fieldVar.fieldVarName(), "L" + fieldVar.getType() + ";",
 				null, null);
 		fv.visitEnd();
 	}
@@ -446,7 +404,7 @@ public class BytecodeGen implements ASTVisitor {
 		fieldNameAndParamsT.add(nameAndDesc);
 		fieldNameSignature.add(nameAndSig);
 
-		cw.visitField(field.modifier, field.getName(), des, sig, null);
+		cw.visitField(field.modifier(), field.getName(), des, sig, null);
 	}
 
 	@Override
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
index 5cbcfca9..8b25f8f1 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/BytecodeGenMethod.java
@@ -6,8 +6,6 @@ import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
 import java.lang.reflect.Parameter;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -21,9 +19,9 @@ import de.dhbwstuttgart.bytecode.utilities.*;
 import de.dhbwstuttgart.environment.DirectoryClassLoader;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr.Operator;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr.Operation;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.BinaryExpr.Operator;
+import de.dhbwstuttgart.syntaxtree.UnaryExpr.Operation;
 
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Handle;
@@ -36,12 +34,8 @@ import de.dhbwstuttgart.bytecode.Exception.NotInCurrentPackageException;
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import javassist.NotFoundException;
 
@@ -109,7 +103,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		this.classLoader = classLoader;
 		if(block != null)
 			this.blockFieldInit = block;
-		this.m.block.accept(this);
+		Method.block.accept((ASTVisitor) this);
 	}
 	
 	public BytecodeGenMethod(JavaClassName className, String superClass,ResultSet resultSet, Method m, MethodVisitor mv,
@@ -133,7 +127,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		this.lamCounter = -1;
 		this.classLoader = classLoader;
 		if (!isInterface)
-			this.m.block.accept(this);
+			Method.block.accept((ASTVisitor) this);
 	}
 
 	public BytecodeGenMethod(JavaClassName className, ClassWriter cw, LambdaExpression lambdaExpression, ArrayList<String> usedVars, ResultSet resultSet, MethodVisitor mv,
@@ -153,7 +147,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		this.genericsAndBounds = genericsAndBounds;
 		this.classLoader = classLoader;
 		
-		Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
+		Iterator<FormalParameter> itr = lambdaExpression.params().iterator();
 		int i = indexOfFirstParamLam;
 		
 		for(String var : usedVars) {
@@ -166,7 +160,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 			this.paramsAndLocals.put(fp.getName(), i);
 			i++;
 		}
-		lambdaExpression.methodBody.accept(this);
+		lambdaExpression.methodBody().accept(this);
 	}
 	
 	public Resolver getResolver() {
@@ -194,15 +188,15 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(SuperCall superCall) {
-		superCall.receiver.accept(this);
-		superCall.arglist.accept(this);
-		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, this.superClass, superCall.name, "()V",
+		superCall.getReceiver().accept((ASTVisitor) this);
+		superCall.arglist().accept(this);
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, this.superClass, superCall.name(), "()V",
 				isInterface);
 		
 		if(blockFieldInit!=null && !isBlockFieldInitVisited) {
 			isBlockFieldInitVisited =true;
 			//blockFieldInit.accept(this);
-			for(Statement stmt : blockFieldInit.statements) {
+			for(Statement stmt : blockFieldInit.statements()) {
 				if(stmt instanceof SuperCall)
 					continue;
 				
@@ -216,8 +210,8 @@ public class BytecodeGenMethod implements StatementVisitor {
 	public void visit(LocalVar localVar) {
 		// wenn String + String zuerst wird ein StringBuilder initialisiert dann
 		// wird die lokale Var geladen. Sonst wird zuerst die lokale Var geladen.
-		System.out.println(localVar.name);
-		mv.visitVarInsn(Opcodes.ALOAD, paramsAndLocals.get(localVar.name));
+		System.out.println(localVar.name());
+		mv.visitVarInsn(Opcodes.ALOAD, paramsAndLocals.get(localVar.name()));
 		
 		if (isBinaryExp) {
 			doUnboxing(resolver.getResolvedType(localVar.getType()));
@@ -232,9 +226,9 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(Assign assign) {
-		statement = new AssignStmt(assign.rightSide);
+		statement = new AssignStmt(assign.rightSide());
 		// if the right side is a lambda => the left side must be a functional interface
-		if (assign.rightSide instanceof LambdaExpression) {
+		if (assign.rightSide() instanceof LambdaExpression) {
 			isRightSideALambda = true;
 		} else {
 			isRightSideALambda = false;
@@ -242,29 +236,29 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 		isBinaryExp = statement.isExprBinary();
 
-		if (assign.lefSide instanceof AssignToField) {
+		if (assign.lefSide() instanceof AssignToField) {
 			// load_0, ldc or .. then putfield
-			this.rightSideTemp = assign.rightSide;
+			this.rightSideTemp = assign.rightSide();
 		} else {
-			assign.rightSide.accept(this);
+			assign.rightSide().accept(this);
 		}
 		
-		statement = new AssignStmt(assign.rightSide);
+		statement = new AssignStmt(assign.rightSide());
 		isBinaryExp = statement.isExprBinary();
 		
 		if (isBinaryExp) {
-			BinaryExpr binary = (BinaryExpr) assign.rightSide;
+			BinaryExpr binary = (BinaryExpr) assign.rightSide();
 			String binaryType = resolver.getResolvedType(binary.getType());
 			doBoxing(binaryType);
 			isBinaryExp = false;
 		}
 
-		System.out.println("ASSIGN TYPE R: " + resolver.getResolvedType(assign.rightSide.getType()));
-		String typeOfRightSide = resolver.getResolvedType(assign.rightSide.getType());
+		System.out.println("ASSIGN TYPE R: " + resolver.getResolvedType(assign.rightSide().getType()));
+		String typeOfRightSide = resolver.getResolvedType(assign.rightSide().getType());
 		if(typeOfRightSide.contains(CONSTANTS.ANGLEBRACKET)) {
 			mv.visitTypeInsn(Opcodes.CHECKCAST, typeOfRightSide.substring(0, typeOfRightSide.indexOf('<')));
 		}
-		assign.lefSide.accept(this);
+		assign.lefSide().accept((ASTVisitor) this);
 
 		statement = null;
 	}
@@ -272,8 +266,8 @@ public class BytecodeGenMethod implements StatementVisitor {
 	@Override
 	public void visit(BinaryExpr binary) {
 		isParentBinary = true;
-		String lexpType = resolver.getResolvedType(binary.lexpr.getType());
-		String rexpType = resolver.getResolvedType(binary.rexpr.getType());
+		String lexpType = resolver.getResolvedType(binary.lexpr().getType());
+		String rexpType = resolver.getResolvedType(binary.rexpr().getType());
 
 		String largerType = getLargerType(lexpType, rexpType);
 		String typeOfBinary = resolver.getResolvedType(binary.getType());
@@ -290,10 +284,10 @@ public class BytecodeGenMethod implements StatementVisitor {
 		if (statement instanceof LoopStmt)
 			mv.visitLabel(endLabel);
 		
-		if(binary.lexpr instanceof UnaryExpr)
+		if(binary.lexpr() instanceof UnaryExpr)
 			needDUP = true;
 		
-		binary.lexpr.accept(this);
+		binary.lexpr().accept(this);
 		
 		if(lexpType.equals(Type.getInternalName(String.class))) {
 			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, Type.getInternalName(StringBuilder.class), "append",
@@ -303,10 +297,10 @@ public class BytecodeGenMethod implements StatementVisitor {
 		if (!lexpType.equals(rexpType) && !lexpType.equals(largerType))
 			doCast(lexpType, largerType);
 		
-		if(binary.rexpr instanceof UnaryExpr)
+		if(binary.rexpr() instanceof UnaryExpr)
 			needDUP = true;
 		
-		binary.rexpr.accept(this);
+		binary.rexpr().accept(this);
 		if(rexpType.equals(Type.getInternalName(String.class))) {
 			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, Type.getInternalName(StringBuilder.class), "append",
 					"(Ljava/lang/String;)Ljava/lang/StringBuilder;", false);
@@ -316,7 +310,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		if (!lexpType.equals(rexpType) && !rexpType.equals(largerType))
 			doCast(rexpType, largerType);
 
-		Operator op = binary.operation;
+		Operator op = binary.operation();
 		
 		switch (op) {
 		case ADD:
@@ -595,7 +589,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		//ToDo Etienne: Double Check
 		RefTypeOrTPHOrWildcardOrGeneric returnType = resolver.resolve(lambdaExpression.getReturnType());
 		List<RefTypeOrTPHOrWildcardOrGeneric> argumentTypes = lambdaExpression
-				.params
+				.params()
 				.getFormalparalist()
 				.stream()
 				.map(FormalParameter::getType)
@@ -690,7 +684,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	private String createDescriptorWithTypeErasure(LambdaExpression lambdaExpression) {
 		String typeErasure = "(";
-		Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
+		Iterator<FormalParameter> itr = lambdaExpression.params().iterator();
 		while (itr.hasNext()) {
 			itr.next();
 			typeErasure += "L" + Type.getInternalName(Object.class) + ";";
@@ -715,7 +709,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(FieldVar fieldVar) {
-		fieldName = fieldVar.fieldVarName;
+		fieldName = fieldVar.fieldVarName();
 		fieldDesc  = "L";
 		if(resultSet.resolveType(fieldVar.getType()).resolvedType instanceof TypePlaceholder) {
 			fieldDesc += Type.getInternalName(Object.class);
@@ -724,10 +718,10 @@ public class BytecodeGenMethod implements StatementVisitor {
 		}
 		fieldDesc +=";";
 
-		fieldVar.receiver.accept(this);
+		fieldVar.receiver().accept(this);
 		// test (if)
-		if (!fieldVar.receiver.getClass().equals(StaticClassName.class)) {
-			mv.visitFieldInsn(Opcodes.GETFIELD, resolver.getResolvedType(fieldVar.receiver.getType()), fieldName, fieldDesc);
+		if (!fieldVar.receiver().getClass().equals(StaticClassName.class)) {
+			mv.visitFieldInsn(Opcodes.GETFIELD, resolver.getResolvedType(fieldVar.receiver().getType()), fieldName, fieldDesc);
 		}
 		
 		if (isBinaryExp) {
@@ -746,11 +740,11 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(IfStmt ifStmt) {
-		statement = new IfStatement(ifStmt.expr, ifStmt.then_block, ifStmt.else_block);
+		statement = new IfStatement(ifStmt.expr(), ifStmt.then_block(), ifStmt.else_block());
 		isBinaryExp = statement.isExprBinary();
-		ifStmt.expr.accept(this);
-		if(!(ifStmt.expr instanceof BinaryExpr)) {
-			doUnboxing(resolver.getResolvedType(ifStmt.expr.getType()));
+		ifStmt.expr().accept(this);
+		if(!(ifStmt.expr() instanceof BinaryExpr)) {
+			doUnboxing(resolver.getResolvedType(ifStmt.expr().getType()));
 			Label branchLabel = new Label();
 			Label endLabel = new Label();
 			mv.visitJumpInsn(Opcodes.IFEQ, branchLabel);
@@ -767,8 +761,8 @@ public class BytecodeGenMethod implements StatementVisitor {
 	@Override
 	public void visit(MethodCall methodCall) {
 		boolean parentBinary = isParentBinary;
-		System.out.println("In MethodCall = " + methodCall.name);
-		String receiverName = resolver.getResolvedType(methodCall.receiver.getType());
+		System.out.println("In MethodCall = " + methodCall.name());
+		String receiverName = resolver.getResolvedType(methodCall.receiver().getType());
 		System.out.println("Methods of " + receiverName + " ");
 		java.lang.reflect.Method methodRefl = null;
 		String clazz = receiverName.replace("/", ".");
@@ -782,13 +776,13 @@ public class BytecodeGenMethod implements StatementVisitor {
 		ClassLoader cLoader2;
 
 		String methCallType = resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor());
-		String[] typesOfParams = getTypes(methodCall.arglist.getArguments());
+		String[] typesOfParams = getTypes(methodCall.arglist().getArguments());
 		try {
 			clazz = getRawClassName(receiverName, clazz);
 
 			java.lang.reflect.Method[] methods = cLoader.loadClass(clazz).getMethods();
 			System.out.println("Methods of " + receiverName + " ");
-			methodRefl = getMethod(methodCall.name, methodCall.arglist.getArguments().size(),methCallType, typesOfParams, methods);
+			methodRefl = getMethod(methodCall.name(), methodCall.arglist().getArguments().size(),methCallType, typesOfParams, methods);
 
 			} catch (Exception e) {
 					String superClass = "";
@@ -802,7 +796,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 								java.lang.reflect.Method[] methods = cLoader.loadClass(superClazz).getMethods();
 								System.out.println("Methods of " + superClass + " ");
 
-								methodRefl = getMethod(methodCall.name, methodCall.arglist.getArguments().size(), methCallType, typesOfParams, methods);
+								methodRefl = getMethod(methodCall.name(), methodCall.arglist().getArguments().size(), methCallType, typesOfParams, methods);
 
 								break;
 							} catch (Exception e3) {
@@ -831,7 +825,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 						//ToDo Etienne: Double Check
 						RefTypeOrTPHOrWildcardOrGeneric returnType = resolver.resolve(methodCall.getType());
 						List<RefTypeOrTPHOrWildcardOrGeneric> argumentTypes = methodCall
-								.arglist
+								.arglist()
 								.getArguments()
 								.stream()
 								.map(TypableStatement::getType)
@@ -850,7 +844,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 							for(int i = 0; i<methods.length; i++) {
 								System.out.println(methods[i]);
 							}
-							methodRefl = getMethod(methodCall.name,methodCall.arglist.getArguments().size(),methCallType, typesOfParams,methods);
+							methodRefl = getMethod(methodCall.name(),methodCall.arglist().getArguments().size(),methCallType, typesOfParams,methods);
 						}
 						catch (Exception e2) {
 							e2.printStackTrace();
@@ -860,28 +854,28 @@ public class BytecodeGenMethod implements StatementVisitor {
 				
 			}
 		
-		methodCall.receiver.accept(this);
+		methodCall.receiver().accept(this);
 		
 		System.out.println("Methodcall type : " + resultSet.resolveType(methodCall.getType()).resolvedType.acceptTV(new TypeToDescriptor()));
 		List<Boolean> argListMethCall = new LinkedList<>();
 		String receiverRefl="";
 		if(methodRefl == null && receiverName.equals(className.getClassName())) {
-			MethodFromMethodCall method = new MethodFromMethodCall(methodCall.arglist, methodCall.getType(),
+			MethodFromMethodCall method = new MethodFromMethodCall(methodCall.arglist(), methodCall.getType(),
 					receiverName, genericsAndBoundsMethod, genericsAndBounds);
 			mDesc = method.accept(new DescriptorToString(resultSet));
-			methodCall.arglist.accept(this);
+			methodCall.arglist().accept(this);
 		} else if(methodRefl != null) {
-			System.out.println(methodCall.name + " -> Refl != null");
+			System.out.println(methodCall.name() + " -> Refl != null");
 			receiverRefl = methodRefl.getAnnotatedReceiverType().getType().toString();
 			getBoolListOfType(methodRefl, argListMethCall);
 			System.out.println("Receiver = " + methodRefl.getAnnotatedReceiverType().getType().toString());
 			mDesc = getMethodDesc(methodRefl);
 			visitArgumentListOfMethodCallFromStandardAPI(methodCall, argListMethCall);
 		} else {
-			methodCall.arglist.accept(this);
+			methodCall.arglist().accept(this);
 		}
 		
-		System.out.println("Methodcall ("+ methodCall.name +") Desc : " + mDesc);
+		System.out.println("Methodcall ("+ methodCall.name()+") Desc : " + mDesc);
 		
 		
 //		methodCall.arglist.accept(this);
@@ -917,7 +911,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 	}
 
 	private void visitArgumentListOfMethodCallFromStandardAPI(MethodCall methodCall, List<Boolean> argListMethCall) {
-		for (Expression al : methodCall.arglist.getArguments()) {
+		for (Expression al : methodCall.arglist().getArguments()) {
 			statement = new ArgumentExpr(al);
 			ArgumentVisitor argV = new ArgumentVisitor(argListMethCall,this);
 			al.accept(argV);
@@ -927,12 +921,12 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	private void visitInvokeInsn(MethodCall methodCall, String receiverName, java.lang.reflect.Method methodRefl, String clazz, String mDesc, String receiverRefl) {
 		// is methodCall.receiver functional Interface)?
-		if (varsFunInterface.contains(methodCall.receiver.getType()) || (methodRefl!= null && receiverRefl.contains("interface")) ||
+		if (varsFunInterface.contains(methodCall.receiver().getType()) || (methodRefl!= null && receiverRefl.contains("interface")) ||
 				receiverName.contains(CONSTANTS.$$)) {
-			mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, clazz.replace(".", "/"), methodCall.name,
+			mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, clazz.replace(".", "/"), methodCall.name(),
 					mDesc, true);
 		} else {
-			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, clazz.replace(".", "/"), methodCall.name,
+			mv.visitMethodInsn(Opcodes.INVOKEVIRTUAL, clazz.replace(".", "/"), methodCall.name(),
 					mDesc, isInterface);
 		}
 	}
@@ -1061,18 +1055,18 @@ public class BytecodeGenMethod implements StatementVisitor {
 	@Override
 	public void visit(NewClass methodCall) {
 
-		mv.visitTypeInsn(Opcodes.NEW, methodCall.name.replace(".", "/"));
+		mv.visitTypeInsn(Opcodes.NEW, methodCall.name().toString().replace(".", "/"));
 		mv.visitInsn(Opcodes.DUP);
 		// creates Descriptor
-		methodCall.arglist.accept(this);
+		methodCall.arglist().accept(this);
 		String d = createDescriptorForInitMethod(methodCall);
 
-		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, methodCall.name.replace(".", "/"), "<init>", d, isInterface);
+		mv.visitMethodInsn(Opcodes.INVOKESPECIAL, methodCall.name().toString().replace(".", "/"), "<init>", d, isInterface);
 	}
 
 	private String createDescriptorForInitMethod(NewClass methodCall) {
 		String d = "(";
-		for (Expression e : methodCall.arglist.getArguments()) {
+		for (Expression e : methodCall.arglist().getArguments()) {
 			String type = resolver.getResolvedType(e.getType());
 			if(type.contains("TPH ")){
 				type = Type.getInternalName(Object.class);
@@ -1091,13 +1085,13 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(ExpressionReceiver receiver) {
-		receiver.expr.accept(this);
+		receiver.expr().accept(this);
 	}
 
 	@Override
 	public void visit(UnaryExpr unaryExpr) {
-		unaryExpr.expr.accept(this);
-		Operation op = unaryExpr.operation;
+		unaryExpr.expr().accept(this);
+		Operation op = unaryExpr.operation();
 
 		String typeOfUnary = resolver.getResolvedType(unaryExpr.getType());
 
@@ -1131,13 +1125,13 @@ public class BytecodeGenMethod implements StatementVisitor {
 		// Für Byte und Short muss noch einen Cast geben i2b, i2s
 		// das wird später gemacht, da bytecode für cast noch nicht erzeugt wird
 
-		if (isIncOrDec && (unaryExpr.expr instanceof LocalVar)) {
+		if (isIncOrDec && (unaryExpr.expr() instanceof LocalVar)) {
 			if(needDUP) {
 				mv.visitInsn(Opcodes.DUP);
 				needDUP = false;
 			}
-			LocalVar local = (LocalVar) unaryExpr.expr;
-			mv.visitVarInsn(Opcodes.ASTORE, paramsAndLocals.get(local.name));
+			LocalVar local = (LocalVar) unaryExpr.expr();
+			mv.visitVarInsn(Opcodes.ASTORE, paramsAndLocals.get(local.name()));
 		}
 	}
 
@@ -1182,17 +1176,17 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(Return aReturn) {
-		statement = new ReturnStmt(aReturn.retexpr);
+		statement = new ReturnStmt(aReturn.retexpr());
 		isReturnStmt = true;
 		isBinaryExp = statement.isExprBinary();
 		boolean isBinary = isBinaryExp;
-		if(aReturn.retexpr instanceof UnaryExpr)
+		if(aReturn.retexpr() instanceof UnaryExpr)
 			needDUP = true;
 		
-		aReturn.retexpr.accept(this);
+		aReturn.retexpr().accept(this);
 
 		if (isBinary) {
-			BinaryExpr binary = (BinaryExpr) aReturn.retexpr;
+			BinaryExpr binary = (BinaryExpr) aReturn.retexpr();
 			doBoxing(resolver.getResolvedType(binary.getType()));
 //			isBinaryExp = false;
 		}
@@ -1233,22 +1227,22 @@ public class BytecodeGenMethod implements StatementVisitor {
 
 	@Override
 	public void visit(WhileStmt whileStmt) {
-		statement = new LoopStmt(whileStmt.expr, whileStmt.loopBlock);
+		statement = new LoopStmt(whileStmt.expr(), whileStmt.loopBlock());
 		isBinaryExp = statement.isExprBinary();
-		whileStmt.expr.accept(this);
+		whileStmt.expr().accept(this);
 //		isBinaryExp = false;
 		statement = null;
 	}
 
 	@Override
 	public void visit(DoStmt whileStmt) {
-		whileStmt.expr.accept(this);
+		whileStmt.expr().accept(this);
 		// TODO:
 	}
 
 	@Override
 	public void visit(Literal literal) {
-		Object value = literal.value;
+		Object value = literal.value();
 		String typeOfLiteral = resolver.getResolvedType(literal.getType());
 		System.out.println("typeOfLiteral :=> "+ typeOfLiteral);
 		// Der Wert des Literals wird auf den Stack geladen und
@@ -1495,7 +1489,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 			varsFunInterface.add(assignLeftSide.field.getType());
 		// Loads the an object reference from the local variable
 		// array slot onto the top of the operand stack.
-		assignLeftSide.field.receiver.accept(this);
+		assignLeftSide.field.receiver().accept(this);
 		this.rightSideTemp.accept(this);
 		String fDesc  = "L";
 		if(resultSet.resolveType(assignLeftSide.field.getType()).resolvedType instanceof TypePlaceholder) {
@@ -1506,9 +1500,9 @@ public class BytecodeGenMethod implements StatementVisitor {
 		fDesc +=";";
 
 		
-		System.out.println("Receiver = " + resolver.getResolvedType(assignLeftSide.field.receiver.getType()));
-		mv.visitFieldInsn(Opcodes.PUTFIELD, resolver.getResolvedType(assignLeftSide.field.receiver.getType()),
-				assignLeftSide.field.fieldVarName, fDesc);
+		System.out.println("Receiver = " + resolver.getResolvedType(assignLeftSide.field.receiver().getType()));
+		mv.visitFieldInsn(Opcodes.PUTFIELD, resolver.getResolvedType(assignLeftSide.field.receiver().getType()),
+				assignLeftSide.field.fieldVarName(), fDesc);
 	}
 
 	@Override
@@ -1516,7 +1510,7 @@ public class BytecodeGenMethod implements StatementVisitor {
 		if (isRightSideALambda)
 			varsFunInterface.add(assignLeftSide.localVar.getType());
 		int index = paramsAndLocals.size();
-		String var = assignLeftSide.localVar.name;
+		String var = assignLeftSide.localVar.name();
 		if (!paramsAndLocals.containsKey(var)) {
 			paramsAndLocals.put(var, index + 1);
 		} 
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/IfStatement.java b/src/main/java/de/dhbwstuttgart/bytecode/IfStatement.java
index dc548f01..31a61483 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/IfStatement.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/IfStatement.java
@@ -2,10 +2,9 @@ package de.dhbwstuttgart.bytecode;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
+import de.dhbwstuttgart.syntaxtree.Expression;
+import de.dhbwstuttgart.syntaxtree.Statement;
 
 public class IfStatement extends AStatement{
 	
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/LoopStmt.java b/src/main/java/de/dhbwstuttgart/bytecode/LoopStmt.java
index 0f7788d4..0770d271 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/LoopStmt.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/LoopStmt.java
@@ -4,8 +4,8 @@ import org.objectweb.asm.Label;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
+import de.dhbwstuttgart.syntaxtree.Expression;
+import de.dhbwstuttgart.syntaxtree.Statement;
 
 public class LoopStmt extends AStatement {
 	
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/ReturnStmt.java b/src/main/java/de/dhbwstuttgart/bytecode/ReturnStmt.java
index bd747720..83021640 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/ReturnStmt.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/ReturnStmt.java
@@ -1,9 +1,6 @@
 package de.dhbwstuttgart.bytecode;
 
-import org.objectweb.asm.MethodVisitor;
-
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.Expression;
 
 public class ReturnStmt extends AStatement {
 	
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java b/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
index 6f443a47..8f7c4c7b 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/TPHExtractor.java
@@ -6,7 +6,6 @@ package de.dhbwstuttgart.bytecode;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -16,23 +15,18 @@ import java.util.stream.Collectors;
 
 import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
 import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.Field;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.LocalVar;
+import de.dhbwstuttgart.syntaxtree.LocalVarDecl;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
@@ -240,8 +234,8 @@ public class TPHExtractor extends AbstractASTWalker {
 		inMethod = false;
 		//super.visit(cons);
 		cons.getParameterList().accept(this);
-		if(cons.block != null)
-			cons.block.accept(this);
+		if(cons.block() != null)
+			cons.block().accept(this);
 		inMethod = true; 
 	}
 
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/constraint/TPHConstraint.java b/src/main/java/de/dhbwstuttgart/bytecode/constraint/TPHConstraint.java
index 0533a028..b667a825 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/constraint/TPHConstraint.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/constraint/TPHConstraint.java
@@ -2,8 +2,7 @@ package de.dhbwstuttgart.bytecode.constraint;
 
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 public class TPHConstraint {
 	protected String left;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
index c272c12f..da6db869 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorToString.java
@@ -4,12 +4,12 @@ import java.util.HashMap;
 import java.util.Iterator;
 
 import de.dhbwstuttgart.bytecode.utilities.*;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.ArgumentList;
 import org.objectweb.asm.Type;
 
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.Expression;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 public class DescriptorToString implements DescriptorVisitor, CONSTANTS {
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java
index d1576c76..b1762a67 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/DescriptorVisitor.java
@@ -5,7 +5,7 @@ import de.dhbwstuttgart.bytecode.utilities.MethodFromMethodCall;
 import de.dhbwstuttgart.bytecode.utilities.NormalConstructor;
 import de.dhbwstuttgart.bytecode.utilities.NormalMethod;
 import de.dhbwstuttgart.bytecode.utilities.SamMethod;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.ArgumentList;
 
 public interface DescriptorVisitor {
 	String visit(NormalMethod method);
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java
index f10f8070..e2802a1f 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/descriptor/TypeToDescriptor.java
@@ -2,9 +2,9 @@ package de.dhbwstuttgart.bytecode.descriptor;
 
 import de.dhbwstuttgart.bytecode.funN.FunNGenerator;
 import de.dhbwstuttgart.bytecode.funN.FunNUtilities;
-import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.*;
 
-public class TypeToDescriptor implements TypeVisitor<String>{
+public class TypeToDescriptor implements TypeVisitor<String> {
 
 	private final boolean specializedFunN;
 
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNGenerator.java b/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNGenerator.java
index 3a651c93..5e50f842 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNGenerator.java
@@ -2,18 +2,15 @@ package de.dhbwstuttgart.bytecode.funN;
 
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
-import de.dhbwstuttgart.bytecode.utilities.CONSTANTS;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNUtilities.java b/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNUtilities.java
index 7ae4da4d..da237b39 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNUtilities.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/funN/FunNUtilities.java
@@ -1,7 +1,7 @@
 package de.dhbwstuttgart.bytecode.funN;
 
 import de.dhbwstuttgart.bytecode.utilities.CONSTANTS;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
index e25958d1..8df552b8 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/genericsGenerator/GeneratedGenericsFinder.java
@@ -6,59 +6,16 @@ package de.dhbwstuttgart.bytecode.genericsGenerator;
 import java.util.*;
 
 import de.dhbwstuttgart.bytecode.TPHExtractor;
-import de.dhbwstuttgart.bytecode.constraint.ExtendsConstraint;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.*;
-import de.dhbwstuttgart.bytecode.insertGenerics.ClassConstraint;
 import de.dhbwstuttgart.bytecode.insertGenerics.FamilyOfGeneratedGenerics;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.Field;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Assign;
-import de.dhbwstuttgart.syntaxtree.statement.AssignToField;
-import de.dhbwstuttgart.syntaxtree.statement.BinaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.CastExpr;
-import de.dhbwstuttgart.syntaxtree.statement.DoStmt;
-import de.dhbwstuttgart.syntaxtree.statement.EmptyStmt;
-import de.dhbwstuttgart.syntaxtree.statement.ExpressionReceiver;
-import de.dhbwstuttgart.syntaxtree.statement.FieldVar;
-import de.dhbwstuttgart.syntaxtree.statement.ForStmt;
-import de.dhbwstuttgart.syntaxtree.statement.IfStmt;
-import de.dhbwstuttgart.syntaxtree.statement.InstanceOf;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVarDecl;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.statement.NewArray;
-import de.dhbwstuttgart.syntaxtree.statement.NewClass;
-import de.dhbwstuttgart.syntaxtree.statement.Return;
-import de.dhbwstuttgart.syntaxtree.statement.ReturnVoid;
-import de.dhbwstuttgart.syntaxtree.statement.StaticClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Super;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.statement.This;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr;
-import de.dhbwstuttgart.syntaxtree.statement.WhileStmt;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 /**
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
index ed46e816..c57e384b 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/FamilyOfGeneratedGenerics.java
@@ -6,13 +6,10 @@ import de.dhbwstuttgart.bytecode.constraint.TPHConstraint.Relation;
 import de.dhbwstuttgart.bytecode.utilities.MethodAndTPH;
 
 import java.util.*;
-import java.util.function.Predicate;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.ResultPair;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 import org.objectweb.asm.Type;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
index 33ecfbc6..55110db0 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/insertGenerics/PositionFinder.java
@@ -1,7 +1,7 @@
 package de.dhbwstuttgart.bytecode.insertGenerics;
 
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 import java.util.HashMap;
 import java.util.Set;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java b/src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java
index 47254170..cfc6c7ed 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/signature/Signature.java
@@ -2,6 +2,7 @@ package de.dhbwstuttgart.bytecode.signature;
 
 import java.util.*;
 
+import de.dhbwstuttgart.syntaxtree.*;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.signature.SignatureVisitor;
 import org.objectweb.asm.signature.SignatureWriter;
@@ -9,16 +10,7 @@ import org.objectweb.asm.signature.SignatureWriter;
 import de.dhbwstuttgart.bytecode.constraint.TPHConstraint;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 public class Signature {
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java b/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java
index 0026b85f..0e38e796 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToSignature.java
@@ -8,13 +8,8 @@ import java.util.Optional;
 import de.dhbwstuttgart.bytecode.funN.FunNGenerator;
 import de.dhbwstuttgart.bytecode.funN.FunNUtilities;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 
 public class TypeToSignature implements TypeVisitor<String> {
 	private List<GenericsGeneratorResult> constraints;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToString.java b/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToString.java
index a0e280c2..da48600e 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToString.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/signature/TypeToString.java
@@ -1,12 +1,11 @@
 package de.dhbwstuttgart.bytecode.signature;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+import de.dhbwstuttgart.syntaxtree.ExtendsWildcardType;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypeVisitor;
 
 public class TypeToString implements TypeVisitor<String>{
 
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/ByteCodeForFunNGenerator.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/ByteCodeForFunNGenerator.java
index 24b5f627..32cd794e 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/ByteCodeForFunNGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/ByteCodeForFunNGenerator.java
@@ -2,9 +2,9 @@ package de.dhbwstuttgart.bytecode.utilities;
 
 import de.dhbwstuttgart.bytecode.signature.Signature;
 import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.Expression;
+import de.dhbwstuttgart.syntaxtree.LambdaExpression;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -27,7 +27,7 @@ public class ByteCodeForFunNGenerator {
 
         int numberOfParams = 0;
         SignatureVisitor paramVisitor = methSig.visitParameterType();
-        Iterator<FormalParameter> itr = lambdaExpression.params.iterator();
+        Iterator<FormalParameter> itr = lambdaExpression.params().iterator();
         while (itr.hasNext()) {
             numberOfParams++;
             // getBounds
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java
index 39339cbe..21d1139a 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/KindOfLambda.java
@@ -1,17 +1,13 @@
 package de.dhbwstuttgart.bytecode.utilities;
 
-import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.*;
 
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class KindOfLambda implements StatementVisitor{
 	private ParameterList params;
@@ -23,8 +19,8 @@ public class KindOfLambda implements StatementVisitor{
 	private ArrayList<String> definedLocals = new ArrayList<>();
 	
 	public KindOfLambda(LambdaExpression lambdaExpression) {
-		this.params = lambdaExpression.params;
-		lambdaExpression.methodBody.accept(this);
+		this.params = lambdaExpression.params();
+		lambdaExpression.methodBody().accept(this);
 		
 	}
 	
@@ -52,19 +48,19 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(LambdaExpression lambdaExpression) {
-		lambdaExpression.params.getFormalparalist().forEach(p->varsFromInnerLambdas.add(p.getName()));
-		lambdaExpression.methodBody.accept(this);
+		lambdaExpression.params().getFormalparalist().forEach(p->varsFromInnerLambdas.add(p.getName()));
+		lambdaExpression.methodBody().accept(this);
 	}
 
 	@Override
 	public void visit(Assign assign) {
-		assign.rightSide.accept(this);
+		assign.rightSide().accept(this);
 	}
 
 	@Override
 	public void visit(BinaryExpr binary) {
-		binary.lexpr.accept(this);
-		binary.rexpr.accept(this);
+		binary.lexpr().accept(this);
+		binary.rexpr().accept(this);
 	}
 
 	@Override
@@ -88,7 +84,7 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(FieldVar fieldVar) {
-		fieldVar.receiver.accept(this);
+		fieldVar.receiver().accept(this);
 	}
 
 	@Override
@@ -99,9 +95,9 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(IfStmt ifStmt) {
-		ifStmt.expr.accept(this);
-		ifStmt.then_block.accept(this);
-		ifStmt.else_block.accept(this);
+		ifStmt.expr().accept(this);
+		ifStmt.then_block().accept(this);
+		ifStmt.else_block().accept(this);
 	}
 
 	@Override
@@ -112,14 +108,14 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(LocalVar localVar) {
-		boolean addVar = !contain(params, localVar.name) && !definedLocals.contains(localVar.name) &&
-				!varsFromInnerLambdas.contains(localVar.name) && !usedVars.contains(localVar.name);
+		boolean addVar = !contain(params, localVar.name()) && !definedLocals.contains(localVar.name()) &&
+				!varsFromInnerLambdas.contains(localVar.name()) && !usedVars.contains(localVar.name());
 		if(addVar) {
 			argumentList.add(localVar.getType());
 			if(thisUsed) {
-				usedVars.add(1, localVar.name);
+				usedVars.add(1, localVar.name());
 			} else {
-				usedVars.add(0, localVar.name);
+				usedVars.add(0, localVar.name());
 			}
 			if(!isInstanceCapturingLambda)
 				isInstanceCapturingLambda=true;
@@ -143,14 +139,14 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(MethodCall methodCall) {
-		methodCall.receiver.accept(this);
-		methodCall.arglist.accept(this);
+		methodCall.receiver().accept(this);
+		methodCall.arglist().accept(this);
 	}
 
 	@Override
 	public void visit(NewClass methodCall) {
-		methodCall.receiver.accept(this);
-		methodCall.arglist.accept(this);
+		methodCall.receiver().accept((ASTVisitor) this);
+		methodCall.arglist().accept(this);
 	}
 
 	@Override
@@ -161,7 +157,7 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(ExpressionReceiver receiver) {
-		receiver.expr.accept(this);
+		receiver.expr().accept(this);
 	}
 
 	@Override
@@ -171,7 +167,7 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(Return aReturn) {
-		aReturn.retexpr.accept(this);
+		aReturn.retexpr().accept(this);
 	}
 
 	@Override
@@ -206,8 +202,8 @@ public class KindOfLambda implements StatementVisitor{
 
 	@Override
 	public void visit(WhileStmt whileStmt) {
-		whileStmt.expr.accept(this);
-		whileStmt.loopBlock.accept(this);
+		whileStmt.expr().accept(this);
+		whileStmt.loopBlock().accept(this);
 		
 	}
 
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/Lambda.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/Lambda.java
index 6371c618..4838d775 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/Lambda.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/Lambda.java
@@ -2,8 +2,8 @@ package de.dhbwstuttgart.bytecode.utilities;
 
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class Lambda {
 	private LambdaExpression lambdaExpression;
@@ -13,7 +13,7 @@ public class Lambda {
 	}
 	
 	public ParameterList getParams() {
-		return lambdaExpression.params;
+		return lambdaExpression.params();
 	}
 	
 	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java
index caaad1be..35d0e81c 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodAndTPH.java
@@ -2,11 +2,9 @@ package de.dhbwstuttgart.bytecode.utilities;
 
 import java.util.ArrayList;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.result.GenericInsertPair;
 import de.dhbwstuttgart.typeinference.result.ResultPair;
 
 public class MethodAndTPH {
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodCallHelper.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodCallHelper.java
index ad3e28fa..852a02b9 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodCallHelper.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodCallHelper.java
@@ -8,9 +8,9 @@ import de.dhbwstuttgart.bytecode.descriptor.DescriptorToString;
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
 import de.dhbwstuttgart.bytecode.signature.TypeToSignature;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.MethodCall;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.Expression;
+import de.dhbwstuttgart.syntaxtree.MethodCall;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import javassist.NotFoundException;
 import org.objectweb.asm.MethodVisitor;
@@ -47,7 +47,7 @@ public class MethodCallHelper {
 	}
 
 	public boolean isInCurrPkg(String className) {
-		for (ClassOrInterface cl : sourceFile.KlassenVektor) {
+		for (ClassOrInterface cl : sourceFile.KlassenVektor()) {
 			if (className.equals(cl.getClassName().toString()))
 				return true;
 		}
@@ -65,7 +65,7 @@ public class MethodCallHelper {
 	}
 
 	public ClassOrInterface getClassFromCurrPkg(String className) throws NotInCurrentPackageException {
-		for (ClassOrInterface cl : sourceFile.KlassenVektor) {
+		for (ClassOrInterface cl : sourceFile.KlassenVektor()) {
 			if (className.equals(cl.getClassName().toString()))
 				return cl;
 		}
@@ -73,10 +73,10 @@ public class MethodCallHelper {
 	}
 
 	public String getDesc(String className) throws NotInCurrentPackageException, NotFoundException {
-		String name = methCall.name;
+		String name = methCall.name();
 		ClassOrInterface clazz = getClassFromCurrPkg(className);
 		String retType = getResolvedType(methCall.getType());
-		ArrayList<String> params = getTypes(methCall.arglist.getArguments());
+		ArrayList<String> params = getTypes(methCall.arglist().getArguments());
 		
 		Map<String, String> genAndBoundsClass = getGenericsAndBounds(clazz.getGenerics());
 		modifyGenAndBounds(genAndBoundsClass);
@@ -221,11 +221,11 @@ public class MethodCallHelper {
 	}
 
 	public void generateBCForFunN(String methodDescriptor) {
-		ByteCodeForFunNGenerator.generateBCForFunN(methCall.arglist,methodDescriptor,path);
+		ByteCodeForFunNGenerator.generateBCForFunN(methCall.arglist(),methodDescriptor,path);
 	}
 
 	public String getDescriptorOfApplyMethod(String methodCallType) {
-		return new DescriptorToString().createDescForFunN(methCall.arglist, methodCallType);
+		return new DescriptorToString().createDescForFunN(methCall.arglist(), methodCallType);
 	}
 	
 	/**
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java
index 28d135e6..bd9bd213 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodFromMethodCall.java
@@ -3,8 +3,8 @@ package de.dhbwstuttgart.bytecode.utilities;
 import java.util.HashMap;
 
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.ArgumentList;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class MethodFromMethodCall {
 	private ArgumentList argList;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodUtility.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodUtility.java
index 6a84e97c..c8d6026c 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodUtility.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/MethodUtility.java
@@ -22,7 +22,7 @@ public class MethodUtility {
 	 * 	ID = ReturntypeMethodname(Parametertypes)
 	 */
 	public static String createID(Resolver resolver, Method method) {
-		String id = resolver.getResolvedType(method.getReturnType()) + method.name + "(";
+		String id = resolver.getResolvedType(method.getReturnType()) + method.name() + "(";
 		Iterator<FormalParameter> itr = method.getParameterList().iterator();
 		while (itr.hasNext()) {
 			FormalParameter fp = itr.next();
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java
index 4e5bc887..663da2d7 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/NormalMethod.java
@@ -5,7 +5,7 @@ import java.util.HashMap;
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class NormalMethod {
 	private Method method;
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/Resolver.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/Resolver.java
index 684fdd4b..498185ba 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/Resolver.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/Resolver.java
@@ -4,7 +4,7 @@
 package de.dhbwstuttgart.bytecode.utilities;
 
 import de.dhbwstuttgart.bytecode.descriptor.TypeToDescriptor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 /**
diff --git a/src/main/java/de/dhbwstuttgart/bytecode/utilities/SamMethod.java b/src/main/java/de/dhbwstuttgart/bytecode/utilities/SamMethod.java
index 1c1b883c..864b9f0b 100644
--- a/src/main/java/de/dhbwstuttgart/bytecode/utilities/SamMethod.java
+++ b/src/main/java/de/dhbwstuttgart/bytecode/utilities/SamMethod.java
@@ -3,7 +3,7 @@ package de.dhbwstuttgart.bytecode.utilities;
 import java.util.List;
 
 import de.dhbwstuttgart.bytecode.descriptor.DescriptorVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 public class SamMethod {
 	private List<RefTypeOrTPHOrWildcardOrGeneric> argumentList;
diff --git a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
index eb220f4f..f49ee6a4 100644
--- a/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
+++ b/src/main/java/de/dhbwstuttgart/core/JavaTXCompiler.java
@@ -16,24 +16,10 @@ import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.SyntaxTreeGenerator;
 import de.dhbwstuttgart.parser.antlr.Java8Parser.CompilationUnitContext;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.ParameterList;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.FormalParameter;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.TypeVisitor;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import de.dhbwstuttgart.syntaxtree.visual.ASTTypePrinter;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
@@ -59,16 +45,10 @@ import java.io.FileOutputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.Writer;
-import java.io.OutputStreamWriter;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.antlr.v4.runtime.Token;
-import org.apache.commons.io.output.NullOutputStream;
-
 
 public class JavaTXCompiler {
 
@@ -129,15 +109,15 @@ public class JavaTXCompiler {
         for (File f : this.sourceFiles.keySet()) {
 			SourceFile sf = sourceFiles.get(f);
 			sf = new SourceFile(sf.getPkgName(),
-					       sf.KlassenVektor.stream()
+					       sf.KlassenVektor().stream()
 										   .map(cl -> new ClassOrInterface(cl))
 							               .collect(Collectors.toCollection(ArrayList::new)),
-						   sf.imports);
+						   sf.imports());
 			//sf enthaelt neues Source-File, neue Klassen-Objekte und neue 
 			//ArrayListen-Objekte fuer Fields, Construktoren und Methoden
 			//Alle anderen Objekte werden nur kopiert.
 			SourceFile sf_new = sf;
-			sf.KlassenVektor.forEach(cl -> addMethods(sf_new, cl, importedClasses, objectClass));
+			sf.KlassenVektor().forEach(cl -> addMethods(sf_new, cl, importedClasses, objectClass));
 			allClasses.addAll(sf.getClasses());
 		}
         allClasses.addAll(importedClasses);
@@ -159,7 +139,7 @@ public class JavaTXCompiler {
 				}
 				else {	
 					optSuperclass = 
-							sf.KlassenVektor.stream().filter(x -> x.getClassName().equals(
+							sf.KlassenVektor().stream().filter(x -> x.getClassName().equals(
 										cl.getSuperClass().getName())).findFirst();
 					if (optSuperclass.isPresent()) {
 						superclass = optSuperclass.get();
@@ -187,7 +167,7 @@ public class JavaTXCompiler {
 					 .stream()
 					 .map(fp -> new FormalParameter(fp.getName(), fp.getType().acceptTV(new TypeExchanger(gtvs)), fp.getOffset()))
 					 .collect(Collectors.toCollection(ArrayList::new)), m.getParameterList().getOffset());
-				cl.getMethods().add(new Method(m.modifier, m.name, m.getReturnType().acceptTV(new TypeExchanger(gtvs)), newParaList, m.block,
+				cl.getMethods().add(new Method(m.modifier(), m.name(), m.getReturnType().acceptTV(new TypeExchanger(gtvs)), newParaList, m.block,
 							  //new GenericDeclarationList(newGenericsList, ((GenericDeclarationList)m.getGenerics()).getOffset()), 
 						(GenericDeclarationList)m.getGenerics(),
 						m.getOffset(), true));
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
index c505bfb6..026cf421 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/AssignToLocal.java
@@ -1,9 +1,6 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.AssignLeftSide;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.LocalVar;
+import de.dhbwstuttgart.syntaxtree.*;
 
 public class AssignToLocal extends AssignLeftSide {
     public final LocalVar localVar;
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java
index 71dcef52..21f501a8 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/FCGenerator.java
@@ -2,19 +2,15 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
 import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.UnifyTypeFactory;
-import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 import de.dhbwstuttgart.typeinference.unify.model.*;
 
 import java.util.*;
 import java.util.stream.Collectors;
 
-import org.antlr.v4.runtime.Token;
-
 public class FCGenerator {
     /**
      * Baut die FiniteClosure aus availableClasses.
@@ -133,7 +129,7 @@ public class FCGenerator {
     /**
      * Tauscht die GTVs in einem Typ gegen die entsprechenden Typen in der übergebenen Map aus.
      */
-    private static class TypeExchanger implements TypeVisitor<RefTypeOrTPHOrWildcardOrGeneric>{
+    private static class TypeExchanger implements TypeVisitor<RefTypeOrTPHOrWildcardOrGeneric> {
 
         private final HashMap<String, RefTypeOrTPHOrWildcardOrGeneric> gtvs;
 
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
index 2b3c99fd..ce3233d8 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/StatementGenerator.java
@@ -6,12 +6,9 @@ import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.UnaryExpr.Operation;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.type.Void;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 import org.antlr.v4.runtime.Token;
 import org.antlr.v4.runtime.tree.TerminalNode;
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
index d7926004..bc45d7fc 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntacticSugar.java
@@ -1,10 +1,7 @@
 package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.AbstractASTWalker;
-import de.dhbwstuttgart.syntaxtree.Constructor;
-import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.*;
 
 import java.util.List;
 
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
index 33559a8e..9819d54f 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/SyntaxTreeGenerator.java
@@ -5,22 +5,19 @@ import de.dhbwstuttgart.exceptions.NotImplementedException;
 import java.lang.ClassNotFoundException;
 
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
-import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
 import de.dhbwstuttgart.parser.scope.GatherNames;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.Void;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.sql.Ref;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -138,7 +135,7 @@ public class SyntaxTreeGenerator{
       if(header.result().unannType() != null){
         retType = TypeGenerator.convert(header.result().unannType(), reg, localGenerics);
       }
-      else retType = new de.dhbwstuttgart.syntaxtree.type.Void(header.result().getStart());
+      else retType = new Void(header.result().getStart());
     }else{
       retType = TypePlaceholder.fresh(header.getStart());
     }
@@ -152,7 +149,8 @@ public class SyntaxTreeGenerator{
       block = stmtGen.convert(body.block(),true);
     }
     if(parentClass.equals(new JavaClassName(name))){
-      return new Constructor(modifiers, name, retType, parameterList, block, gtvDeclarations, header.getStart() /*, fieldInitializations geloescht PL 2018-11-24 */);
+      new Constructor(modifiers, name, retType, parameterList, block, gtvDeclarations, header.getStart() /*, fieldInitializations geloescht PL 2018-11-24 */);
+      return Constructor.getMethod();
     }else{
       return new Method(modifiers, name, retType, parameterList,block, gtvDeclarations, header.getStart());
     }
@@ -206,11 +204,11 @@ public class SyntaxTreeGenerator{
     //int noOfMethods = methods.size();
     for(int i = 0; i < methodsAndConstructors.size(); i++){
       Method m = methodsAndConstructors.get(i);
-      if(m instanceof Constructor){
-        konstruktoren.add((Constructor) m);
+      if(m instanceof Method){
+        methods.add(m);
       }
       else {
-    	  methods.add(m);
+    	  //konstruktoren.add(m);
       }
     }
     if(konstruktoren.size()<1){//Standardkonstruktor anfügen:
diff --git a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
index d55e9349..7455b19a 100644
--- a/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/parser/SyntaxTreeGenerator/TypeGenerator.java
@@ -3,19 +3,12 @@ package de.dhbwstuttgart.parser.SyntaxTreeGenerator;
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.exceptions.TypeinferenceException;
 import de.dhbwstuttgart.parser.antlr.Java8Parser;
-import de.dhbwstuttgart.parser.antlr.Java8Parser.UnannClassType_lfno_unannClassOrInterfaceTypeContext;
 import de.dhbwstuttgart.parser.scope.GenericsRegistry;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
-import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import org.antlr.v4.runtime.Token;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ASTVisitor.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
index 5f77601d..865503ca 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ASTVisitor.java
@@ -1,7 +1,5 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.*;
-
 public interface ASTVisitor extends StatementVisitor{
 
     void visit(SourceFile sourceFile);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java b/src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
index 0cbad897..6f18bcf5 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/AbstractASTWalker.java
@@ -1,16 +1,13 @@
 package de.dhbwstuttgart.syntaxtree;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.type.*;
 
 import java.util.Iterator;
 
 public abstract class AbstractASTWalker implements ASTVisitor{
     @Override
     public void visit(Constructor cons) {
-        visitMethod(cons);
+        //visitMethod(cons);
     }
 
     @Override
@@ -118,15 +115,15 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(LambdaExpression lambdaExpression) {
-        lambdaExpression.params.accept(this);
-        lambdaExpression.methodBody.accept(this);
+        lambdaExpression.params().accept(this);
+        lambdaExpression.methodBody().accept(this);
     }
 
     @Override
     public void visit(Assign assign) {
-        assign.lefSide.accept(this);
-        assign.rightSide.accept(this);
-        assign.rightSide.getType().accept((ASTVisitor) this);
+        assign.lefSide().accept(this);
+        assign.rightSide().accept(this);
+        assign.rightSide().getType().accept((ASTVisitor) this);
     }
 
     @Override
@@ -153,7 +150,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(FieldVar fieldVar) {
-        fieldVar.receiver.accept(this);
+        fieldVar.receiver().accept(this);
     }
 
     @Override
@@ -163,8 +160,8 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(IfStmt ifStmt) {
-        ifStmt.then_block.accept(this);
-        ifStmt.else_block.accept(this);
+        ifStmt.then_block().accept(this);
+        ifStmt.else_block().accept(this);
     }
 
     @Override
@@ -185,7 +182,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(MethodCall methodCall) {
-        methodCall.receiver.accept(this);
+        methodCall.receiver().accept(this);
         methodCall.getArgumentList().accept(this);
         methodCall.getArgumentList().getArguments().forEach(a -> a.getType().accept((ASTVisitor) this));
     }
@@ -193,7 +190,7 @@ public abstract class AbstractASTWalker implements ASTVisitor{
     
     @Override
     public void visit(NewClass methodCall) {
-        visit((MethodCall) methodCall);
+        visit(methodCall);
     }
 
     @Override
@@ -203,17 +200,17 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(ExpressionReceiver receiver) {
-        receiver.expr.accept(this);
+        receiver.expr().accept(this);
     }
 
     @Override
     public void visit(UnaryExpr unaryExpr) {
-        unaryExpr.expr.accept(this);
+        unaryExpr.expr().accept(this);
     }
 
     @Override
     public void visit(Return aReturn) {
-        aReturn.retexpr.accept(this);
+        aReturn.retexpr().accept(this);
         aReturn.getType().accept((ASTVisitor) this);
     }
 
@@ -239,12 +236,12 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(WhileStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
     public void visit(DoStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
@@ -264,6 +261,6 @@ public abstract class AbstractASTWalker implements ASTVisitor{
 
     @Override
     public void visit(SuperCall superCall) {
-        this.visit((MethodCall)superCall);
+        this.visit(superCall);
     }
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ArgumentList.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ArgumentList.java
new file mode 100644
index 00000000..0f1b1ee0
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ArgumentList.java
@@ -0,0 +1,27 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+import java.util.List;
+
+public record ArgumentList(List<Expression> expr, Token offset) implements SyntaxTreeNode {
+
+	public List<Expression> getArguments(){
+		return expr;
+	}
+
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	public void accept(StatementVisitor visitor) {
+		visitor.visit(this);
+	}
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Assign.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Assign.java
new file mode 100644
index 00000000..1e519d89
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Assign.java
@@ -0,0 +1,51 @@
+
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+/*
+Aufbau:
+rightSide = leftSide
+ */
+public record Assign(AssignLeftSide leftSide, Expression rightSide, Expression value,
+                     Token offset) implements Statement {
+    private static boolean isStatement;
+
+    public Assign(AssignLeftSide leftHandSide, Expression value, Token offset) {
+        this(leftHandSide, value, value, offset);
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return leftSide().getType();
+    }
+
+    public AssignLeftSide lefSide() {
+        return leftSide;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/AssignLeftSide.java b/src/main/java/de/dhbwstuttgart/syntaxtree/AssignLeftSide.java
new file mode 100644
index 00000000..15e03bd6
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/AssignLeftSide.java
@@ -0,0 +1,31 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public non-sealed abstract class AssignLeftSide implements TypableStatement {
+
+    private final RefTypeOrTPHOrWildcardOrGeneric type;
+    private final Token offset;
+
+    public AssignLeftSide(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
+        this.type = type;
+        this.offset = offset;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+
+    public abstract void accept(StatementVisitor visitor);
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java b/src/main/java/de/dhbwstuttgart/syntaxtree/AssignToField.java
similarity index 64%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/AssignToField.java
index 931443d1..db52f928 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignToField.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/AssignToField.java
@@ -1,8 +1,6 @@
-package de.dhbwstuttgart.syntaxtree.statement;
+package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-
-public class AssignToField extends AssignLeftSide{
+public final class AssignToField extends AssignLeftSide{
     public final FieldVar field;
     public AssignToField(FieldVar fieldVar) {
         super(fieldVar.getType(), fieldVar.getOffset());
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExpr.java
new file mode 100644
index 00000000..e6f83c1a
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExpr.java
@@ -0,0 +1,44 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+public record BinaryExpr(Operator operation, RefTypeOrTPHOrWildcardOrGeneric type, Expression lexpr, Expression rexpr, Token offset) implements BinaryExprInterface{
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+
+    public enum Operator {
+        ADD, // +
+        SUB, // -
+        MUL, // *
+        MOD, // Modulo Operator %
+        AND, // &&
+        OR,  // ||
+        DIV, // /
+        LESSTHAN, // <
+        BIGGERTHAN, // >
+        LESSEQUAL, // <=
+        BIGGEREQUAL, // >=
+        EQUAL, // ==
+        NOTEQUAL // !=
+    }
+
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExprInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExprInterface.java
new file mode 100644
index 00000000..cebe4816
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/BinaryExprInterface.java
@@ -0,0 +1,6 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface BinaryExprInterface extends Expression permits BinaryExpr, InstanceOf {
+}
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Block.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Block.java
new file mode 100644
index 00000000..34648a2f
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Block.java
@@ -0,0 +1,53 @@
+package de.dhbwstuttgart.syntaxtree;
+import java.util.*;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record Block(List<Statement> statements, Token offset) implements Statement {
+
+
+    @Override
+    public List<Statement> statements() {
+        return statements;
+    }
+
+    private static boolean isStatement = false;
+
+    public List<Statement> getStatements()
+    {
+        return statements;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement=true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return TypePlaceholder.fresh(offset);
+    }
+}
+
+
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/CastExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/CastExpr.java
new file mode 100644
index 00000000..80104f30
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/CastExpr.java
@@ -0,0 +1,28 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record CastExpr(RefTypeOrTPHOrWildcardOrGeneric castType, Expression expr, Token offset) implements Expression {
+
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return castType;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
index c99caa53..7a6d8c82 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ClassOrInterface.java
@@ -1,16 +1,7 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.core.IItemWithOffset;
-import de.dhbwstuttgart.exceptions.DebugException;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.syntaxtree.visual.ASTPrinter;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
 
 import java.lang.reflect.Modifier;
@@ -22,132 +13,129 @@ import java.util.Optional;
 /**
  * Stellt jede Art von Klasse dar. Auch abstrakte Klassen und Interfaces
  */
-public class ClassOrInterface extends SyntaxTreeNode implements TypeScope{
-  private Boolean methodAdded = false; //wird benoetigt bei in JavaTXCompiler.getConstraints()
-  protected int modifiers;
-  protected JavaClassName name;
-  private List<Field> fields = new ArrayList<>();
-  private Optional<Constructor> fieldInitializations; //PL 2018-11-24: Noetig, um Bytecode fuer initializators nur einmal zu erzeugen
-  private List<Method> methods = new ArrayList<>();
-  private GenericDeclarationList genericClassParameters;
-  private RefType superClass;
-  protected boolean isInterface;
-  private List<RefType> implementedInterfaces;
-  private List<Constructor> constructors;
+public non-sealed class ClassOrInterface implements TypeScope, SyntaxTreeNode {
+    private static Boolean methodAdded = false; //wird benoetigt bei in JavaTXCompiler.getConstraints()
+    private final Token offset;
+    private final int modifiers;
+    private final JavaClassName name;
+    private final List<Field> fielddecl;
+    private final Optional<Constructor> fieldInitializations;
+    private final GenericDeclarationList genericClassParameters;
+    private final RefType superClass;
+    private final Boolean isInterface;
+    private final List<RefType> implementedInterfaces;
+    private final List<Method> methods;
+    private final List<Constructor> constructors;
 
-  
-  public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
-                          RefType superClass, Boolean isInterface, List<RefType> implementedInterfaces, Token offset){
-    super(offset);
-    if(isInterface && !Modifier.isInterface(modifiers))modifiers += Modifier.INTERFACE;
-      this.modifiers = modifiers;
-      this.name = name;
-      this.fields = fielddecl;
-      this.fieldInitializations= fieldInitializations;
-    this.genericClassParameters = genericClassParameters;
-      this.superClass = superClass;
-    this.isInterface = isInterface;
-      this.implementedInterfaces = implementedInterfaces;
-    this.methods = methods;
-    this.constructors = constructors;
-  }
-  
-  /* erzeugt fuer Fields, Konstruktoren und Methoden neue ArrayList-Objekte 
-   * alle anderen Datenobjekte werden nur kopiert.
-   */
-  public ClassOrInterface(ClassOrInterface cl){
-	  super(cl.getOffset());
-	  this.modifiers = cl.modifiers;
-	  this.name = cl.name;
-	  this.fields = new ArrayList<>(cl.fields);
-	  this.fieldInitializations= cl.fieldInitializations;
-	  this.genericClassParameters = cl.genericClassParameters;
-	  this.superClass = cl.superClass;
-	  this.isInterface = cl.isInterface;
-	  this.implementedInterfaces = cl.implementedInterfaces;
-	  this.methods = new ArrayList<>(cl.methods);
-	  this.constructors = new ArrayList<>(cl.constructors);
-  }
-  
-  //Gets if it is added
-  public Boolean areMethodsAdded() {
-	  return methodAdded;
-  }
-  
-  //Sets that it is added
-  public void setMethodsAdded() {
-	methodAdded = true;	
-  }
-  
-  // Gets class name
-  public JavaClassName getClassName(){
-    return this.name;
-  }
-  
-  // Get modifiers
-  public int getModifiers(){
-    return this.modifiers;
-  }
 
-  public List<Field> getFieldDecl(){
-    return this.fields;
-  }
-  
-  public Optional<Constructor> getfieldInitializations(){
-	    return this.fieldInitializations;
-	  }
-  
-  public List<Method> getMethods(){
-    return this.methods;
-  }
-
-  /*
-  public RefType getType() {
-    return generateTypeOfClass(this.getClassName(), this.getGenerics(), this.getOffset());
-  }
-  */
-  //TODO: Das hier ist ein Problem. Je nach Kontext wird hier ein anderer Typ benötigt
-  public static RefType generateTypeOfClass(JavaClassName name, GenericDeclarationList genericsOfClass ,Token offset){
-    //Hier wird immer ein generischer Typ generiert, also mit Type placeholdern
-    List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
-    for(GenericTypeVar genericTypeVar : genericsOfClass){
-      //params.add(genericTypeVar.getTypePlaceholder());
-      params.add(TypePlaceholder.fresh(offset));
+    public ClassOrInterface(int modifiers, JavaClassName name, List<Field> fielddecl, Optional<Constructor> fieldInitializations, List<Method> methods, List<Constructor> constructors, GenericDeclarationList genericClassParameters,
+                            RefType superClass, Boolean isInterface, List<RefType> implementedInterfaces, Token offset) {
+        this.offset = offset;
+        if (isInterface && !Modifier.isInterface(modifiers)) modifiers += Modifier.INTERFACE;
+        this.modifiers = modifiers;
+        this.name = name;
+        this.fielddecl = fielddecl;
+        this.fieldInitializations = fieldInitializations;
+        this.genericClassParameters = genericClassParameters;
+        this.superClass = superClass;
+        this.isInterface = isInterface;
+        this.implementedInterfaces = implementedInterfaces;
+        this.methods = methods;
+        this.constructors = constructors;
     }
-    return new RefType(name, params, offset);
-  }
 
-  /**
-   * Die Superklasse im Kontext dieser ClassOrInterface
-   * Das bedeutet, dass generische Variablen als GenericRefTypes dargestellt sind
+    /* erzeugt fuer Fields, Konstruktoren und Methoden neue ArrayList-Objekte
+     * alle anderen Datenobjekte werden nur kopiert.
      */
-  public RefType getSuperClass() {
-    return superClass;
-  }
+    public ClassOrInterface(ClassOrInterface cl) {
+        this( cl.modifiers, cl.name, cl.fielddecl, cl.fieldInitializations,  new ArrayList<>(cl.methods), new ArrayList<>(cl.constructors),cl.genericClassParameters,
+                cl.superClass, cl.isInterface, cl.implementedInterfaces, cl.getOffset());// new ArrayList<>(cl.fields)
+    }
 
-  public GenericDeclarationList getGenerics() {
-    return this.genericClassParameters;
-  }
+    //Gets if it is added
+    public Boolean areMethodsAdded() {
+        return methodAdded;
+    }
 
-  @Override
-  public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-    return null;
-  }
+    //Sets that it is added
+    public void setMethodsAdded() {
+        methodAdded = true;
+    }
 
-  public List<Constructor> getConstructors() {
-    return constructors;
-  }
+    // Gets class name
+    public JavaClassName getClassName() {
+        return this.name;
+    }
 
-  @Override
-  public void accept(ASTVisitor visitor) {
-    visitor.visit(this);
-  }
+    // Get modifiers
+    public int getModifiers() {
+        return this.modifiers;
+    }
 
-  public Collection<RefType> getSuperInterfaces() {
-    return implementedInterfaces;
-  }
-  
-  public String toString() {
-	  return this.name.toString() + this.genericClassParameters.toString();
-  }
+    public List<Field> getFieldDecl() {
+        return this.fielddecl;
+    }
+
+    public Optional<Constructor> getfieldInitializations() {
+        return this.fieldInitializations;
+    }
+
+    public List<Method> getMethods() {
+        return this.methods;
+    }
+
+    /*
+    public RefType getType() {
+      return generateTypeOfClass(this.getClassName(), this.getGenerics(), this.getOffset());
+    }
+    */
+    //TODO: Das hier ist ein Problem. Je nach Kontext wird hier ein anderer Typ benötigt
+    public static RefType generateTypeOfClass(JavaClassName name, GenericDeclarationList genericsOfClass, Token offset) {
+        //Hier wird immer ein generischer Typ generiert, also mit Type placeholdern
+        List<RefTypeOrTPHOrWildcardOrGeneric> params = new ArrayList<>();
+        for (GenericTypeVar genericTypeVar : genericsOfClass) {
+            //params.add(genericTypeVar.getTypePlaceholder());
+            params.add(TypePlaceholder.fresh(offset));
+        }
+        return new RefType(name, params, offset);
+    }
+
+    /**
+     * Die Superklasse im Kontext dieser ClassOrInterface
+     * Das bedeutet, dass generische Variablen als GenericRefTypes dargestellt sind
+     */
+    public RefType getSuperClass() {
+        return superClass;
+    }
+
+    public GenericDeclarationList getGenerics() {
+        return this.genericClassParameters;
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+        return superClass;
+    }
+
+    public List<Constructor> getConstructors() {
+        return constructors;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    public Collection<RefType> getSuperInterfaces() {
+        return implementedInterfaces;
+    }
+
+    public String toString() {
+        return this.name.toString() + this.genericClassParameters.toString();
+    }
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Constructor.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Constructor.java
index 24b3bb81..d23b50da 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/Constructor.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Constructor.java
@@ -1,27 +1,23 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
-import de.dhbwstuttgart.syntaxtree.statement.SuperCall;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import org.antlr.v4.runtime.Token;
 
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-
 import java.util.List;
 
-public class Constructor extends Method {
+public record Constructor(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block block,
+						  GenericDeclarationList gtvDeclarations, Token offset /*, List<Statement> fieldInitializations geloescht PL 2018-11-24 */) implements MethodInterface {
 
 
+	private static Method method;
+
 	//TODO: Constructor braucht ein super-Statement
-	public Constructor(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block codeInsideConstructor,
-					   GenericDeclarationList gtvDeclarations, Token offset /*, List<Statement> fieldInitializations geloescht PL 2018-11-24 */) {
-		super(modifier, name, returnType, parameterList, /*codeInsideConstructor,*/ prepareBlock(codeInsideConstructor ) /*,fieldInitializations )geloescht PL 2018-11-24 )*/, gtvDeclarations, offset);
-
+	public Constructor{
+		method = new Method(modifier, name, returnType, parameterList, block, gtvDeclarations, offset);//geloescht PL 2018-11-24 )*//*, gtvDeclarations, offset);
 	}
-
+	public static final ConstraintSet constraints = new ConstraintSet();
 	/**
-	 * @param fieldInitializations - Das sind die Statements,
+	 * //@param fieldInitializations - Das sind die Statements,
 	 *                                welche die Felder der zugehörigen Klasse dieses
 	 *                                Konstruktor initialisieren
 	 */
@@ -32,8 +28,48 @@ public class Constructor extends Method {
 		return new Block(statements, constructorBlock.getOffset());
 	}
 
+	public Block block() {
+		return block;
+	}
+
+	@Override
+	public ParameterList getParameterList() {
+		return null;
+	}
+
+	@Override
+	public Iterable<? extends GenericTypeVar> getGenerics() {
+		return null;
+	}
+
+	@Override
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		return this.returnType;
+	}
+
+	public ConstraintSet getConstraints() {
+		return this.constraints;
+	}
+
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
 	}
+
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+    public Boolean isInherited() {
+		return null;
+    }
+
+	public static Method getMethod() {
+		return method;
+	}
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/DoStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/DoStmt.java
new file mode 100644
index 00000000..52e1bf66
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/DoStmt.java
@@ -0,0 +1,40 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record DoStmt(Expression expr, Statement loopBlock, Token offset) implements WhileInterface {
+    /*public DoStmt(Expression expr, Statement loopBlock, Token offset)
+    {
+        super(expr, loopBlock, offset);
+    }*/
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+
+    }
+
+    @Override
+    public boolean getStatement() {
+        return false;
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/EmptyStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/EmptyStmt.java
new file mode 100644
index 00000000..5f60a180
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/EmptyStmt.java
@@ -0,0 +1,43 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record EmptyStmt(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements Statement {
+    private static boolean isStatement = false;
+
+    public EmptyStmt(Token offset)
+    {
+        this(new Void(offset),offset);
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ExceptionList.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ExceptionList.java
index 78f0020d..f8ff7974 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/ExceptionList.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ExceptionList.java
@@ -1,12 +1,10 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
 import java.util.List;
 
 public class ExceptionList
 {
-    private List<RefTypeOrTPHOrWildcardOrGeneric> exceptions;
+    private final List<RefTypeOrTPHOrWildcardOrGeneric> exceptions;
 
     public ExceptionList(List<RefTypeOrTPHOrWildcardOrGeneric> exceptions){
         this.exceptions = exceptions;
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Expression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Expression.java
new file mode 100644
index 00000000..c2a6f97f
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Expression.java
@@ -0,0 +1,9 @@
+
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface Expression extends TypableStatement permits BinaryExprInterface, CastExpr, FieldVar, LambdaExpression, Literal, NewArray, Receiver, Statement, Super, This {
+
+    void accept(StatementVisitor visitor);
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ExpressionReceiver.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ExpressionReceiver.java
new file mode 100644
index 00000000..032cc60e
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ExpressionReceiver.java
@@ -0,0 +1,32 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record ExpressionReceiver(Expression expr) implements Receiver {
+
+    /*public ExpressionReceiver(Expression expr)
+    {
+        super(expr.getType(), expr.getOffset());
+        this.expr = expr;
+    }*/
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return expr.getOffset();
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return expr.getType();
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ExtendsWildcardType.java
similarity index 69%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/ExtendsWildcardType.java
index 663bc9dc..fab1146c 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/ExtendsWildcardType.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ExtendsWildcardType.java
@@ -1,7 +1,6 @@
-package de.dhbwstuttgart.syntaxtree.type;
+package de.dhbwstuttgart.syntaxtree;
 
 
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
 
@@ -13,16 +12,7 @@ import org.antlr.v4.runtime.Token;
  * 
  */
 
-public class ExtendsWildcardType extends WildcardType{
-	
-	/**
-	* Author: Arne Lüdtke<br/>
-	* Standard Konstruktor für eine ExtendsWildcard
-	*/
-	public ExtendsWildcardType (RefTypeOrTPHOrWildcardOrGeneric extendsType, Token offset)
-	{
-		super(extendsType, offset);
-	}
+public record ExtendsWildcardType(RefTypeOrTPHOrWildcardOrGeneric extendsType, Token offset) implements WildcardTypeInterface {
 
 	@Override
 	public boolean isExtends() {
@@ -34,11 +24,21 @@ public class ExtendsWildcardType extends WildcardType{
 		return false;
 	}
 
+	@Override
+	public RefTypeOrTPHOrWildcardOrGeneric getInnerType() {
+		return extendsType;
+	}
+
 	@Override
 	public String toString() {
 		return "? extends "+innerType.toString();
 	}
 
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Field.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Field.java
index 8a4230e3..985af152 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/Field.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Field.java
@@ -1,44 +1,46 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import org.antlr.v4.runtime.Token;
 
 import java.util.ArrayList;
 
-public class Field extends SyntaxTreeNode implements TypeScope{
 
-	public final int modifier;
-	private String name;
-	private RefTypeOrTPHOrWildcardOrGeneric type;
-    
-	public Field(String name, RefTypeOrTPHOrWildcardOrGeneric type, int modifier, Token offset){
-		super(offset);
-		this.name = name;
-		this.type = type;
-		this.modifier = modifier;
-	}
+public record Field(String name, RefTypeOrTPHOrWildcardOrGeneric type, int modifier, Token offset) implements FieldInterface {
 
-  	public String getName(){
-    return this.name;
-  }
+    public String getName(){
+        return this.name;
+    }
 
-	public RefTypeOrTPHOrWildcardOrGeneric getType() {
-		return type;
-	}
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
 
-	@Override
-	public void accept(ASTVisitor visitor) {
-		visitor.visit(this);
-	}
+    public String name() {
+        return name;
+    }
 
-	@Override
-	public Iterable<? extends GenericTypeVar> getGenerics() {
-		return new ArrayList<>();
-	}
+    public int modifier() {
+        return modifier;
+    }
 
-	@Override
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return type;
-	}
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Iterable<? extends GenericTypeVar> getGenerics() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+        return type;
+    }
 }
 
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
index a0c420e8..adf49193 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldDeclaration.java
@@ -1,28 +1,51 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
 import org.antlr.v4.runtime.Token;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
 /**
  * Eine Feldinitialisation steht für eine Felddeklaration mit gleichzeitiger Wertzuweisung
  * Beispiel: 'public Feld FeldVar = FeldWert;'
  * @author janulrich
  *
  */
-public class FieldDeclaration extends Field{
+public record FieldDeclaration(String name, RefTypeOrTPHOrWildcardOrGeneric typ, int modifier, Expression value, Token offset) implements FieldInterface {
 
-    private Expression wert;
 	
     /**
      * Dieser Konstruktor der FieldDeclaration erstellt den Syntaxknoten vollständig.
      * Kein nachträgliches hinzfügen von Informationen oder aufrufen von parserPostProcessing ist notwendig.
      */
-    public FieldDeclaration(String name, RefTypeOrTPHOrWildcardOrGeneric typ, int modifier, Expression value, Token offset){
-    	super(name, typ, modifier, offset);//Dieser Deklarator wird nicht vom Parser aufgerufen. Dadurch gibt es auch keinen Offset
-    	this.wert = value;
+    public FieldDeclaration{
+       new Field(name, typ, modifier, offset);
     }
 
+    @Override
+    public String getName() {
+        return name;
+    }
 
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return typ;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public Iterable<? extends GenericTypeVar> getGenerics() {
+        return null;
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+        return typ;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/FieldInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldInterface.java
new file mode 100644
index 00000000..5207f42d
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldInterface.java
@@ -0,0 +1,21 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import java.util.ArrayList;
+
+public sealed interface FieldInterface extends TypeScope, SyntaxTreeNode permits FieldDeclaration, Field {
+
+    String getName();
+
+    RefTypeOrTPHOrWildcardOrGeneric getType();
+
+    /*
+        @Override
+        public void accept(ASTVisitor visitor) {
+            visitor.visit(this);
+        }
+    */
+    @Override
+    default Iterable<? extends GenericTypeVar> getGenerics() {
+        return new ArrayList<>();
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/FieldVar.java b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldVar.java
new file mode 100644
index 00000000..dae87d49
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/FieldVar.java
@@ -0,0 +1,31 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record FieldVar(Expression receiver, String fieldVarName, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements Expression {
+
+    @Override
+    public String fieldVarName() {
+        return fieldVarName;
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ForStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ForStmt.java
new file mode 100644
index 00000000..80600d6b
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ForStmt.java
@@ -0,0 +1,46 @@
+
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record ForStmt(int offset, int variableLength) implements Statement {
+    
+    private static Expression head_Initializer_1;
+	private static Expression head_Condition_1;
+	private static Expression head_Loop_expr_1;
+	private static Expression head_Initializer;
+	private static Expression head_Condition;
+	private static Expression head_Loop_expr;
+    private static boolean isStatement = false;
+	public static Block body_Loop_block;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement=true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/FormalParameter.java b/src/main/java/de/dhbwstuttgart/syntaxtree/FormalParameter.java
index 8e7e7983..ca16ff1b 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/FormalParameter.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/FormalParameter.java
@@ -1,19 +1,9 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 import org.antlr.v4.runtime.Token;
 
-public class FormalParameter extends SyntaxTreeNode
+public record FormalParameter(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements SyntaxTreeNode
 {
-    private RefTypeOrTPHOrWildcardOrGeneric type;
-    private String name;
-    
-    public FormalParameter(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
-        super(offset);
-        this.name = name;
-    	this.type = type;
-    }
-
     public RefTypeOrTPHOrWildcardOrGeneric getType() {
         return type;
     }
@@ -22,6 +12,11 @@ public class FormalParameter extends SyntaxTreeNode
         return name;
     }
 
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
index 426b57f3..0e9e5614 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericDeclarationList.java
@@ -15,22 +15,17 @@ import java.util.*;
  * @author janulrich
  * 
  */
-public class GenericDeclarationList extends SyntaxTreeNode implements Iterable<GenericTypeVar>{
+public record GenericDeclarationList(List<GenericTypeVar> gtvs, Token offset, Token offsetOfLastElement) implements Iterable<GenericTypeVar>, SyntaxTreeNode {
 
-	private Token offsetOfLastElement;
-	private List<GenericTypeVar> gtvs = new ArrayList<>();
 
 	@SuppressWarnings("unchecked")
 	public GenericDeclarationList(Iterable<? extends GenericTypeVar> values, Token endOffset) {
-		super(endOffset);
-		gtvs = isListOfGenericTypeVar(values) ? (List<GenericTypeVar>)values : Lists.newArrayList(values);
-		this.offsetOfLastElement = endOffset;
+		this((List<GenericTypeVar>) values, endOffset, endOffset);
 	}
 
 	public GenericDeclarationList(ArrayList<GenericTypeVar> values, Token endOffset) {
-		super(endOffset);
-		gtvs = values;
-		this.offsetOfLastElement = endOffset;	}
+		this(values, endOffset, endOffset);
+	}
 
 	private boolean isListOfGenericTypeVar(Iterable<? extends GenericTypeVar> values) {
 		return values instanceof List && ((List<?>)values).size() > 0 && ((List<?>)values).get(0) instanceof GenericTypeVar;
@@ -41,6 +36,11 @@ public class GenericDeclarationList extends SyntaxTreeNode implements Iterable<G
 		return gtvs.iterator();
 	}
 
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericRefType.java
similarity index 61%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/GenericRefType.java
index 644dbaee..628c74ce 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/GenericRefType.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericRefType.java
@@ -1,23 +1,19 @@
-package de.dhbwstuttgart.syntaxtree.type;
+package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
 
-public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
-{
-    private String name;
-
-    public GenericRefType(String name, Token offset)
-    {
-        super(offset);
-        this.name = name;
-    }
+public record GenericRefType(String name, Token offset) implements RefTypeOrTPHOrWildcardOrGeneric {
 
     public String getParsedName(){
         return name.toString();
     }
 
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);
@@ -25,15 +21,16 @@ public class GenericRefType extends RefTypeOrTPHOrWildcardOrGeneric
 
     @Override
     public <A> A acceptTV(TypeVisitor<A> visitor) {
-        return visitor.visit(this);
+        return null;
     }
 
     @Override
     public void accept(ResultSetVisitor visitor) {
-        visitor.visit(this);
+
     }
 
-	@Override
+
+    @Override
 	public boolean equals(Object o) {
 		// TODO Auto-generated method stub
 		return false;
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
index 6ee03b60..cb704f09 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/GenericTypeVar.java
@@ -1,7 +1,5 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
 import org.antlr.v4.runtime.Token;
 
 import java.util.ArrayList;
@@ -16,20 +14,18 @@ import java.util.List;
  * @author hoti 4.5.06
  * 
  */
-public class GenericTypeVar extends SyntaxTreeNode
+public record GenericTypeVar(String name, List<? extends RefTypeOrTPHOrWildcardOrGeneric> bounds, Token offset, Token endOffset) implements SyntaxTreeNode
 {
 
     /**
      * Hier sind die Bounds in Form von Type-Objekten abgespeichert 
      */
-    List<? extends RefTypeOrTPHOrWildcardOrGeneric> bounds=new ArrayList<RefTypeOrTPHOrWildcardOrGeneric>();
-	private Token endOffset;
-    private String name;
 
-    public GenericTypeVar(String s, List<? extends RefTypeOrTPHOrWildcardOrGeneric> bounds, Token offset, Token endOffset)
+
+    public GenericTypeVar(String name, List<? extends RefTypeOrTPHOrWildcardOrGeneric> bounds, Token offset, Token endOffset)
     {
-        super(offset);
-        name = s;
+        this.offset = offset;
+        this.name = name;
         if(bounds != null)for(RefTypeOrTPHOrWildcardOrGeneric t : bounds){
         	//if(t!=null)this.extendVars.add(t);
         }
@@ -52,11 +48,16 @@ public class GenericTypeVar extends SyntaxTreeNode
         return name.toString();
     }
 
-    /*
-    public JavaClassName definingClass(){
-        return name.getParentClass();
+    @Override
+    public Token getOffset() {
+        return offset;
     }
-*/
+
+    /*
+        public JavaClassName definingClass(){
+            return name.getParentClass();
+        }
+    */
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/IfStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/IfStmt.java
new file mode 100644
index 00000000..7f1e4946
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/IfStmt.java
@@ -0,0 +1,50 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record IfStmt(RefTypeOrTPHOrWildcardOrGeneric type,
+                     Expression expr, Statement thenBlock, Statement elseBlock, Token offset) implements Statement {
+
+
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+
+    public Statement then_block() {
+        return thenBlock;
+    }
+
+
+    public Statement else_block() {
+        return elseBlock;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/InstanceOf.java b/src/main/java/de/dhbwstuttgart/syntaxtree/InstanceOf.java
new file mode 100644
index 00000000..9cfebe82
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/InstanceOf.java
@@ -0,0 +1,39 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.exceptions.NotImplementedException;
+import org.antlr.v4.runtime.Token;
+
+
+public final class InstanceOf implements BinaryExprInterface {
+    public Expression expr;
+    public InstanceOf rexpr;
+    public Expression lexpr;
+    private RefTypeOrTPHOrWildcardOrGeneric reftype;
+    
+    public InstanceOf(int offset,int variableLength)
+    {
+        new BinaryExpr(null, null, null, null, null);
+        throw new NotImplementedException();
+        // #JB# 20.04.2005
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/JavaInternalExpression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/JavaInternalExpression.java
new file mode 100644
index 00000000..c7233b57
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/JavaInternalExpression.java
@@ -0,0 +1,9 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface JavaInternalExpression extends Statement permits UnaryExpr {
+    /*public JavaInternalExpression(RefTypeOrTPHOrWildcardOrGeneric retType, Token offset){
+        super(retType, offset);
+    }*/
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/LambdaExpression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/LambdaExpression.java
new file mode 100644
index 00000000..16a103b8
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/LambdaExpression.java
@@ -0,0 +1,42 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+//import sun.reflect.generics.reflectiveObjects.NotImplementedException;
+
+import java.util.ArrayList;
+
+public record LambdaExpression(RefTypeOrTPHOrWildcardOrGeneric type, ParameterList params, Block methodBody, Token offset) implements TypeScope, Expression {
+
+    @Override
+	public void accept(StatementVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	@Override
+	public Iterable<? extends GenericTypeVar> getGenerics() {
+		//Lambda-Ausdrücke haben keine Generics
+		return new ArrayList<>();
+	}
+
+	@Override
+	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+		//RefType type = (RefType) this.getType();
+		//return type.getParaList().get(0);
+		return methodBody.getType();
+	}
+
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
+	@Override
+	public void accept(ASTVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	@Override
+	public RefTypeOrTPHOrWildcardOrGeneric getType() {
+		return type;
+	}
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Literal.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Literal.java
new file mode 100644
index 00000000..b4bdb0dd
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Literal.java
@@ -0,0 +1,27 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+public record Literal(RefTypeOrTPHOrWildcardOrGeneric type, Object value, Token offset) implements Expression {
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVar.java b/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVar.java
new file mode 100644
index 00000000..61ef3d84
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVar.java
@@ -0,0 +1,42 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record LocalVar(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements Statement {
+    private static boolean isStatement = false;
+
+    public LocalVar(Expression e1, RefTypeOrTPHOrWildcardOrGeneric type, String access)
+    {
+        this(access, type, e1.getOffset());
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVarDecl.java b/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVarDecl.java
new file mode 100644
index 00000000..96895356
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/LocalVarDecl.java
@@ -0,0 +1,44 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+
+public record LocalVarDecl(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements Statement {
+
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Method.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Method.java
index 9eda85e4..81228ab6 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/Method.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Method.java
@@ -3,94 +3,88 @@ package de.dhbwstuttgart.syntaxtree;
 import java.util.ArrayList;
 
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import de.dhbwstuttgart.typeinference.typeAlgo.TYPE;
-import de.dhbwstuttgart.typeinference.typeAlgo.TYPEStmt;
 import org.antlr.v4.runtime.Token;
 
 import de.dhbwstuttgart.core.IItemWithOffset;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
 
 /**
  * Stellt eine Methode dar. Problem: Parser kann nicht zwischen Methode und
  * Konstruktor unterscheiden. Daher kann diese Klasse beides sein. Dies wird mit
  * dem ParserPostProcessing behoben.
- * 
- * @author janulrich
  *
+ * @author janulrich
  */
-public class Method extends SyntaxTreeNode implements IItemWithOffset, TypeScope
-{
-	public final Block block;
-	public final int modifier;
-	public final String name;
-	private ParameterList parameterlist = new ParameterList(new ArrayList<>(), new NullToken());
-	private ExceptionList exceptionlist;
-	private GenericDeclarationList generics;
-	private final RefTypeOrTPHOrWildcardOrGeneric returnType;
-	public final Boolean isInherited; 
-	
-	/*
-	 * its Constraints
-	 * eingefuegt PL 2021-02-15
-	 */
-	public final ConstraintSet constraints = new ConstraintSet();
-	
-	public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block block,
-				  GenericDeclarationList gtvDeclarations, Token offset) {
-		super(offset);
-		this.name = name;
-		this.modifier = modifier;
-		this.returnType = returnType;
-		this.parameterlist = parameterList;
-		this.block = block;
-		this.generics = gtvDeclarations;
-		this.isInherited = false;
-	}
-	
-	public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block block,
-			  GenericDeclarationList gtvDeclarations, Token offset, Boolean isInherited) {
-		super(offset);
-		this.name = name;
-		this.modifier = modifier;
-		this.returnType = returnType;
-		this.parameterlist = parameterList;
-		this.block = block;
-		this.generics = gtvDeclarations;
-		this.isInherited = isInherited;
-	}
+public record Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList,
+                     Block blockVar,
+                     GenericDeclarationList generics, Token offset, Boolean isInherited) implements MethodInterface {
 
-	public ParameterList getParameterList() {
-		return parameterlist;
-	}
+    private static ExceptionList exceptionlist;
+    public static Block block;
 
-	public Iterable<? extends GenericTypeVar> getGenerics() {
-		return generics;
-	}
+    /*
+     * its Constraints
+     * eingefuegt PL 2021-02-15
+     */
+    public static final ConstraintSet constraints = new ConstraintSet();
 
-	@Override
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		return this.returnType;
-	}
+    public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block blockVar,
+                  GenericDeclarationList generics, Token offset, Boolean isInherited) {
+        this.offset = offset;
+        this.name = name;
+        this.modifier = modifier;
+        this.returnType = returnType;
+        this.parameterList = parameterList;
+        this.blockVar = blockVar;
+        this.generics = generics;
+        this.isInherited = isInherited;
+        this.block = blockVar;
+    }
 
-	public ConstraintSet getConstraints() {
-		return this.constraints;
-	}
-	
-	@Override
-	public void accept(ASTVisitor visitor) {
-		visitor.visit(this);
-	}
+    public Method(int modifier, String name, RefTypeOrTPHOrWildcardOrGeneric returnType, ParameterList parameterList, Block blockVar,
+                  GenericDeclarationList generics, Token offset) {
+        this(modifier, name, returnType, parameterList, blockVar,
+                generics, offset, false);
+    }
 
-	@Override
-	public Token getOffset() {
-		return super.getOffset();
-	}
+    public ParameterList getParameterList() {
+        return parameterList;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public Iterable<? extends GenericTypeVar> getGenerics() {
+        return generics;
+    }
+
+    @Override
+    public String name() {
+        return name;
+    }
+
+    @Override
+    public int modifier() {
+        return modifier;
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
+        return this.returnType;
+    }
+
+    public ConstraintSet getConstraints() {
+        return this.constraints;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    public String getName() {
+        return name;
+    }
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCall.java
new file mode 100644
index 00000000..d2f67697
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCall.java
@@ -0,0 +1,52 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+import java.util.*;
+
+import static de.dhbwstuttgart.syntaxtree.This.arglist;
+
+
+public record MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String name, ArgumentList argList,
+                         RefTypeOrTPHOrWildcardOrGeneric receiverType, ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset) implements MethodCallInterface {
+
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    public ArgumentList getArgumentList() {
+        return arglist;
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return receiverType;
+    }
+
+    public ArgumentList arglist() {
+        return arglist;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCallInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCallInterface.java
new file mode 100644
index 00000000..7f1d74d6
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodCallInterface.java
@@ -0,0 +1,12 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+import java.util.*;
+
+
+
+public sealed interface MethodCallInterface extends Statement permits MethodCall, NewClass, SuperCall, ThisCall {
+
+    public ArgumentList getArgumentList();
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/MethodInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodInterface.java
new file mode 100644
index 00000000..7823061a
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/MethodInterface.java
@@ -0,0 +1,24 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.core.IItemWithOffset;
+import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
+import org.antlr.v4.runtime.Token;
+
+public sealed interface MethodInterface extends IItemWithOffset, TypeScope, SyntaxTreeNode permits Method, Constructor {
+    ParameterList getParameterList();
+
+    Iterable<? extends GenericTypeVar> getGenerics();
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getReturnType();
+
+    public ConstraintSet getConstraints();
+
+    @Override
+    public void accept(ASTVisitor visitor);
+
+    @Override
+    public Token getOffset();
+
+    public String getName();
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/NewArray.java b/src/main/java/de/dhbwstuttgart/syntaxtree/NewArray.java
new file mode 100644
index 00000000..3523a3ec
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/NewArray.java
@@ -0,0 +1,34 @@
+package de.dhbwstuttgart.syntaxtree;
+import org.antlr.v4.runtime.Token;
+
+import java.util.List;
+
+
+public record NewArray(int offset,int variableLength) implements Expression {
+    /*public NewArray(int offset,int variableLength)
+    {
+        super(null,null);
+    }*/
+    private static RefTypeOrTPHOrWildcardOrGeneric type;
+    public static List<Expression> expr;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/NewClass.java b/src/main/java/de/dhbwstuttgart/syntaxtree/NewClass.java
new file mode 100644
index 00000000..4bff95c5
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/NewClass.java
@@ -0,0 +1,75 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import java.util.ArrayList;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record NewClass(RefType newClass, ArgumentList args, RefTypeOrTPHOrWildcardOrGeneric receiverType,
+                       ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes,
+                       Token start) implements MethodCallInterface {
+
+    private static MethodCall methodcall;
+    private static boolean isStatement = false;
+
+    /**
+     * @param newClass Typ der Instanzierten Klasse
+     * @param args     Argumente mit denen der New-Call aufgerufen wurde
+     * @param start
+     */
+    public NewClass {
+        methodcall = new MethodCall(newClass, new ExpressionReceiver(new EmptyStmt(start)), newClass.getName().toString(),
+                args, receiverType, argTypes, start);
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public ArgumentList getArgumentList() {
+        return args;
+    }
+
+    @Override
+    public void setStatement() {
+    isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return start;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return receiverType;
+    }
+
+    public char[] name() {
+        return newClass.getName().toString().toCharArray();
+    }
+
+    public ArgumentList arglist() {
+        return args;
+    }
+
+    public static MethodCall getMethodcall() {
+        return methodcall;
+    }
+
+    public RefTypeOrTPHOrWildcardOrGeneric receiver() {
+        return receiverType;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ParameterList.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ParameterList.java
index 2540f907..de85654d 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/ParameterList.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ParameterList.java
@@ -8,13 +8,11 @@ import java.util.Iterator;
 import java.util.List;
 
 
-public class ParameterList extends SyntaxTreeNode implements Iterable<FormalParameter>
-{
-    private List<FormalParameter> formalparameter;
+public record ParameterList(List<FormalParameter> formalparameter, Token offset) implements Iterable<FormalParameter>, SyntaxTreeNode {
     
-    public ParameterList(List<FormalParameter> params, Token offset){
-        super(offset);
-        this.formalparameter = params;
+    public ParameterList(List<FormalParameter> formalparameter, Token offset){
+        this.offset = offset;
+        this.formalparameter = formalparameter;
     }
 
     public FormalParameter getParameterAt(int i)
@@ -35,6 +33,11 @@ public class ParameterList extends SyntaxTreeNode implements Iterable<FormalPara
 		return formalparameter.iterator();
 	}
 
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Receiver.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Receiver.java
new file mode 100644
index 00000000..7715afcc
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Receiver.java
@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface Receiver extends Expression permits ExpressionReceiver, StaticClassName {
+
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/RefInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/RefInterface.java
new file mode 100644
index 00000000..afc719d9
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/RefInterface.java
@@ -0,0 +1,16 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+
+import java.util.List;
+
+public sealed interface RefInterface extends RefTypeOrTPHOrWildcardOrGeneric permits RefType, Void {
+
+
+        /**
+         * Author: Jrg Buerle<br/>
+         * @return
+         */
+        public boolean equals(Object obj);
+
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/RefType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/RefType.java
similarity index 77%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/RefType.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/RefType.java
index 26f25fcf..28a35b6d 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/RefType.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/RefType.java
@@ -1,7 +1,6 @@
-package de.dhbwstuttgart.syntaxtree.type;
+package de.dhbwstuttgart.syntaxtree;
 
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
 
@@ -10,25 +9,24 @@ import java.util.Iterator;
 import java.util.List;
 
 
-public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
-{
-	protected final JavaClassName name;
-    protected final List<RefTypeOrTPHOrWildcardOrGeneric> parameter;
+public record RefType(JavaClassName name, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset) implements RefInterface {
+
     /**
      * Ist primitiveFlag auf true, muss beim Codegen dieser Reftype durch
      * den primitiven Datentyp ersetzt werden
      *
      * Bsp: java.lang.Integer mit Flag wird dann zu [int]
      */
-    private boolean primitiveFlag=false;
+    private static boolean primitiveFlag=false;
 
-    public RefType(JavaClassName fullyQualifiedName, Token offset)
+   public RefType(JavaClassName fullyQualifiedName, Token offset)
     {
         this(fullyQualifiedName, new ArrayList<>(), offset);
     }
 
     @Override
-    public String toString(){
+    public String toString()
+    {
         String params = "";
         if(parameter.size()>0){
             params += "<";
@@ -46,20 +44,12 @@ public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
     @Override
 	public int hashCode() {
     	int hash = 0;
-    	hash += super.hashCode();
+    	//hash += RefTypeOrTPHOrWildcardOrGeneric.super.hashCode();
     	hash += this.name.hashCode();//Nur den Name hashen. Sorgt für langsame, aber funktionierende HashMaps
         return hash;
 	}
 
-    public RefType(JavaClassName fullyQualifiedName, List<RefTypeOrTPHOrWildcardOrGeneric> parameter, Token offset)
-    {
-        super(offset);
-        this.name = (fullyQualifiedName);
-        this.parameter = parameter;
-    }
-
-    public JavaClassName getName()
-    {
+    public JavaClassName getName() {
         return name;
     }
 
@@ -105,21 +95,25 @@ public class RefType extends RefTypeOrTPHOrWildcardOrGeneric
             return false;
         }
     }
-    	
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
 
     @Override
     public void accept(ASTVisitor visitor) {
-        visitor.visit(this);
+
     }
 
     @Override
     public <A> A acceptTV(TypeVisitor<A> visitor) {
-        return visitor.visit(this);
+        return null;
     }
 
     @Override
     public void accept(ResultSetVisitor visitor) {
-        visitor.visit(this);
+
     }
 }
 
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/RefTypeOrTPHOrWildcardOrGeneric.java b/src/main/java/de/dhbwstuttgart/syntaxtree/RefTypeOrTPHOrWildcardOrGeneric.java
new file mode 100644
index 00000000..20dd2768
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/RefTypeOrTPHOrWildcardOrGeneric.java
@@ -0,0 +1,14 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
+
+public sealed interface RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode permits GenericRefType, RefInterface, TypePlaceholder, WildcardTypeInterface {
+
+    @Override
+    public abstract boolean equals(Object o);
+    @Override
+    public abstract void accept(ASTVisitor visitor);
+
+    public abstract <A> A acceptTV(TypeVisitor<A> visitor);
+    public abstract void accept(ResultSetVisitor visitor);
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Return.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Return.java
new file mode 100644
index 00000000..d3db7549
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Return.java
@@ -0,0 +1,43 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+
+public record Return(Expression retExpr, Token offset) implements ReturnInterface {
+
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return retExpr.getType();
+    }
+
+    public Expression retexpr() {
+        return retExpr;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnInterface.java
new file mode 100644
index 00000000..1600c9db
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnInterface.java
@@ -0,0 +1,8 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface ReturnInterface extends Statement permits Return, ReturnVoid {
+
+}
+
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnVoid.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnVoid.java
new file mode 100644
index 00000000..eefd00bd
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ReturnVoid.java
@@ -0,0 +1,41 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record ReturnVoid(EmptyStmt emtStmt, Token offset) implements ReturnInterface {
+    private static boolean isStatement = false;
+
+    public ReturnVoid(Token offset) {
+        this(new EmptyStmt(offset), offset);
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return emtStmt().getType();
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java b/src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java
index f9ec340b..12bcbbee 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/SourceFile.java
@@ -1,4 +1,5 @@
 package de.dhbwstuttgart.syntaxtree;
+
 import java.io.File;
 import java.util.*;
 
@@ -6,54 +7,53 @@ import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
+import org.antlr.v4.runtime.Token;
 //import sun.security.x509.X509CertInfo;
 
 
-public class SourceFile extends SyntaxTreeNode{
-  private String pkgName;
+public record SourceFile(String pkgName, List<ClassOrInterface> KlassenVektor, Set<JavaClassName> imports,
+                         Token offset) implements SyntaxTreeNode {
 
-  public final List<ClassOrInterface> KlassenVektor;
-  public final Set<JavaClassName> imports;
 
-  /**
+    /**
      * Die SourceFile repräsntiert eine zu einem Syntaxbaum eingelesene Java-Datei.
      * SourceFile stellt dabei den Wurzelknoten des Syntaxbaumes dar.
      */
-  public SourceFile(String pkgName, List<ClassOrInterface> classDefinitions, Set<JavaClassName> imports){
-    super(new NullToken());
-    this.KlassenVektor = classDefinitions;
-    this.pkgName = pkgName;
-    this.imports = imports;
-  }
-  
-  public SourceFile(SourceFile sf) {
-	  super(new NullToken());
-	  this.KlassenVektor = new ArrayList<>(sf.KlassenVektor);
-	  this.imports = new HashSet<>(sf.imports);
-  }
-  
-  
-  public String getPkgName(){
-    return this.pkgName;
-  }
+    public SourceFile(String pkgName, List<ClassOrInterface> classDefinitions, Set<JavaClassName> imports) {
+        this(pkgName, classDefinitions, imports, new NullToken());
+    }
 
-  // Get imports (to test implementation)
-  public Set<JavaClassName> getImports(){
-    return this.imports;
-  }
+    public SourceFile(SourceFile sf) {
+        this(sf.pkgName, new ArrayList<>(sf.KlassenVektor), new HashSet<>(sf.imports), new NullToken());
+    }
 
-  public List<ClassOrInterface> getClasses() {
-    return KlassenVektor;
-  }
-  
-  public List<Method> getAllMethods() {
-	  List<Method> ret = new ArrayList<>();
-	  getClasses().forEach(cl -> ret.addAll(cl.getMethods()));
-	  return ret;
-  }
 
-  @Override
-  public void accept(ASTVisitor visitor) {
-    visitor.visit(this);
-  }
+    public String getPkgName() {
+        return this.pkgName;
+    }
+
+    // Get imports (to test implementation)
+    public Set<JavaClassName> getImports() {
+        return this.imports;
+    }
+
+    public List<ClassOrInterface> getClasses() {
+        return KlassenVektor;
+    }
+
+    public List<Method> getAllMethods() {
+        List<Method> ret = new ArrayList<>();
+        getClasses().forEach(cl -> ret.addAll(cl.getMethods()));
+        return ret;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Statement.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Statement.java
new file mode 100644
index 00000000..b3e364c8
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Statement.java
@@ -0,0 +1,18 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+
+public sealed interface Statement extends Expression permits Assign, Block, EmptyStmt, ForStmt, IfStmt, JavaInternalExpression, LocalVar, LocalVarDecl, MethodCallInterface, ReturnInterface, WhileInterface {
+	/* zeigt an, dass eine StatementExpression als Statement benutzt wird
+     */
+    
+   /* public Statement(RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
+    {
+        super(type, offset);
+    }*/
+
+    public void setStatement();
+    
+    public boolean getStatement();
+}
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/StatementVisitor.java b/src/main/java/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
index d6e0d1d5..95239a91 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/StatementVisitor.java
@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.syntaxtree;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.statement.*;
 
 public interface StatementVisitor {
 
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/StaticClassName.java b/src/main/java/de/dhbwstuttgart/syntaxtree/StaticClassName.java
new file mode 100644
index 00000000..4c10cdd9
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/StaticClassName.java
@@ -0,0 +1,30 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+import org.antlr.v4.runtime.Token;
+
+public record StaticClassName(JavaClassName className, Token offset) implements Receiver {
+    /*public StaticClassName(JavaClassName className, Token offset) {
+        super(new RefType(className, offset), offset);
+    }*/
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Super.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Super.java
new file mode 100644
index 00000000..2e4bf228
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Super.java
@@ -0,0 +1,26 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record Super(Token offset) implements Expression {
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/SuperCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/SuperCall.java
new file mode 100644
index 00000000..ba1088ce
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/SuperCall.java
@@ -0,0 +1,69 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+import java.util.ArrayList;
+
+
+public record SuperCall(ArgumentList argumentList, RefTypeOrTPHOrWildcardOrGeneric receiverType,
+                        ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes,
+                        Token offset) implements MethodCallInterface {
+    private static boolean isStatement = false;
+
+    public SuperCall(RefTypeOrTPHOrWildcardOrGeneric receiverType,
+                     ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset) {
+        this(new ArgumentList(new ArrayList<Expression>(), offset), receiverType, argTypes, offset);
+    }
+
+    public SuperCall {
+        new MethodCall(new Void(offset), new ExpressionReceiver(new This(offset)), "<init>", argumentList, receiverType, argTypes, offset);
+    }
+
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public ArgumentList getArgumentList() {
+        return argumentList;
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return receiverType;
+    }
+
+    public RefTypeOrTPHOrWildcardOrGeneric getReceiver() {
+        return receiverType;
+    }
+
+    public ArgumentList arglist() {
+        return argumentList;
+    }
+
+    public String name() {
+        return "<init>";
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/SuperWildcardType.java
similarity index 75%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/SuperWildcardType.java
index 6a61b9cb..fc40378f 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/SuperWildcardType.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/SuperWildcardType.java
@@ -1,7 +1,6 @@
-package de.dhbwstuttgart.syntaxtree.type;
+package de.dhbwstuttgart.syntaxtree;
 
 
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
 
@@ -13,16 +12,7 @@ import org.antlr.v4.runtime.Token;
  * 
  */
 
-public class SuperWildcardType extends WildcardType{
-
-	/**
-	* Author: Arne Lüdtke<br/>
-	* Standard Konstruktor für eine SuperWildcard
-	*/
-	public SuperWildcardType( RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset)
-	{
-		super(innerType, offset);
-	}
+public record SuperWildcardType(RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset) implements WildcardTypeInterface {
 	
 	/**
 	* Author: Arne Lüdtke<br/>
@@ -50,6 +40,11 @@ public class SuperWildcardType extends WildcardType{
 		return true;
 	}
 
+	@Override
+	public Token getOffset() {
+		return offset;
+	}
+
 	@Override
 	public void accept(ASTVisitor visitor) {
 		visitor.visit(this);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/SwitchTest.java b/src/main/java/de/dhbwstuttgart/syntaxtree/SwitchTest.java
new file mode 100644
index 00000000..43f6f117
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/SwitchTest.java
@@ -0,0 +1,161 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.parser.NullToken;
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+
+
+public class SwitchTest {
+    public static void main(String[] args) {
+        printSyntax(new ClassOrInterface(Modifier.PUBLIC, new JavaClassName("Test"), new ArrayList<>(), java.util.Optional.empty(), new ArrayList<>(), new ArrayList<>(), new GenericDeclarationList(new ArrayList<>(), new NullToken()),
+                new RefType(new JavaClassName("Object"), new NullToken()), false, new ArrayList<>(), new NullToken()));
+    }
+
+    static void printSyntax(SyntaxTreeNode s){
+        switch (s){
+
+            case ArgumentList argumentList -> {
+                System.out.println("argumentList");
+            }
+            case ClassOrInterface classOrInterface -> {
+                System.out.println("ClassOrInterface: \n" +
+                        "Modifier = " + classOrInterface.getModifiers() + "\n" +
+                        "Classname = " + classOrInterface.getClassName());
+            }
+            case FormalParameter formalParameter -> {
+                System.out.println("formalParameter");
+            }
+            case GenericDeclarationList genericDeclarationList -> {
+                System.out.println("genericDeclarationList");
+            }
+            case GenericTypeVar genericTypeVar -> {
+                System.out.println("genericTypeVar");
+            }
+            case ParameterList parameterList -> {
+                System.out.println("parameterList");
+            }
+            case SourceFile sourceFile -> {
+                System.out.println("sourceFile");
+            }
+            case FieldDeclaration fieldDeclaration -> {
+                System.out.println("fieldDeclaration");
+            }
+            case Field field -> {
+                System.out.println("field");
+            }
+            case Method method -> {
+                System.out.println("method");
+            }
+            case Constructor constructor -> {
+                System.out.println("constructor");
+            }
+            case GenericRefType genericRefType -> {
+                System.out.println("genericRefType");
+            }
+            case RefType refType -> {
+                System.out.println("refType");
+            }
+            case TypePlaceholder typePlaceholder -> {
+                System.out.println("typePlace");
+            }
+            case AssignLeftSide assignLeftSide -> {
+                System.out.println("assignLeftSide");
+            }
+            case Void aVoid -> {
+                System.out.println("void");
+            }
+            case ExtendsWildcardType extendsWildcardType -> {
+                System.out.println("extendsWildcardType");
+            }
+            case SuperWildcardType superWildcardType -> {
+                System.out.println("superWildcardType");
+            }
+            case WildcardType wildcardType -> {
+                System.out.println("wildcardType");
+            }
+            case CastExpr castExpr -> {
+                System.out.println("castExpr");
+            }
+            case FieldVar fieldVar -> {
+                System.out.println("fieldVar");
+            }
+            case LambdaExpression lambdaExpression -> {
+                System.out.println("lambdaExpression");
+            }
+            case Literal literal -> {
+                System.out.println("literal");
+            }
+            case NewArray newArray -> {
+                System.out.println("newArray");
+            }
+            case Super aSuper -> {
+                System.out.println("Super");
+            }
+            case This aThis -> {
+                System.out.println("This");
+            }
+            case BinaryExpr binaryExpr -> {
+                System.out.println("binaryExpr");
+            }
+            case InstanceOf instanceOf -> {
+                System.out.println("instanceOf");
+            }
+            case ExpressionReceiver expressionReceiver -> {
+                System.out.println("expressionReceiver");
+            }
+            case StaticClassName staticClassName -> {
+                System.out.println("staticClassName");
+            }
+            case Assign assign -> {
+                System.out.println("assign");
+            }
+            case Block block -> {
+                System.out.println("block");
+            }
+            case EmptyStmt emptyStmt -> {
+                System.out.println("emptyStmt");
+            }
+            case ForStmt forStmt -> {
+                System.out.println("forStmt");
+            }
+            case IfStmt ifStmt -> {
+                System.out.println("ifStmt");
+            }
+            case LocalVar localVar -> {
+                System.out.println("localVar");
+            }
+            case LocalVarDecl localVarDecl -> {
+                System.out.println("localVarDecl");
+            }
+            case UnaryExpr unaryExpr -> {
+                System.out.println("unaryExpr");
+            }
+            case MethodCall methodCall -> {
+                System.out.println("methodCall");
+            }
+            case NewClass newClass -> {
+                System.out.println("newClass");
+            }
+            case SuperCall superCall -> {
+                System.out.println("superCall");
+            }
+            case ThisCall thisCall -> {
+                System.out.println("thisCall");
+            }
+            case Return aReturn -> {
+                System.out.println("Return");
+            }
+            case ReturnVoid returnVoid -> {
+                System.out.println("returnVoid");
+            }
+            case DoStmt doStmt -> {
+                System.out.println("doStmt");
+            }
+            case WhileStmt whileStmt -> {
+                System.out.println("whileStmt");
+            }
+        }
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java b/src/main/java/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java
index a9886e27..60e9fa45 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/SyntaxTreeNode.java
@@ -1,23 +1,16 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import de.dhbwstuttgart.core.IItemWithOffset;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import org.antlr.v4.runtime.Token;
 //import org.antlr.v4.runtime.misc.Pair;
 
-public abstract class SyntaxTreeNode implements IItemWithOffset{
-    private final Token offset;
+public sealed interface SyntaxTreeNode extends IItemWithOffset permits ArgumentList, ClassOrInterface, FieldInterface, FormalParameter, GenericDeclarationList, GenericTypeVar, MethodInterface, ParameterList, RefTypeOrTPHOrWildcardOrGeneric, SourceFile, TypableStatement {
+    /*
+        public SyntaxTreeNode(Token offset){
+            this.offset = offset;
+        }
+    */
+    Token getOffset();
 
-    public SyntaxTreeNode(Token offset){
-        this.offset = offset;
-    }
-
-    public Token getOffset(){
-        return offset;
-    }
-
-    public abstract void accept(ASTVisitor visitor);
+    void accept(ASTVisitor visitor);
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/This.java b/src/main/java/de/dhbwstuttgart/syntaxtree/This.java
new file mode 100644
index 00000000..5c171543
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/This.java
@@ -0,0 +1,36 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public record This(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) implements Expression {
+    public This(Token offset)
+    {
+        this(TypePlaceholder.fresh(offset),offset);
+    }
+    
+    public static ArgumentList arglist;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+    
+    public String toString() {
+    	return "this: "+ this.getType();
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return type;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/ThisCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/ThisCall.java
new file mode 100644
index 00000000..34768300
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/ThisCall.java
@@ -0,0 +1,46 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+public record ThisCall(Receiver receiver, ArgumentList arglist, int offset) implements MethodCallInterface {
+
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+
+    }
+
+    @Override
+    public ArgumentList getArgumentList() {
+        return arglist;
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return null;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return receiver().getType();
+    }
+}
+
+
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/TypableStatement.java b/src/main/java/de/dhbwstuttgart/syntaxtree/TypableStatement.java
new file mode 100644
index 00000000..544afd8c
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/TypableStatement.java
@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface TypableStatement extends SyntaxTreeNode permits AssignLeftSide, Expression {
+    RefTypeOrTPHOrWildcardOrGeneric getType();
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java b/src/main/java/de/dhbwstuttgart/syntaxtree/TypePlaceholder.java
similarity index 73%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/TypePlaceholder.java
index 38932247..fae24ba6 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/TypePlaceholder.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/TypePlaceholder.java
@@ -1,8 +1,5 @@
-package de.dhbwstuttgart.syntaxtree.type;
-import java.util.Hashtable;
+package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
 import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
 import org.antlr.v4.runtime.Token;
@@ -15,26 +12,12 @@ import org.antlr.v4.runtime.Token;
  * @author J�rg B�uerle
  * @version $Date: 2013/06/19 12:45:37 $
  */
-public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
-{
-	private final String name;
+public record TypePlaceholder(String name, Token offset) implements RefTypeOrTPHOrWildcardOrGeneric {
 	
 	/**
 	 * wird im Generate Generics Teil nach der Rueckumwandlung nach dem Unify genutzt
 	 */
-	private int variance = 0;
-
-
-    /**
-     * Privater Konstruktor - Eine TypePlaceholder-Variable wird �ber die
-     * Factory-Methode <code>fresh()</code> erzeugt.
-     * <br>Author: J�rg B�uerle
-     */
-    private TypePlaceholder(String name, Token offset)
-    {
-        super(offset);
-        this.name = name;
-    }
+	private static int variance = 0;
     
     
     /**
@@ -84,7 +67,12 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
     public int getVariance() {
     	return this.variance;
     }
-    
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
     @Override
     public void accept(ASTVisitor visitor) {
         visitor.visit(this);
@@ -92,11 +80,12 @@ public class TypePlaceholder extends RefTypeOrTPHOrWildcardOrGeneric
 
     @Override
     public <A> A acceptTV(TypeVisitor<A> visitor) {
-        return visitor.visit(this);
+        return null;
     }
 
     @Override
     public void accept(ResultSetVisitor visitor) {
-        visitor.visit(this);
+
     }
+
 }
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/TypeScope.java b/src/main/java/de/dhbwstuttgart/syntaxtree/TypeScope.java
index f651648b..9ae3138c 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/TypeScope.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/TypeScope.java
@@ -1,9 +1,5 @@
 package de.dhbwstuttgart.syntaxtree;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-import java.util.Collection;
-
 
 public interface TypeScope {
     Iterable<? extends GenericTypeVar> getGenerics();
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/TypeVisitor.java b/src/main/java/de/dhbwstuttgart/syntaxtree/TypeVisitor.java
similarity index 86%
rename from src/main/java/de/dhbwstuttgart/syntaxtree/type/TypeVisitor.java
rename to src/main/java/de/dhbwstuttgart/syntaxtree/TypeVisitor.java
index a3b7796f..427ae3ac 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/TypeVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/TypeVisitor.java
@@ -1,4 +1,4 @@
-package de.dhbwstuttgart.syntaxtree.type;
+package de.dhbwstuttgart.syntaxtree;
 
 public interface TypeVisitor<A> {
     A visit(RefType refType);
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/UnaryExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/UnaryExpr.java
new file mode 100644
index 00000000..901f6447
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/UnaryExpr.java
@@ -0,0 +1,48 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+public record UnaryExpr(Operation operation, Expression expr, RefTypeOrTPHOrWildcardOrGeneric retType,
+                        Token offset) implements JavaInternalExpression {
+    private static boolean isStatement = false;
+
+    public enum Operation {
+        NOT,
+        MINUS,
+        PREINCREMENT,
+        PREDECREMENT,
+        POSTINCREMENT,
+        PLUS, POSTDECREMENT
+    }
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return retType;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/Void.java b/src/main/java/de/dhbwstuttgart/syntaxtree/Void.java
new file mode 100644
index 00000000..3e82f44f
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/Void.java
@@ -0,0 +1,35 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
+import org.antlr.v4.runtime.Token;
+
+import de.dhbwstuttgart.parser.scope.JavaClassName;
+
+import java.util.List;
+
+
+public record Void(Token offset) implements RefInterface {
+    public Void {
+        new RefType(JavaClassName.Void, offset);
+    }
+
+    public Token getOffset() {
+        return offset;
+    }
+
+
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public <A> A acceptTV(TypeVisitor<A> visitor) {
+        return null;
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+
+    }
+}
+
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/WhileInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/WhileInterface.java
new file mode 100644
index 00000000..0a1d9dad
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/WhileInterface.java
@@ -0,0 +1,7 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import org.antlr.v4.runtime.Token;
+
+public sealed interface WhileInterface extends Statement permits DoStmt, WhileStmt {
+
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/WhileStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/WhileStmt.java
new file mode 100644
index 00000000..b806810d
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/WhileStmt.java
@@ -0,0 +1,39 @@
+package de.dhbwstuttgart.syntaxtree;
+
+
+import org.antlr.v4.runtime.Token;
+
+public record WhileStmt(Expression expr, Statement loopBlock, Token offset) implements WhileInterface
+{
+    private static boolean isStatement = false;
+
+    @Override
+    public void accept(StatementVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public void setStatement() {
+        isStatement = true;
+    }
+
+    @Override
+    public boolean getStatement() {
+        return isStatement;
+    }
+
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getType() {
+        return null;
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardType.java
new file mode 100644
index 00000000..1af6c26e
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardType.java
@@ -0,0 +1,46 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
+import org.antlr.v4.runtime.Token;
+
+public record WildcardType(RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset) implements WildcardTypeInterface {
+    @Override
+    public Token getOffset() {
+        return offset;
+    }
+
+    @Override
+    public void accept(ASTVisitor visitor) {
+
+    }
+
+    @Override
+    public RefTypeOrTPHOrWildcardOrGeneric getInnerType() {
+        return innerType;
+    }
+
+    @Override
+    public String toString(){
+        return "?";
+    }
+
+    @Override
+    public boolean isExtends() {
+        return false;
+    }
+
+    @Override
+    public boolean isSuper() {
+        return false;
+    }
+
+    @Override
+    public <A> A acceptTV(TypeVisitor<A> visitor) {
+        return null;
+    }
+
+    @Override
+    public void accept(ResultSetVisitor visitor) {
+
+    }
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardTypeInterface.java b/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardTypeInterface.java
new file mode 100644
index 00000000..88f552e8
--- /dev/null
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/WildcardTypeInterface.java
@@ -0,0 +1,45 @@
+package de.dhbwstuttgart.syntaxtree;
+
+import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
+import org.antlr.v4.runtime.Token;
+
+/**
+ *  Stellt eine Wildcard in Java dar.
+ *  z.B. void Test(? var){..}
+ * @author luar 2.12.06
+ * 
+ */
+
+public sealed interface WildcardTypeInterface extends RefTypeOrTPHOrWildcardOrGeneric permits ExtendsWildcardType, SuperWildcardType, WildcardType {
+	
+	RefTypeOrTPHOrWildcardOrGeneric innerType = null;
+	
+	/**
+	* Author: Arne Lüdtke<br/>
+	* Standard Konstruktor für eine Wildcard
+	*/
+	/*WildcardTypeInterface(RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset)
+	{
+		super(offset);
+		this.innerType = innerType;
+	}*/
+
+	RefTypeOrTPHOrWildcardOrGeneric getInnerType();
+	
+	/**
+	* Author: Arne Lüdtke<br/>
+	* Gibt String Entsprechung zurück.
+	*/
+	String toString();/*
+	{
+		return "?";
+	}*/
+
+
+	boolean isExtends();
+	boolean isSuper();
+
+	<A> A acceptTV(TypeVisitor<A> visitor);
+
+	void accept(ResultSetVisitor visitor);
+}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java b/src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
index 79b6d281..7b5943cb 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/factory/ASTFactory.java
@@ -9,19 +9,14 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.parser.SyntaxTreeGenerator.GenericContext;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.parser.scope.JavaClassRegistry;
 import de.dhbwstuttgart.syntaxtree.Field;
 import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.syntaxtree.type.Void;
+import de.dhbwstuttgart.syntaxtree.Void;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
-import de.dhbwstuttgart.syntaxtree.type.WildcardType;
+import de.dhbwstuttgart.syntaxtree.Block;
+import de.dhbwstuttgart.syntaxtree.Statement;
 import org.antlr.v4.runtime.Token;
 
 /**
@@ -219,7 +214,7 @@ public class ASTFactory {
 	/*
 	public Constructor createEmptyConstructor(Class parent){
 		Block block = new Block();
-		block.setType(new de.dhbwstuttgart.syntaxtree.type.Void(block, 0));
+		block.setType(new de.dhbwstuttgart.syntaxtree.Void(block, 0));
 		block.statements.add(new SuperCall(block));
 
 		return ASTFactory.createConstructor(parent, new ParameterList(), block);
@@ -229,7 +224,7 @@ public class ASTFactory {
 		block.parserPostProcessing(superClass);
 
 		Method method = ASTFactory.createMethod("<init>", paralist, block, superClass);
-		method.setType(new de.dhbwstuttgart.syntaxtree.type.Void(block, 0));
+		method.setType(new de.dhbwstuttgart.syntaxtree.Void(block, 0));
 
 		return new Constructor(method, superClass);
 	}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java b/src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
index 468f9647..c6133e9a 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/factory/UnifyTypeFactory.java
@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.syntaxtree.factory;
 
-import java.io.FileWriter;
 import java.io.Writer;
 import java.util.*;
 import java.util.regex.Matcher;
@@ -11,10 +10,9 @@ import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.FCGenerator;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.syntaxtree.type.Void;
-import de.dhbwstuttgart.syntaxtree.type.WildcardType;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.Void;
+import de.dhbwstuttgart.syntaxtree.WildcardTypeInterface;
 import de.dhbwstuttgart.typeinference.constraints.Constraint;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
@@ -138,7 +136,7 @@ public class UnifyTypeFactory {
         return new ReferenceType(t.getParsedName(), true);
     }
 
-    public static UnifyType convert(WildcardType t, Boolean innerType){
+    public static UnifyType convert(WildcardTypeInterface t, Boolean innerType){
         if(t.isExtends())
             return new ExtendsType(UnifyTypeFactory.convert(t.getInnerType(), false));
         else if(t.isSuper())
@@ -224,8 +222,8 @@ public class UnifyTypeFactory {
                 }
             }else if(tr instanceof RefType){
                 return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (RefType) tr);
-            }else if(tr instanceof WildcardType){
-                return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (WildcardType) tr);
+            }else if(tr instanceof WildcardTypeInterface){
+                return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (WildcardTypeInterface) tr);
             }else if(tr instanceof GenericRefType){
                 return new PairTPHequalRefTypeOrWildcardType((TypePlaceholder)tl, (GenericRefType) tr);
             }else throw new NotImplementedException();
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
deleted file mode 100644
index ed5a082b..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ArgumentList.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import org.antlr.v4.runtime.Token;
-
-import java.util.List;
-
-public class ArgumentList extends SyntaxTreeNode
-{
-    public ArgumentList(List<Expression> expr, Token offset) {
-		super(offset);
-		this.expr = expr;
-	}
-
-	private List<Expression> expr;
-
-	public List<Expression> getArguments(){
-		return expr;
-	}
-
-	
-	@Override
-	public void accept(ASTVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	public void accept(StatementVisitor visitor) {
-		visitor.visit(this);
-	}
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Assign.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Assign.java
deleted file mode 100644
index 3af2de6f..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Assign.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.antlr.v4.runtime.Token;
-
-/*
-Aufbau:
-rightSide = leftSide
- */
-public class Assign extends Statement
-{
-    public final Expression rightSide;
-    public final AssignLeftSide lefSide;
-
-    public Assign(AssignLeftSide leftHandSide, Expression value, Token offset) {
-		super(leftHandSide.getType(), offset);
-        this.rightSide = value;
-        this.lefSide = leftHandSide;
-	}
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignLeftSide.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignLeftSide.java
deleted file mode 100644
index 13fec3f8..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/AssignLeftSide.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public abstract class AssignLeftSide extends TypableStatement{
-
-    public AssignLeftSide(RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
-        super(type, offset);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
deleted file mode 100644
index 4fab15cc..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/BinaryExpr.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public class BinaryExpr extends Expression
-{
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    public enum Operator{
-        ADD, // +
-        SUB, // -
-        MUL, // *
-        MOD, // Modulo Operator %
-        AND, // &&
-        OR,  // ||
-        DIV, // /
-        LESSTHAN, // <
-        BIGGERTHAN, // >
-        LESSEQUAL, // <=
-        BIGGEREQUAL, // >=
-        EQUAL, // ==
-        NOTEQUAL // !=
-    }
-
-    public final Operator operation;
-    public final Expression lexpr;
-    public final Expression rexpr;
-
-    public BinaryExpr(Operator operation, RefTypeOrTPHOrWildcardOrGeneric type, Expression lexpr, Expression rexpr, Token offset)
-    {
-        super(type,offset);
-
-        this.operation = operation;
-        this.lexpr = lexpr;
-        this.rexpr = rexpr;
-    }
-
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Block.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Block.java
deleted file mode 100644
index 73a92c7e..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Block.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.*;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import org.antlr.v4.runtime.Token;
-
-
-public class Block extends Statement
-{
-    public Block(List<Statement> statements, Token offset) {
-		super(TypePlaceholder.fresh(offset), offset);
-		this.statements = statements;
-	}
-
-
-    
-    public List<Statement> statements = new ArrayList<>();
-
-    public List<Statement> getStatements()
-    {
-        return statements;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
-
-
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
deleted file mode 100644
index 15fedbbc..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/CastExpr.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import org.antlr.v4.runtime.Token;
-
-
-public class CastExpr extends Expression
-{
-    public CastExpr(RefTypeOrTPHOrWildcardOrGeneric castType, Expression expr, Token offset)
-    {
-        super(castType, offset);
-        this.expr = expr;
-    }
-
-    public Expression expr;
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
deleted file mode 100644
index b24396bb..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/DoStmt.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import org.antlr.v4.runtime.Token;
-
-public class DoStmt extends WhileStmt
-{
-    public DoStmt(Expression expr, Statement loopBlock, Token offset)
-    {
-        super(expr, loopBlock, offset);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
deleted file mode 100644
index ff80e47f..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/EmptyStmt.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.Void;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import org.antlr.v4.runtime.Token;
-
-
-public class EmptyStmt extends Statement
-{
-    public EmptyStmt(Token offset)
-    {
-        super(new Void(offset),offset);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Expression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Expression.java
deleted file mode 100644
index 0413e124..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Expression.java
+++ /dev/null
@@ -1,17 +0,0 @@
-
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import org.antlr.v4.runtime.Token;
-
-public abstract class Expression extends TypableStatement
-{
-    public Expression(RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
-        super(type, offset);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java
deleted file mode 100644
index 409cfe68..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ExpressionReceiver.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public class ExpressionReceiver extends Receiver
-{
-    public final Expression expr;
-
-    public ExpressionReceiver(Expression expr)
-    {
-        super(expr.getType(), expr.getOffset());
-        this.expr = expr;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java
deleted file mode 100644
index 9380e951..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/FieldVar.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.TypeinferenceException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.antlr.v4.runtime.Token;
-
-import java.util.HashSet;
-import java.util.Set;
-
-public class FieldVar extends Expression {
-
-    public final String fieldVarName;
-    public final Expression receiver;
-
-    public FieldVar(Expression receiver, String fieldVarName, RefTypeOrTPHOrWildcardOrGeneric type, Token offset) {
-        super(type, offset);
-        this.fieldVarName = fieldVarName;
-        this.receiver = receiver;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
deleted file mode 100644
index 1f933366..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ForStmt.java
+++ /dev/null
@@ -1,29 +0,0 @@
-
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-
-public class ForStmt extends Statement
-{
-    
-    private Expression head_Initializer_1;
-	private Expression head_Condition_1;
-	private Expression head_Loop_expr_1;
-	private Expression head_Initializer;
-	private Expression head_Condition;
-	private Expression head_Loop_expr;
-	public Block body_Loop_block;
-
-	public ForStmt(int offset, int variableLength)
-    {
-        super(null,null);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
deleted file mode 100644
index 4af1e770..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/IfStmt.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import org.antlr.v4.runtime.Token;
-
-
-public class IfStmt extends Statement
-{
-    public final Expression expr;
-    public final Statement then_block;
-    public final Statement else_block;
-
-    public IfStmt(RefTypeOrTPHOrWildcardOrGeneric type,
-                  Expression expr, Statement thenBlock, Statement elseBlock, Token offset)
-    {
-        super(type,offset);
-        this.expr = expr;
-        this.then_block = thenBlock;
-        this.else_block = elseBlock;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
deleted file mode 100644
index 02fd667b..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/InstanceOf.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-
-
-public class InstanceOf extends BinaryExpr
-{
-    public Expression expr;
-    private RefTypeOrTPHOrWildcardOrGeneric reftype;
-    
-    public InstanceOf(int offset,int variableLength)
-    {
-        super(null, null, null, null, null);
-        throw new NotImplementedException();
-        // #JB# 20.04.2005
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/JavaInternalExpression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/JavaInternalExpression.java
deleted file mode 100644
index 366c0602..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/JavaInternalExpression.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-import java.nio.charset.StandardCharsets;
-
-public abstract class JavaInternalExpression extends Statement{
-    public JavaInternalExpression(RefTypeOrTPHOrWildcardOrGeneric retType, Token offset){
-        super(retType, offset);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
deleted file mode 100644
index 40e65958..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LambdaExpression.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import org.antlr.v4.runtime.Token;
-//import sun.reflect.generics.reflectiveObjects.NotImplementedException;
-
-import java.util.ArrayList;
-
-public class LambdaExpression extends Expression implements TypeScope {
-	public final Block methodBody;
-	public final ParameterList params;
-	
-	public LambdaExpression(RefTypeOrTPHOrWildcardOrGeneric type, ParameterList params, Block methodBody, Token offset) {
-		super(type,offset);
-		this.methodBody = methodBody;
-		this.params = params;
-	}
-
-	@Override
-	public void accept(StatementVisitor visitor) {
-		visitor.visit(this);
-	}
-
-	@Override
-	public Iterable<? extends GenericTypeVar> getGenerics() {
-		//Lambda-Ausdrücke haben keine Generics
-		return new ArrayList<>();
-	}
-
-	@Override
-	public RefTypeOrTPHOrWildcardOrGeneric getReturnType() {
-		//RefType type = (RefType) this.getType();
-		//return type.getParaList().get(0);
-		return methodBody.getType();
-	}
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Literal.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Literal.java
deleted file mode 100644
index 8bbaae0a..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Literal.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import org.antlr.v4.runtime.Token;
-
-public class Literal extends Expression
-{
-    public final Object value;
-
-    public Literal(RefTypeOrTPHOrWildcardOrGeneric type, Object value, Token offset) {
-        super(type, offset);
-        this.value = value;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java
deleted file mode 100644
index 91094a7a..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVar.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public class LocalVar extends Statement{
-
-    public final String name;
-
-    public LocalVar(String n, RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
-    {
-        super(type,offset);
-        this.name = n;
-    }
-
-    public LocalVar(Expression e1, RefTypeOrTPHOrWildcardOrGeneric type, String access)
-    {
-        super(type,e1.getOffset());
-        this.name = access;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java
deleted file mode 100644
index fde48e51..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/LocalVarDecl.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import org.antlr.v4.runtime.Token;
-
-
-public class LocalVarDecl extends Statement
-{
-
-    private String name;
-
-    public LocalVarDecl(String name, RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
-    {
-        super(type, offset);
-        this.name = name;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    public String getName() {
-        return name;
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
deleted file mode 100644
index 4ef09d86..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/MethodCall.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.exceptions.TypeinferenceException;
-import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.antlr.v4.runtime.Token;
-
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-
-import java.util.*;
-
-
-public class MethodCall extends Statement
-{
-    public final String name;
-    public final Receiver receiver;
-    
-    public final ArgumentList arglist;
-    
-    public RefTypeOrTPHOrWildcardOrGeneric receiverType;
-    public final ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes;
-    
-    public MethodCall(RefTypeOrTPHOrWildcardOrGeneric retType, Receiver receiver, String methodName, ArgumentList argumentList, 
-    		          RefTypeOrTPHOrWildcardOrGeneric receiverType, ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
-		super(retType,offset);
-		this.arglist = argumentList;
-        this.name = methodName;
-        this.receiver = receiver;
-        this.receiverType = receiverType;
-        this.argTypes = argTypes;
-	}
-    
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    public ArgumentList getArgumentList() {
-        return arglist;
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewArray.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewArray.java
deleted file mode 100644
index 14c54d8c..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewArray.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.List;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-
-
-public class NewArray extends Expression
-{
-    public NewArray(int offset,int variableLength)
-    {
-        super(null,null);
-    }
-    private RefTypeOrTPHOrWildcardOrGeneric type;
-    public List<Expression> expr;
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewClass.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
deleted file mode 100644
index f27bc3e8..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/NewClass.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import de.dhbwstuttgart.exceptions.TypeinferenceException;
-import de.dhbwstuttgart.parser.NullToken;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
-import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import org.antlr.v4.runtime.Token;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-
-
-public class NewClass extends MethodCall
-{
-    /**
-     *
-     * @param newClass Typ der Instanzierten Klasse
-     * @param args Argumente mit denen der New-Call aufgerufen wurde
-     * @param start
-     */
-    public NewClass(RefType newClass, ArgumentList args, RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token start) {
-        super(newClass, new ExpressionReceiver(new EmptyStmt(start)), newClass.getName().toString(), 
-        		args, receiverType, argTypes, start);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Receiver.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Receiver.java
deleted file mode 100644
index 93ee36a0..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Receiver.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public abstract class Receiver extends Expression
-{
-    public Receiver(RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
-    {
-        super(type, offset);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Return.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Return.java
deleted file mode 100644
index 5a6a5312..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Return.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import org.antlr.v4.runtime.Token;
-
-
-public class Return extends Statement
-{
-    public final Expression retexpr;
-
-    public Return(Expression retExpr, Token offset)
-    {
-        super(retExpr.getType(),offset);
-        this.retexpr = retExpr;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java
deleted file mode 100644
index ca64b2c5..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ReturnVoid.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import org.antlr.v4.runtime.Token;
-
-public class ReturnVoid extends Return{
-    public ReturnVoid(Token offset) {
-        super(new EmptyStmt(offset), offset);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Statement.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Statement.java
deleted file mode 100644
index aad50736..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Statement.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-
-public abstract class Statement extends Expression
-{
-	/* zeigt an, dass eine StatementExpression als Statement benutzt wird
-     */
-    private boolean isStatement = false;
-    
-    public Statement(RefTypeOrTPHOrWildcardOrGeneric type, Token offset)
-    {
-        super(type, offset);
-    }
-
-    public void setStatement() {
-    	isStatement=true;
-    }
-    
-    public boolean getStatement() {
-    	return isStatement;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java
deleted file mode 100644
index a7089d8c..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/StaticClassName.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import org.antlr.v4.runtime.Token;
-
-public class StaticClassName extends Receiver {
-    public StaticClassName(JavaClassName className, Token offset) {
-        super(new RefType(className, offset), offset);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Super.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Super.java
deleted file mode 100644
index fbeba99b..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/Super.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import org.antlr.v4.runtime.Token;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-
-public class Super extends Expression
-{
-    public Super(Token offset)
-    {
-        super(null,null);
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java
deleted file mode 100644
index 3b7eebbf..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/SuperCall.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.Void;
-import org.antlr.v4.runtime.Token;
-
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-
-import java.util.ArrayList;
-
-
-public class SuperCall extends MethodCall
-{
-    public SuperCall(RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
-        this(new ArgumentList(new ArrayList<Expression>(), offset), receiverType, argTypes, offset);
-    }
-
-    public SuperCall(ArgumentList argumentList, RefTypeOrTPHOrWildcardOrGeneric receiverType, 
-    		ArrayList<RefTypeOrTPHOrWildcardOrGeneric> argTypes, Token offset){
-        super(new Void(offset), new ExpressionReceiver(new This(offset)), "<init>", argumentList, receiverType, argTypes, offset);
-    }
-
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/This.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/This.java
deleted file mode 100644
index cd7ef5ec..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/This.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import org.antlr.v4.runtime.Token;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-
-public class This extends Expression
-{
-    public This(Token offset)
-    {
-        super(TypePlaceholder.fresh(offset),offset);
-    }
-    
-    public ArgumentList arglist;
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-    
-    public String toString() {
-    	return "this: "+ this.getType();
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java
deleted file mode 100644
index 26579d2f..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/ThisCall.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.Constructor;
-
-
-
-public class ThisCall extends MethodCall
-{
-    public ThisCall(Receiver receiver, ArgumentList arglist, int offset)
-    {
-		super(null, null, null, null, null, null, null);
-
-	}
-    
-    public ArgumentList arglist;
-
-}
-
-
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/TypableStatement.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/TypableStatement.java
deleted file mode 100644
index a2166d2d..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/TypableStatement.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public abstract class TypableStatement extends SyntaxTreeNode{
-    private RefTypeOrTPHOrWildcardOrGeneric type;
-
-    public TypableStatement(RefTypeOrTPHOrWildcardOrGeneric type, Token offset){
-        super(offset);
-        if(type == null)throw new NullPointerException();
-        this.type = type;
-    }
-
-    public RefTypeOrTPHOrWildcardOrGeneric getType(){
-        return type;
-    }
-
-    public abstract void accept(StatementVisitor visitor);
-
-    @Override
-    public void accept(ASTVisitor visitor) {
-        this.accept((StatementVisitor)visitor);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java
deleted file mode 100644
index ca06146a..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/UnaryExpr.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
-import de.dhbwstuttgart.syntaxtree.statement.JavaInternalExpression;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import org.antlr.v4.runtime.Token;
-
-public class UnaryExpr extends JavaInternalExpression
-{
-    public enum Operation{
-        NOT,
-        MINUS,
-        PREINCREMENT,
-        PREDECREMENT,
-        POSTINCREMENT,
-        PLUS, POSTDECREMENT
-    }
-
-
-    public final Operation operation;
-    public Expression expr;
-
-    public UnaryExpr(Operation operation, Expression argument, RefTypeOrTPHOrWildcardOrGeneric retType, Token offset)
-    {
-        super(retType, offset);
-        this.expr = argument;
-        this.operation = operation;
-    }
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-
-
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java b/src/main/java/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
deleted file mode 100644
index 0127a505..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/statement/WhileStmt.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.statement;
-
-
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
-import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
-import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
-import de.dhbwstuttgart.exceptions.NotImplementedException;
-import org.antlr.v4.runtime.Token;
-
-public class WhileStmt extends Statement
-{
-    public final Expression expr;
-    public final Statement loopBlock;
-
-    public WhileStmt(Expression expr, Statement loopBlock, Token offset)
-    {
-        super(TypePlaceholder.fresh(offset), offset);
-        this.expr = expr;
-        this.loopBlock = loopBlock;
-    }
-
-    @Override
-    public void accept(StatementVisitor visitor) {
-        visitor.visit(this);
-    }
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java b/src/main/java/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java
deleted file mode 100644
index 22c8ab4b..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/RefTypeOrTPHOrWildcardOrGeneric.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.type;
-
-import de.dhbwstuttgart.syntaxtree.ASTVisitor;
-import de.dhbwstuttgart.syntaxtree.SyntaxTreeNode;
-import de.dhbwstuttgart.typeinference.result.ResultSetVisitor;
-import org.antlr.v4.runtime.Token;
-
-public abstract class RefTypeOrTPHOrWildcardOrGeneric extends SyntaxTreeNode{
-    public RefTypeOrTPHOrWildcardOrGeneric(Token offset) {
-        super(offset);
-    }
-
-    @Override
-    public abstract void accept(ASTVisitor visitor);
-
-    public abstract <A> A acceptTV(TypeVisitor<A> visitor);
-    public abstract void accept(ResultSetVisitor visitor);
-    
-    @Override
-    public abstract boolean equals(Object o);
-    
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/Void.java b/src/main/java/de/dhbwstuttgart/syntaxtree/type/Void.java
deleted file mode 100644
index 6a322dcb..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/Void.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.type;
-
-import org.antlr.v4.runtime.Token;
-
-import de.dhbwstuttgart.parser.scope.JavaClassName;
-
-
-public class Void extends RefType
-{
-    public Void(Token offset) {
-        super(JavaClassName.Void, offset);
-    }
-}
-
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/type/WildcardType.java b/src/main/java/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
deleted file mode 100644
index 208138b6..00000000
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/type/WildcardType.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package de.dhbwstuttgart.syntaxtree.type;
-
-import org.antlr.v4.runtime.Token;
-
-/**
- *  Stellt eine Wildcard in Java dar.
- *  z.B. void Test(? var){..}
- * @author luar 2.12.06
- * 
- */
-
-public abstract class WildcardType extends RefTypeOrTPHOrWildcardOrGeneric {
-	
-	protected RefTypeOrTPHOrWildcardOrGeneric innerType = null;
-	
-	/**
-	* Author: Arne Lüdtke<br/>
-	* Standard Konstruktor für eine Wildcard
-	*/
-	public WildcardType(RefTypeOrTPHOrWildcardOrGeneric innerType, Token offset)
-	{
-		super(offset);
-		this.innerType = innerType;
-	}
-
-	public RefTypeOrTPHOrWildcardOrGeneric getInnerType(){
-		return innerType;
-	}
-	
-	/**
-	* Author: Arne Lüdtke<br/>
-	* Gibt String Entsprechung zurück.
-	*/
-	public String toString()
-	{
-		return "?";
-	}
-
-
-	public abstract boolean isExtends();
-	public abstract boolean isSuper();
-}
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
index 9a3228fe..83e9d1e0 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/OutputGenerator.java
@@ -2,12 +2,9 @@ package de.dhbwstuttgart.syntaxtree.visual;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.type.*;
 
 import java.lang.reflect.Modifier;
 import java.util.Iterator;
-import java.util.Optional;
 
 public class OutputGenerator implements ASTVisitor{
     private static final String TAB = "  ";
@@ -91,7 +88,7 @@ public class OutputGenerator implements ASTVisitor{
     public void visit(Constructor method) {
         out.append(method.getName());
         method.getParameterList().accept(this);
-        method.block.accept(this);
+        method.block().accept(this);
         out.append("\n");
     }
 
@@ -179,23 +176,23 @@ public class OutputGenerator implements ASTVisitor{
 
     @Override
     public void visit(LambdaExpression lambdaExpression) {
-        lambdaExpression.params.accept(this);
+        lambdaExpression.params().accept(this);
         out.append(" -> ");
-        lambdaExpression.methodBody.accept(this);
+        lambdaExpression.methodBody().accept(this);
     }
 
     @Override
     public void visit(Assign assign) {
-        assign.lefSide.accept(this);
+        assign.lefSide().accept(this);
         out.append(" = ");
-        assign.rightSide.accept(this);
+        assign.rightSide().accept(this);
     }
 
     @Override
     public void visit(BinaryExpr binary) {
-        binary.lexpr.accept(this);
+        binary.lexpr().accept(this);
         out.append(" op ");
-        binary.rexpr.accept(this);
+        binary.rexpr().accept(this);
     }
 
     @Override
@@ -224,8 +221,8 @@ public class OutputGenerator implements ASTVisitor{
 
     @Override
     public void visit(FieldVar fieldVar) {
-        fieldVar.receiver.accept(this);
-        out.append("." + fieldVar.fieldVarName);
+        fieldVar.receiver().accept(this);
+        out.append("." + fieldVar.fieldVarName());
     }
 
     @Override
@@ -236,17 +233,17 @@ public class OutputGenerator implements ASTVisitor{
     @Override
     public void visit(IfStmt ifStmt) {
         out.append("if(");
-        ifStmt.expr.accept(this);
+        ifStmt.expr().accept(this);
         out.append(")\n");
         tab();
         out.append(tabs);
-        ifStmt.then_block.accept(this);
+        ifStmt.then_block().accept(this);
         untab();
-        if(ifStmt.else_block != null){
+        if(ifStmt.else_block() != null){
             out.append("\n" + tabs + "else\n");
             tab();
             out.append(tabs);
-            ifStmt.else_block.accept(this);
+            ifStmt.else_block().accept(this);
             untab();
         }
     }
@@ -258,7 +255,7 @@ public class OutputGenerator implements ASTVisitor{
 
     @Override
     public void visit(LocalVar localVar) {
-        out.append(localVar.name);
+        out.append(localVar.name());
     }
 
     @Override
@@ -269,15 +266,15 @@ public class OutputGenerator implements ASTVisitor{
 
     @Override
     public void visit(MethodCall methodCall) {
-        methodCall.receiver.accept(this);
-        out.append("."+methodCall.name);
+        methodCall.receiver().accept(this);
+        out.append("."+methodCall.name());
         methodCall.getArgumentList().accept(this);
     }
 
     @Override
     public void visit(NewClass methodCall) {
         out.append("new ");
-        out.append(methodCall.name);
+        out.append(methodCall.name());
         methodCall.getArgumentList().accept(this);
     }
 
@@ -289,7 +286,7 @@ public class OutputGenerator implements ASTVisitor{
     @Override
     public void visit(Return aReturn) {
         out.append("return ");
-        aReturn.retexpr.accept(this);
+        aReturn.retexpr().accept(this);
     }
 
     @Override
@@ -315,17 +312,17 @@ public class OutputGenerator implements ASTVisitor{
     @Override
     public void visit(WhileStmt whileStmt) {
         out.append("while(");
-        whileStmt.expr.accept(this);
+        whileStmt.expr().accept(this);
         out.append(")");
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
     public void visit(DoStmt whileStmt) {
         out.append("do ");
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
         out.append("while(");
-        whileStmt.expr.accept(this);
+        whileStmt.expr().accept(this);
         out.append(");");
     }
 
@@ -342,40 +339,40 @@ public class OutputGenerator implements ASTVisitor{
     @Override
     public void visit(SuperCall superCall) {
         out.append("super(");
-        superCall.arglist.accept(this);
+        superCall.arglist().accept(this);
         out.append(")");
     }
 
     @Override
     public void visit(ExpressionReceiver receiver) {
-        receiver.expr.accept(this);
+        receiver.expr().accept(this);
     }
 
     @Override
     public void visit(UnaryExpr unaryExpr) {
-        if(unaryExpr.operation == UnaryExpr.Operation.MINUS){
+        if(unaryExpr.operation() == UnaryExpr.Operation.MINUS){
             out.append("-");
         }
-        if(unaryExpr.operation == UnaryExpr.Operation.PLUS){
+        if(unaryExpr.operation() == UnaryExpr.Operation.PLUS){
             out.append("+");
         }
-        if(unaryExpr.operation == UnaryExpr.Operation.PREDECREMENT){
+        if(unaryExpr.operation() == UnaryExpr.Operation.PREDECREMENT){
             out.append("--");
         }
-        if(unaryExpr.operation == UnaryExpr.Operation.PREINCREMENT){
+        if(unaryExpr.operation() == UnaryExpr.Operation.PREINCREMENT){
             out.append("++");
         }
-        unaryExpr.expr.accept(this);
-        if(unaryExpr.operation == UnaryExpr.Operation.POSTDECREMENT){
+        unaryExpr.expr().accept(this);
+        if(unaryExpr.operation() == UnaryExpr.Operation.POSTDECREMENT){
             out.append("--");
         }
-        if(unaryExpr.operation == UnaryExpr.Operation.POSTINCREMENT){
+        if(unaryExpr.operation() == UnaryExpr.Operation.POSTINCREMENT){
             out.append("++");
         }
     }
 
     @Override
-    public void visit(de.dhbwstuttgart.syntaxtree.statement.Literal literal) {
-        out.append(literal.value);
+    public void visit(Literal literal) {
+        out.append(literal.value());
     }
 }
\ No newline at end of file
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/ResultSetOutputGenerator.java b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/ResultSetOutputGenerator.java
index f50b05a6..b4ec2eef 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/ResultSetOutputGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/ResultSetOutputGenerator.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.syntaxtree.visual;
 
-import de.dhbwstuttgart.syntaxtree.type.*;
+
 import de.dhbwstuttgart.typeinference.result.*;
 
 public class ResultSetOutputGenerator extends OutputGenerator implements ResultSetVisitor{
diff --git a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
index 8a210db1..f0fad65e 100644
--- a/src/main/java/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
+++ b/src/main/java/de/dhbwstuttgart/syntaxtree/visual/TypeOutputGenerator.java
@@ -1,9 +1,7 @@
 package de.dhbwstuttgart.syntaxtree.visual;
 
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.statement.Literal;
-import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.Literal;
 
 public class TypeOutputGenerator extends OutputGenerator {
 
@@ -97,9 +95,9 @@ public class TypeOutputGenerator extends OutputGenerator {
 
     @Override
     public void visit(BinaryExpr binary) {
-        binary.lexpr.accept(this);
+        binary.lexpr().accept(this);
         out.append(" | ");
-        binary.rexpr.accept(this);
+        binary.rexpr().accept(this);
     }
 
     @Override
diff --git a/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java b/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
index b1eea73c..940854e2 100644
--- a/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java
@@ -4,8 +4,6 @@ import de.dhbwstuttgart.bytecode.funN.FunNGenerator;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.type.*;
 import de.dhbwstuttgart.target.tree.*;
 import de.dhbwstuttgart.target.tree.expression.TargetBlock;
 import de.dhbwstuttgart.target.tree.expression.TargetExpression;
@@ -140,10 +138,10 @@ public class ASTToTargetAST {
                 public void visit(MethodCall methodCall) {
                     super.visit(methodCall);
 
-                    if (methodCall.receiver instanceof ExpressionReceiver expressionReceiver) {
-                        if (expressionReceiver.expr instanceof This) {
+                    if (methodCall.receiver() instanceof ExpressionReceiver expressionReceiver) {
+                        if (expressionReceiver.expr() instanceof This) {
                             // TODO This is going to fail spectacularly for overloaded methods
-                            var optMethod = owner.getMethods().stream().filter(m -> m.name.equals(methodCall.name)).findFirst();
+                            var optMethod = owner.getMethods().stream().filter(m -> m.name().equals(methodCall.name())).findFirst();
                             if (optMethod.isEmpty()) return;
                             var method = optMethod.get();
                             var generics = generics(owner, method);
@@ -233,7 +231,7 @@ public class ASTToTargetAST {
             }
 
             eliminateCyclesAndInfima(result);
-            System.out.println(method.name + ": " + result);
+            System.out.println(method.name() + ": " + result);
 
             Set<TypePlaceholder> allUsedTPHs = new HashSet<>();
             allUsedTPHs.addAll(typeVariables);
@@ -543,10 +541,10 @@ public class ASTToTargetAST {
 
         for (var s : all) {
             sigma = s;
-            var generics = sigma.generics(owner, input);
+            var generics = sigma.generics(owner);
             List<MethodParameter> params = convert(input.getParameterList());
             if (parameterSet.stream().noneMatch(p -> p.equals(params))) {
-                result.add(new TargetConstructor(input.modifier, convert(generics), params, convert(input.block)));
+                result.add(new TargetConstructor(input.modifier(), convert(generics), params, convert(input.block())));
                 parameterSet.add(params);
             }
         }
@@ -566,8 +564,8 @@ public class ASTToTargetAST {
             List<MethodParameter> params = convert(input.getParameterList());
             if (parameterSet.stream().noneMatch(p -> p.equals(params))) {
                 result.add(new TargetMethod(
-                        input.modifier,
-                        input.name, convert(generics), params,
+                        input.modifier(),
+                        input.name(), convert(generics), params,
                         convert(input.getReturnType()),
                         convert(input.block)
                 ));
@@ -579,7 +577,7 @@ public class ASTToTargetAST {
     }
 
     protected TargetBlock convert(Block block) {
-        return new TargetBlock(block.statements.stream().map(this::convert).toList());
+        return new TargetBlock(block.statements().stream().map(this::convert).toList());
     }
 
     protected TargetExpression convert(Expression expr) {
@@ -590,7 +588,7 @@ public class ASTToTargetAST {
 
     private TargetField convert(Field input) {
         return new TargetField(
-                input.modifier,
+                input.modifier(),
                 convert(input.getType()),
                 input.getName()
         );
diff --git a/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java b/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java
index 79338248..7ec00978 100644
--- a/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/StatementToTargetExpression.java
@@ -2,13 +2,11 @@ package de.dhbwstuttgart.target.generate;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.target.tree.MethodParameter;
 import de.dhbwstuttgart.target.tree.expression.*;
 import de.dhbwstuttgart.target.tree.type.TargetFunNType;
 import de.dhbwstuttgart.target.tree.type.TargetRefType;
-import de.dhbwstuttgart.target.tree.type.TargetType;
 
 import java.util.List;
 import java.util.stream.StreamSupport;
@@ -30,43 +28,43 @@ public class StatementToTargetExpression implements StatementVisitor {
     @Override
     public void visit(LambdaExpression lambdaExpression) {
         var parameters = StreamSupport
-                .stream(lambdaExpression.params.spliterator(), false)
+                .stream(lambdaExpression.params().spliterator(), false)
                 .map(p -> new MethodParameter(converter.convert(p.getType()), p.getName()))
                 .toList();
         result = new TargetLambdaExpression(
                 new TargetFunNType(parameters.size(), parameters.stream().map(MethodParameter::type).toList()),
-                parameters, converter.convert(lambdaExpression.getReturnType()), converter.convert(lambdaExpression.methodBody)
+                parameters, converter.convert(lambdaExpression.getReturnType()), converter.convert(lambdaExpression.methodBody())
         );
     }
 
     @Override
     public void visit(Assign assign) {
         TargetExpression left;
-        if (assign.lefSide instanceof AssignToLocal) {
-            left = converter.convert(((AssignToLocal) assign.lefSide).localVar);
+        if (assign.lefSide() instanceof AssignToLocal) {
+            left = converter.convert(((AssignToLocal) assign.lefSide()).localVar);
         } else {
-            left = converter.convert(((AssignToField) assign.lefSide).field);
+            left = converter.convert(((AssignToField) assign.lefSide()).field);
         }
 
-        result = new TargetAssign(converter.convert(assign.getType()), left, converter.convert(assign.rightSide));
+        result = new TargetAssign(converter.convert(assign.getType()), left, converter.convert(assign.rightSide()));
     }
 
     @Override
     public void visit(BinaryExpr binary) {
-        result = switch (binary.operation) {
-            case ADD -> new TargetBinaryOp.Add(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case SUB -> new TargetBinaryOp.Sub(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case MUL -> new TargetBinaryOp.Mul(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case MOD -> new TargetBinaryOp.Rem(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case AND -> new TargetBinaryOp.And(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case OR -> new TargetBinaryOp.Or(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case DIV -> new TargetBinaryOp.Div(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case LESSTHAN -> new TargetBinaryOp.Less(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case BIGGERTHAN -> new TargetBinaryOp.Greater(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case LESSEQUAL -> new TargetBinaryOp.LessOrEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case BIGGEREQUAL -> new TargetBinaryOp.GreaterOrEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case EQUAL -> new TargetBinaryOp.Equal(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
-            case NOTEQUAL -> new TargetBinaryOp.NotEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr), converter.convert(binary.rexpr));
+        result = switch (binary.operation()) {
+            case ADD -> new TargetBinaryOp.Add(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case SUB -> new TargetBinaryOp.Sub(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case MUL -> new TargetBinaryOp.Mul(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case MOD -> new TargetBinaryOp.Rem(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case AND -> new TargetBinaryOp.And(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case OR -> new TargetBinaryOp.Or(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case DIV -> new TargetBinaryOp.Div(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case LESSTHAN -> new TargetBinaryOp.Less(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case BIGGERTHAN -> new TargetBinaryOp.Greater(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case LESSEQUAL -> new TargetBinaryOp.LessOrEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case BIGGEREQUAL -> new TargetBinaryOp.GreaterOrEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case EQUAL -> new TargetBinaryOp.Equal(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
+            case NOTEQUAL -> new TargetBinaryOp.NotEqual(converter.convert(binary.getType()), converter.convert(binary.lexpr()), converter.convert(binary.rexpr()));
         };
     }
 
@@ -77,7 +75,7 @@ public class StatementToTargetExpression implements StatementVisitor {
 
     @Override
     public void visit(CastExpr castExpr) {
-        result = new TargetCast(converter.convert(castExpr.getType()), converter.convert(castExpr.expr));
+        result = new TargetCast(converter.convert(castExpr.getType()), converter.convert(castExpr.expr()));
     }
 
     @Override
@@ -89,10 +87,10 @@ public class StatementToTargetExpression implements StatementVisitor {
     public void visit(FieldVar fieldVar) {
         result = new TargetFieldVar(
                 converter.convert(fieldVar.getType()),
-                converter.convert(fieldVar.receiver.getType()),
+                converter.convert(fieldVar.receiver().getType()),
                 false,
-                converter.convert(fieldVar.receiver),
-                fieldVar.fieldVarName);
+                converter.convert(fieldVar.receiver()),
+                fieldVar.fieldVarName());
     }
 
     @Override
@@ -104,9 +102,9 @@ public class StatementToTargetExpression implements StatementVisitor {
     @Override
     public void visit(IfStmt ifStmt) {
         result = new TargetIf(
-                converter.convert(ifStmt.expr),
-                converter.convert(ifStmt.then_block),
-                converter.convert(ifStmt.else_block)
+                converter.convert(ifStmt.expr()),
+                converter.convert(ifStmt.then_block()),
+                converter.convert(ifStmt.else_block())
         );
     }
 
@@ -117,7 +115,7 @@ public class StatementToTargetExpression implements StatementVisitor {
 
     @Override
     public void visit(LocalVar localVar) {
-        result = new TargetLocalVar(converter.convert(localVar.getType()), localVar.name);
+        result = new TargetLocalVar(converter.convert(localVar.getType()), localVar.name());
     }
 
     @Override
@@ -128,24 +126,24 @@ public class StatementToTargetExpression implements StatementVisitor {
 
     @Override
     public void visit(MethodCall methodCall) {
-        var receiverType = converter.convert(methodCall.receiver.getType());
+        var receiverType = converter.convert(methodCall.receiver().getType());
         var isFunNType = receiverType instanceof TargetFunNType;
         var returnType = converter.convert(methodCall.getType());
 
         result = new TargetMethodCall(
                 returnType,
-                methodCall.arglist.getArguments().stream().map(expr -> converter.convert(expr.getType())).toList(),
-                converter.convert(methodCall.receiver),
+                methodCall.arglist().getArguments().stream().map(expr -> converter.convert(expr.getType())).toList(),
+                converter.convert(methodCall.receiver()),
                 methodCall.getArgumentList().getArguments().stream().map(converter::convert).toList(),
                 receiverType,
-                methodCall.name, false, isFunNType
+                methodCall.name(), false, isFunNType
         );
     }
 
     @Override
     public void visit(NewClass newClass) {
         result = new TargetNew(
-                new TargetRefType(newClass.name),
+                new TargetRefType(newClass.name().toString()),
                 newClass.getArgumentList().getArguments().stream().map(converter::convert).toList()
         );
     }
@@ -158,7 +156,7 @@ public class StatementToTargetExpression implements StatementVisitor {
 
     @Override
     public void visit(Return aReturn) {
-        result = new TargetReturn(converter.convert(aReturn.retexpr));
+        result = new TargetReturn(converter.convert(aReturn.retexpr()));
     }
 
     @Override
@@ -183,7 +181,7 @@ public class StatementToTargetExpression implements StatementVisitor {
 
     @Override
     public void visit(WhileStmt whileStmt) {
-        result = new TargetWhile(converter.convert(whileStmt.expr), converter.convert(whileStmt.loopBlock));
+        result = new TargetWhile(converter.convert(whileStmt.expr()), converter.convert(whileStmt.loopBlock()));
     }
 
     @Override
@@ -207,51 +205,51 @@ public class StatementToTargetExpression implements StatementVisitor {
         var aSuper = converter.convert(converter.currentClass.getSuperClass());
         result = new TargetMethodCall(
                 converter.convert(superCall.getType()),
-                superCall.argTypes == null ? List.of() : superCall.argTypes.stream().map(converter::convert).toList(),
+                superCall.argTypes() == null ? List.of() : superCall.argTypes().stream().map(converter::convert).toList(),
                 new TargetSuper(aSuper),
                 superCall.getArgumentList().getArguments().stream().map(converter::convert).toList(),
                 aSuper,
-                superCall.name, false, false
+                superCall.name(), false, false
         );
     }
 
     @Override
     public void visit(ExpressionReceiver expressionReceiver) {
-        result = converter.convert(expressionReceiver.expr);
+        result = converter.convert(expressionReceiver.expr());
     }
 
     @Override
     public void visit(UnaryExpr unaryExpr) {
-        result = switch (unaryExpr.operation) {
-            case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case PREDECREMENT -> new TargetUnaryOp.PreDecrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case POSTINCREMENT -> new TargetUnaryOp.PostIncrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case PLUS -> new TargetUnaryOp.Add(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
-            case POSTDECREMENT -> new TargetUnaryOp.PostDecrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr));
+        result = switch (unaryExpr.operation()) {
+            case NOT -> new TargetUnaryOp.Not(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case MINUS -> new TargetUnaryOp.Negate(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case PREINCREMENT -> new TargetUnaryOp.PreIncrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case PREDECREMENT -> new TargetUnaryOp.PreDecrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case POSTINCREMENT -> new TargetUnaryOp.PostIncrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case PLUS -> new TargetUnaryOp.Add(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
+            case POSTDECREMENT -> new TargetUnaryOp.PostDecrement(converter.convert(unaryExpr.getType()), converter.convert(unaryExpr.expr()));
         };
     }
 
     @Override
     public void visit(Literal literal) {
-        if (literal.value instanceof Integer
-                || literal.value instanceof Short
-                || literal.value instanceof Byte) {
+        if (literal.value() instanceof Integer
+                || literal.value() instanceof Short
+                || literal.value() instanceof Byte) {
 
-            result = new TargetLiteral.IntLiteral((int) literal.value);
-        } else if (literal.value instanceof Float) {
-            result = new TargetLiteral.FloatLiteral((float) literal.value);
-        } else if (literal.value instanceof Double) {
-            result = new TargetLiteral.DoubleLiteral((double) literal.value);
-        } else if (literal.value instanceof Long) {
-            result = new TargetLiteral.LongLiteral((long) literal.value);
-        } else if (literal.value instanceof Character) {
-            result = new TargetLiteral.CharLiteral((char) literal.value);
-        } else if (literal.value instanceof String) {
-            result = new TargetLiteral.StringLiteral((String) literal.value);
-        } else if (literal.value instanceof Boolean) {
-            result = new TargetLiteral.BooleanLiteral((boolean) literal.value);
+            result = new TargetLiteral.IntLiteral((int) literal.value());
+        } else if (literal.value() instanceof Float) {
+            result = new TargetLiteral.FloatLiteral((float) literal.value());
+        } else if (literal.value() instanceof Double) {
+            result = new TargetLiteral.DoubleLiteral((double) literal.value());
+        } else if (literal.value() instanceof Long) {
+            result = new TargetLiteral.LongLiteral((long) literal.value());
+        } else if (literal.value() instanceof Character) {
+            result = new TargetLiteral.CharLiteral((char) literal.value());
+        } else if (literal.value() instanceof String) {
+            result = new TargetLiteral.StringLiteral((String) literal.value());
+        } else if (literal.value() instanceof Boolean) {
+            result = new TargetLiteral.BooleanLiteral((boolean) literal.value());
         }
     }
 }
diff --git a/src/main/java/de/dhbwstuttgart/target/generate/TracingStatementVisitor.java b/src/main/java/de/dhbwstuttgart/target/generate/TracingStatementVisitor.java
index 7a7352ad..6fe11ce4 100644
--- a/src/main/java/de/dhbwstuttgart/target/generate/TracingStatementVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/TracingStatementVisitor.java
@@ -1,8 +1,7 @@
 package de.dhbwstuttgart.target.generate;
 
 import de.dhbwstuttgart.parser.SyntaxTreeGenerator.AssignToLocal;
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.statement.*;
+import de.dhbwstuttgart.syntaxtree.*;
 
 
 // This visitor walks the entire tree, individual methods may be overridden
@@ -10,7 +9,7 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(MethodCall methodCall) {
-        methodCall.receiver.accept(this);
+        methodCall.receiver().accept(this);
         methodCall.getArgumentList().accept(this);
     }
 
@@ -21,23 +20,23 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(LambdaExpression lambdaExpression) {
-        lambdaExpression.methodBody.accept(this);
+        lambdaExpression.methodBody().accept(this);
     }
 
     @Override
     public void visit(Assign assign) {
-        assign.rightSide.accept(this);
+        assign.rightSide().accept(this);
     }
 
     @Override
     public void visit(BinaryExpr binary) {
-        binary.lexpr.accept(this);
-        binary.rexpr.accept(this);
+        binary.lexpr().accept(this);
+        binary.rexpr().accept(this);
     }
 
     @Override
     public void visit(Block block) {
-        for (var expr : block.statements)
+        for (var expr : block.statements())
             expr.accept(this);
     }
 
@@ -63,8 +62,8 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(IfStmt ifStmt) {
-        ifStmt.then_block.accept(this);
-        ifStmt.else_block.accept(this);
+        ifStmt.then_block().accept(this);
+        ifStmt.else_block().accept(this);
     }
 
     @Override
@@ -84,7 +83,7 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(NewClass newClass) {
-        this.visit((MethodCall) newClass);
+        this.visit(newClass);
     }
 
     @Override
@@ -94,7 +93,7 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(Return aReturn) {
-        aReturn.retexpr.accept(this);
+        aReturn.retexpr().accept(this);
     }
 
     @Override
@@ -119,12 +118,12 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(WhileStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
     public void visit(DoStmt whileStmt) {
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
@@ -149,7 +148,7 @@ public abstract class TracingStatementVisitor implements StatementVisitor  {
 
     @Override
     public void visit(UnaryExpr unaryExpr) {
-        unaryExpr.expr.accept(this);
+        unaryExpr.expr().accept(this);
     }
 
     @Override
diff --git a/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetInstanceOf.java b/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetInstanceOf.java
index c1f104e2..959e54a9 100644
--- a/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetInstanceOf.java
+++ b/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetInstanceOf.java
@@ -1,6 +1,5 @@
 package de.dhbwstuttgart.target.tree.expression;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 
 public record TargetInstanceOf(TargetExpression left, TargetType right) implements TargetExpression {
diff --git a/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetSwitch.java b/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetSwitch.java
index a6823913..ccc49370 100644
--- a/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetSwitch.java
+++ b/src/main/java/de/dhbwstuttgart/target/tree/expression/TargetSwitch.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.target.tree.expression;
 
-import de.dhbwstuttgart.syntaxtree.statement.Expression;
+import de.dhbwstuttgart.syntaxtree.Expression;
 import de.dhbwstuttgart.target.tree.type.TargetType;
 
 import java.util.List;
diff --git a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsert.java b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsert.java
index 131c9f9b..d0b9efce 100644
--- a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsert.java
+++ b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsert.java
@@ -2,14 +2,10 @@ package de.dhbwstuttgart.typedeployment;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
 
-import org.antlr.v4.parse.BlockSetTransformer.setAlt_return;
-
-import de.dhbwstuttgart.syntaxtree.statement.This;
 import de.dhbwstuttgart.typeinference.result.ResultPair;
 
 public class TypeInsert {
diff --git a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
index 54a988c6..c89ba483 100644
--- a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
+++ b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertFactory.java
@@ -6,24 +6,14 @@ import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 
+import de.dhbwstuttgart.syntaxtree.*;
 import org.antlr.v4.runtime.Token;
 import org.objectweb.asm.Type;
 
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericGenratorResultForSourceFile;
 import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResult;
-import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResultForClass;
-import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
-import de.dhbwstuttgart.core.JavaTXCompiler;
-import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.Method;
-import de.dhbwstuttgart.syntaxtree.SourceFile;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 import de.dhbwstuttgart.typeinference.result.PairTPHEqualTPH;
 import de.dhbwstuttgart.typeinference.result.PairTPHequalRefTypeOrWildcardType;
 import de.dhbwstuttgart.typeinference.result.PairTPHsmallerTPH;
diff --git a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
index 042a76eb..16e93331 100644
--- a/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
+++ b/src/main/java/de/dhbwstuttgart/typedeployment/TypeInsertPlacer.java
@@ -6,8 +6,8 @@ import de.dhbwstuttgart.bytecode.genericsGeneratorTypes.GenericsGeneratorResultF
 import de.dhbwstuttgart.bytecode.utilities.MethodUtility;
 import de.dhbwstuttgart.bytecode.utilities.Resolver;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.LambdaExpression;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.LambdaExpression;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FieldAssumption.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FieldAssumption.java
index 305fa55f..b47543b1 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FieldAssumption.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FieldAssumption.java
@@ -1,13 +1,12 @@
 package de.dhbwstuttgart.typeinference.assumptions;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.constraints.GenericsResolver;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
index d41baa06..b84e5576 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/FunNClass.java
@@ -7,13 +7,7 @@ import de.dhbwstuttgart.syntaxtree.GenericDeclarationList;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-
-import org.antlr.v4.runtime.Token;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java
index 6e6c5c5a..4439b96f 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/MethodAssumption.java
@@ -5,9 +5,9 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 import de.dhbwstuttgart.typeinference.constraints.GenericsResolver;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java
index df280d48..22d70bf2 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceBlockInformation.java
@@ -1,18 +1,9 @@
 package de.dhbwstuttgart.typeinference.assumptions;
 
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Iterators;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.Method;
 import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
 
-import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Set;
-import java.util.Stack;
-import java.util.stream.Collectors;
 
 public class TypeInferenceBlockInformation extends TypeInferenceInformation {
     private TypeScope methodContext;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceInformation.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceInformation.java
index cbb941f3..2265dac7 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceInformation.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeInferenceInformation.java
@@ -1,20 +1,14 @@
 package de.dhbwstuttgart.typeinference.assumptions;
 
-import de.dhbwstuttgart.exceptions.NotImplementedException;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.ArgumentList;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
-import de.dhbwstuttgart.typeinference.constraints.Constraint;
-import de.dhbwstuttgart.typeinference.constraints.Pair;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 /*
 Anmerkung:
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeScopeContainer.java b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeScopeContainer.java
index c315fb52..eeee7255 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeScopeContainer.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/assumptions/TypeScopeContainer.java
@@ -3,7 +3,7 @@ package de.dhbwstuttgart.typeinference.assumptions;
 import com.google.common.collect.Iterables;
 import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
 import de.dhbwstuttgart.syntaxtree.TypeScope;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 import java.util.ArrayList;
 import java.util.Stack;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java b/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
index 1c7b7439..b56cf2ea 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/ConstraintSet.java
@@ -1,9 +1,7 @@
 package de.dhbwstuttgart.typeinference.constraints;
 
 
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.unify.GuavaSetOperations;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 import java.util.*;
 import java.util.function.BinaryOperator;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/constraints/GenericsResolver.java b/src/main/java/de/dhbwstuttgart/typeinference/constraints/GenericsResolver.java
index 59bcd4b4..e9a2fff9 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/GenericsResolver.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/GenericsResolver.java
@@ -1,9 +1,6 @@
 package de.dhbwstuttgart.typeinference.constraints;
 
-import de.dhbwstuttgart.syntaxtree.GenericTypeVar;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 /**
  * Wird für Generics benötigt
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java b/src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java
index 0c8ad7a5..4de3a0b8 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/constraints/Pair.java
@@ -3,8 +3,8 @@ import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
 
 
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/GenericInsertPair.java b/src/main/java/de/dhbwstuttgart/typeinference/result/GenericInsertPair.java
index f864905d..f2e85ebc 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/GenericInsertPair.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/GenericInsertPair.java
@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.constraints.Pair;
 
 public class GenericInsertPair  {
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/PairNoResult.java b/src/main/java/de/dhbwstuttgart/typeinference/result/PairNoResult.java
index 63b3137c..580fbced 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/PairNoResult.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/PairNoResult.java
@@ -1,8 +1,7 @@
 package de.dhbwstuttgart.typeinference.result;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 /**
  * enthaelt alle Paare, die in einem Ergebnis nicht vorkommen koennen
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHEqualTPH.java b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHEqualTPH.java
index c24fe211..536581bb 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHEqualTPH.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHEqualTPH.java
@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 public class PairTPHEqualTPH extends ResultPair<TypePlaceholder, TypePlaceholder> {
     public PairTPHEqualTPH(TypePlaceholder tl, TypePlaceholder tr) {
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHequalRefTypeOrWildcardType.java b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHequalRefTypeOrWildcardType.java
index 0c0a5872..786ae511 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHequalRefTypeOrWildcardType.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHequalRefTypeOrWildcardType.java
@@ -1,8 +1,7 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 /**
  * Steht für A =. RefType
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHsmallerTPH.java b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHsmallerTPH.java
index 1df94e6b..04e1e469 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHsmallerTPH.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/PairTPHsmallerTPH.java
@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 
 /**
  * Steht für: A <. B
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/ResolvedType.java b/src/main/java/de/dhbwstuttgart/typeinference/result/ResolvedType.java
index 8e7e8451..4cc48cf8 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResolvedType.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResolvedType.java
@@ -1,8 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 import java.util.Set;
 
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java
index 490e6f95..efc84fbf 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultPair.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
+import de.dhbwstuttgart.syntaxtree.RefTypeOrTPHOrWildcardOrGeneric;
 
 /**
  * Paare, welche das Unifikationsergebnis darstellen
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
index a46b9ed2..28f06fce 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSet.java
@@ -4,12 +4,8 @@ import java.util.HashSet;
 import java.util.Set;
 
 import de.dhbwstuttgart.exceptions.NotImplementedException;
-import de.dhbwstuttgart.syntaxtree.type.ExtendsWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.RefTypeOrTPHOrWildcardOrGeneric;
-import de.dhbwstuttgart.syntaxtree.type.SuperWildcardType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.*;
+import de.dhbwstuttgart.syntaxtree.SuperWildcardType;
 
 @SuppressWarnings("rawtypes")
 public class ResultSet {
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSetVisitor.java b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSetVisitor.java
index 105fc8af..680dcaed 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSetVisitor.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/result/ResultSetVisitor.java
@@ -1,6 +1,6 @@
 package de.dhbwstuttgart.typeinference.result;
 
-import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.*;
 
 public interface ResultSetVisitor extends ResultPairVisitor{
 
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/GenericsResolverSameName.java b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/GenericsResolverSameName.java
index 2bb131f1..17f723a2 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/GenericsResolverSameName.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/GenericsResolverSameName.java
@@ -1,7 +1,6 @@
 package de.dhbwstuttgart.typeinference.typeAlgo;
 
-import de.dhbwstuttgart.syntaxtree.StatementVisitor;
-import de.dhbwstuttgart.syntaxtree.type.*;
+import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.typeinference.constraints.GenericsResolver;
 
 import java.util.ArrayList;
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
index 685ac9f6..5e1b452c 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPE.java
@@ -1,10 +1,6 @@
 package de.dhbwstuttgart.typeinference.typeAlgo;
 
-import de.dhbwstuttgart.exceptions.DebugException;
-import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.statement.Statement;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceInformation;
 import de.dhbwstuttgart.typeinference.constraints.ConstraintSet;
@@ -24,7 +20,7 @@ public class TYPE {
     public ConstraintSet getConstraints() {
         ConstraintSet ret = new ConstraintSet();
         for(SourceFile sf : sfs)
-        for (ClassOrInterface cl : sf.KlassenVektor) {
+        for (ClassOrInterface cl : sf.KlassenVektor()) {
             ret.addAll(getConstraintsClass(cl ,typeInferenceInformation));
         }
         return ret;
@@ -79,7 +75,7 @@ public class TYPE {
         TypeInferenceBlockInformation blockInfo = new TypeInferenceBlockInformation(info.getAvailableClasses(), currentClass, m);
         TYPEStmt methodScope = new TYPEStmt(blockInfo);
         //for(Statement stmt : m.fieldInitializations)stmt.accept(methodScope);
-        ConstraintSet ret = this.getConstraintsMethod(m, info, currentClass);
+        ConstraintSet ret = this.getConstraintsMethod(m.getMethod(), info, currentClass);
         ret.addAll(methodScope.getConstraints());
         return ret;
     }
diff --git a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
index 2860e71b..ee37f1e9 100644
--- a/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
+++ b/src/main/java/de/dhbwstuttgart/typeinference/typeAlgo/TYPEStmt.java
@@ -9,22 +9,15 @@ import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
 import de.dhbwstuttgart.syntaxtree.factory.NameGenerator;
-import de.dhbwstuttgart.syntaxtree.statement.*;
-import de.dhbwstuttgart.syntaxtree.type.*;
-import de.dhbwstuttgart.syntaxtree.type.Void;
 import de.dhbwstuttgart.typeinference.assumptions.FieldAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.FunNClass;
 import de.dhbwstuttgart.typeinference.assumptions.MethodAssumption;
 import de.dhbwstuttgart.typeinference.assumptions.TypeInferenceBlockInformation;
 import de.dhbwstuttgart.typeinference.constraints.*;
-import de.dhbwstuttgart.typeinference.unify.model.ExtendsType;
 import de.dhbwstuttgart.typeinference.unify.model.PairOperator;
-import de.dhbwstuttgart.typeinference.unify.model.PlaceholderType;
-import de.dhbwstuttgart.typeinference.unify.model.UnifyPair;
 
 import java.util.*;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 public class TYPEStmt implements StatementVisitor{
 
@@ -64,7 +57,7 @@ public class TYPEStmt implements StatementVisitor{
     @Override
     public void visit(LambdaExpression lambdaExpression) {
         TypePlaceholder tphRetType = TypePlaceholder.fresh(new NullToken());
-        List<RefTypeOrTPHOrWildcardOrGeneric> lambdaParams = lambdaExpression.params.getFormalparalist().stream().map((formalParameter -> formalParameter.getType())).collect(Collectors.toList());
+        List<RefTypeOrTPHOrWildcardOrGeneric> lambdaParams = lambdaExpression.params().getFormalparalist().stream().map((formalParameter -> formalParameter.getType())).collect(Collectors.toList());
         lambdaParams.add(tphRetType);
         //lambdaParams.add(0,tphRetType);
         constraintsSet.addUndConstraint(
@@ -78,16 +71,16 @@ public class TYPEStmt implements StatementVisitor{
 
         //Constraints des Bodys generieren:
         TYPEStmt lambdaScope = new TYPEStmt(new TypeInferenceBlockInformation(info, lambdaExpression));
-        lambdaExpression.methodBody.accept(lambdaScope);
+        lambdaExpression.methodBody().accept(lambdaScope);
         constraintsSet.addAll(lambdaScope.getConstraints());
     }
 
     @Override
     public void visit(Assign assign) {
-        assign.lefSide.accept(this);
-        assign.rightSide.accept(this);
+        assign.lefSide().accept(this);
+        assign.rightSide().accept(this);
         constraintsSet.addUndConstraint(new Pair(
-                assign.rightSide.getType(), assign.lefSide.getType(), PairOperator.SMALLERDOT));
+                assign.rightSide().getType(), assign.lefSide().getType(), PairOperator.SMALLERDOT));
     }
 
     @Override
@@ -109,18 +102,18 @@ public class TYPEStmt implements StatementVisitor{
 
     @Override
     public void visit(FieldVar fieldVar) {
-        fieldVar.receiver.accept(this);
+        fieldVar.receiver().accept(this);
         Set<Constraint> oderConstraints = new HashSet<>();
-        for(FieldAssumption fieldAssumption : info.getFields(fieldVar.fieldVarName)){
+        for(FieldAssumption fieldAssumption : info.getFields(fieldVar.fieldVarName())){
             Constraint constraint = new Constraint();
             GenericsResolver resolver = getResolverInstance();
-            constraint.add(new Pair(fieldVar.receiver.getType(), fieldAssumption.getReceiverType(resolver), PairOperator.SMALLERDOT)); //PL 2019-12-09: SMALLERDOT eingefuegt, EQUALSDOT entfernt, wenn ds Field privat ist muesste es EQUALSDOT lauten
+            constraint.add(new Pair(fieldVar.receiver().getType(), fieldAssumption.getReceiverType(resolver), PairOperator.SMALLERDOT)); //PL 2019-12-09: SMALLERDOT eingefuegt, EQUALSDOT entfernt, wenn ds Field privat ist muesste es EQUALSDOT lauten
             constraint.add(new Pair(
                     fieldVar.getType(), fieldAssumption.getType(resolver), PairOperator.EQUALSDOT));
             oderConstraints.add(constraint);
         }
         if(oderConstraints.size() == 0)
-            throw new TypeinferenceException("Kein Feld "+fieldVar.fieldVarName+ " gefunden", fieldVar.getOffset());
+            throw new TypeinferenceException("Kein Feld "+fieldVar.fieldVarName()+ " gefunden", fieldVar.getOffset());
         constraintsSet.addOderConstraint(oderConstraints);
     }
 
@@ -133,16 +126,16 @@ public class TYPEStmt implements StatementVisitor{
     public void visit(IfStmt ifStmt) {
         RefType booleanType = new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken());
         //Expression inferieren:
-        ifStmt.expr.accept(this);
+        ifStmt.expr().accept(this);
         //Expression muss boolean sein:
-        constraintsSet.addUndConstraint(new Pair(ifStmt.expr.getType(), booleanType, PairOperator.EQUALSDOT));
+        constraintsSet.addUndConstraint(new Pair(ifStmt.expr().getType(), booleanType, PairOperator.EQUALSDOT));
         //Blöcke inferieren:
-        ifStmt.then_block.accept(this);
+        ifStmt.then_block().accept(this);
         //Beide Blöcke müssen den gleichen Supertyp haben, welcher den Rückgabetyp des If-Stmts darstellt
-        constraintsSet.addUndConstraint(new Pair(ifStmt.else_block.getType(), ifStmt.getType(), PairOperator.SMALLERDOT));
-        if(ifStmt.else_block != null){
-            ifStmt.else_block.accept(this);
-            constraintsSet.addUndConstraint(new Pair(ifStmt.else_block.getType(), ifStmt.getType(), PairOperator.SMALLERDOT));
+        constraintsSet.addUndConstraint(new Pair(ifStmt.else_block().getType(), ifStmt.getType(), PairOperator.SMALLERDOT));
+        if(ifStmt.else_block() != null){
+            ifStmt.else_block().accept(this);
+            constraintsSet.addUndConstraint(new Pair(ifStmt.else_block().getType(), ifStmt.getType(), PairOperator.SMALLERDOT));
         }
 
     }
@@ -166,10 +159,10 @@ public class TYPEStmt implements StatementVisitor{
     //Es wird in OderConstraints davon ausgegangen dass die Bedingungen für die Typen der Argumente links stehen
   	//und die Typen der Rückgabewerte immer rechts stehen (vgl. JavaTXCompiler)
     public void visit(MethodCall methodCall) {
-        methodCall.receiver.accept(this);
+        methodCall.receiver().accept(this);
         //Overloading:
         Set<Constraint<Pair>> methodConstraints = new HashSet<>();
-        for(MethodAssumption m : this.getMethods(methodCall.name, methodCall.arglist, info)){
+        for(MethodAssumption m : this.getMethods(methodCall.name(), methodCall.arglist(), info)){
             GenericsResolver resolver = getResolverInstance();
             Constraint<Pair> oneMethodConstraint = generateConstraint(methodCall, m, info, resolver);
             methodConstraints.add(oneMethodConstraint);
@@ -187,7 +180,7 @@ public class TYPEStmt implements StatementVisitor{
             methodConstraints.add(extendsOneMethodConstraint);
         }
         if(methodConstraints.size()<1){
-            throw new TypeinferenceException("Methode "+methodCall.name+" ist nicht vorhanden!",methodCall.getOffset());
+            throw new TypeinferenceException("Methode "+methodCall.name()+" ist nicht vorhanden!",methodCall.getOffset());
         }
         constraintsSet.addOderConstraint(methodConstraints);
     }
@@ -212,7 +205,7 @@ public class TYPEStmt implements StatementVisitor{
 
     @Override
     public void visit(ExpressionReceiver receiver) {
-        receiver.expr.accept(this);
+        receiver.expr().accept(this);
     }
 
     private final RefType number = new RefType(ASTFactory.createClass(Number.class).getClassName(), new NullToken());
@@ -226,15 +219,15 @@ public class TYPEStmt implements StatementVisitor{
     private final RefType bool =  new RefType(ASTFactory.createClass(Boolean.class).getClassName(), new NullToken());
     @Override
     public void visit(UnaryExpr unaryExpr) {
-        if(unaryExpr.operation == UnaryExpr.Operation.POSTDECREMENT ||
-                unaryExpr.operation == UnaryExpr.Operation.POSTINCREMENT ||
-                unaryExpr.operation == UnaryExpr.Operation.PREDECREMENT ||
-                unaryExpr.operation == UnaryExpr.Operation.PREINCREMENT){
+        if(unaryExpr.operation() == UnaryExpr.Operation.POSTDECREMENT ||
+                unaryExpr.operation() == UnaryExpr.Operation.POSTINCREMENT ||
+                unaryExpr.operation() == UnaryExpr.Operation.PREDECREMENT ||
+                unaryExpr.operation() == UnaryExpr.Operation.PREINCREMENT){
             //@see: https://docs.oracle.com/javase/specs/jls/se7/html/jls-15.html#jls-15.14.2
             //Expression muss zu Numeric Convertierbar sein. also von Numeric erben
-            constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), number, PairOperator.SMALLERNEQDOT));
+            constraintsSet.addUndConstraint(new Pair(unaryExpr.expr().getType(), number, PairOperator.SMALLERNEQDOT));
             //The type of the postfix increment expression is the type of the variable
-            constraintsSet.addUndConstraint(new Pair(unaryExpr.expr.getType(), unaryExpr.getType(), PairOperator.EQUALSDOT));
+            constraintsSet.addUndConstraint(new Pair(unaryExpr.expr().getType(), unaryExpr.getType(), PairOperator.EQUALSDOT));
         }else{
             throw new NotImplementedException();
         }
@@ -244,13 +237,13 @@ public class TYPEStmt implements StatementVisitor{
     //Es wird in OderConstraints davon ausgegangen dass die Bedingungen für die Typen der Argumente links stehen
 	//und die Typen der Rückgabewerte immer rechts stehen (vgl. JavaTXCompiler)
     public void visit(BinaryExpr binary) {
-    		binary.lexpr.accept(this);
-    		binary.rexpr.accept(this);
-        if(binary.operation.equals(BinaryExpr.Operator.DIV) ||
-                binary.operation.equals(BinaryExpr.Operator.MUL)||
-                binary.operation.equals(BinaryExpr.Operator.MOD)||
-                binary.operation.equals(BinaryExpr.Operator.ADD)||
-                binary.operation.equals(BinaryExpr.Operator.SUB)) {
+    		binary.lexpr().accept(this);
+    		binary.rexpr().accept(this);
+        if(binary.operation().equals(BinaryExpr.Operator.DIV) ||
+                binary.operation().equals(BinaryExpr.Operator.MUL)||
+                binary.operation().equals(BinaryExpr.Operator.MOD)||
+                binary.operation().equals(BinaryExpr.Operator.ADD)||
+                binary.operation().equals(BinaryExpr.Operator.SUB)) {
             Set<Constraint<Pair>> numericAdditionOrStringConcatenation = new HashSet<>();
 
 // TODO PL 2018-11-06
@@ -267,48 +260,48 @@ public class TYPEStmt implements StatementVisitor{
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(bytee.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), bytee, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), bytee, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), bytee, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), bytee, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.getType(), integer, PairOperator.EQUALSDOT));
                 numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(shortt.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), shortt, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), shortt, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), shortt, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), shortt, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(binary.getType(), integer, PairOperator.EQUALSDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(integer.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), integer, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), integer, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), integer, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), integer, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(integer, binary.getType(), PairOperator.EQUALSDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(longg.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), longg, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), longg, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), longg, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), longg, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(longg, binary.getType(), PairOperator.EQUALSDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(floatt.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), floatt, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), floatt, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), floatt, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), floatt, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(floatt, binary.getType(), PairOperator.EQUALSDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
             //PL eingefuegt 2018-07-17
             if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(doublee.getName())) {
             	numeric = new Constraint<>();
-            	numeric.add(new Pair(binary.lexpr.getType(), doublee, PairOperator.SMALLERDOT));
-            	numeric.add(new Pair(binary.rexpr.getType(), doublee, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.lexpr().getType(), doublee, PairOperator.SMALLERDOT));
+            	numeric.add(new Pair(binary.rexpr().getType(), doublee, PairOperator.SMALLERDOT));
             	numeric.add(new Pair(doublee, binary.getType(), PairOperator.EQUALSDOT));
             	numericAdditionOrStringConcatenation.add(numeric);
             }
@@ -323,24 +316,24 @@ public class TYPEStmt implements StatementVisitor{
             numericAdditionOrStringConcatenation.add(numeric);
             * PL auskommentiert Ende 2018-07-17 */
             
-            if(binary.operation.equals(BinaryExpr.Operator.ADD)) {
+            if(binary.operation().equals(BinaryExpr.Operator.ADD)) {
                 //Dann kann der Ausdruck auch das aneinanderfügen zweier Strings sein: ("a" + "b") oder (1 + 2)
             	if (info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new)).contains(string.getName())) {
             		Constraint<Pair> stringConcat = new Constraint<>();
-            		stringConcat.add(new Pair(binary.lexpr.getType(), string, PairOperator.EQUALSDOT));
-            		stringConcat.add(new Pair(binary.rexpr.getType(), string, PairOperator.EQUALSDOT));
+            		stringConcat.add(new Pair(binary.lexpr().getType(), string, PairOperator.EQUALSDOT));
+            		stringConcat.add(new Pair(binary.rexpr().getType(), string, PairOperator.EQUALSDOT));
             		stringConcat.add(new Pair(string, binary.getType(), PairOperator.EQUALSDOT));
             		numericAdditionOrStringConcatenation.add(stringConcat);
             	}
             }
             if(numericAdditionOrStringConcatenation.size()<1){
-                throw new TypeinferenceException("Kein Typ für " + binary.operation.toString() + "  vorhanden", binary.getOffset());
+                throw new TypeinferenceException("Kein Typ für " + binary.operation().toString() + "  vorhanden", binary.getOffset());
             }
             constraintsSet.addOderConstraint(numericAdditionOrStringConcatenation);
-        }else if(binary.operation.equals(BinaryExpr.Operator.LESSEQUAL) ||
-                binary.operation.equals(BinaryExpr.Operator.BIGGEREQUAL) ||
-                binary.operation.equals(BinaryExpr.Operator.BIGGERTHAN) ||
-                binary.operation.equals(BinaryExpr.Operator.LESSTHAN)) {
+        }else if(binary.operation().equals(BinaryExpr.Operator.LESSEQUAL) ||
+                binary.operation().equals(BinaryExpr.Operator.BIGGEREQUAL) ||
+                binary.operation().equals(BinaryExpr.Operator.BIGGERTHAN) ||
+                binary.operation().equals(BinaryExpr.Operator.LESSTHAN)) {
   /*      	//eingefuegt PL 2018-05-24
         	Set<Constraint<Pair>> numericRelationConcatenation = new HashSet<>();
         	Constraint<Pair> numeric = new Constraint<>();
@@ -380,8 +373,8 @@ public class TYPEStmt implements StatementVisitor{
     */
             //Testeise eingefuegt PL 2018-05-24
         	//Hier sollte evtl. noch importe angefragt werden PL 2019-05-07
-            constraintsSet.addUndConstraint(new Pair(binary.lexpr.getType(), number, PairOperator.SMALLERNEQDOT));
-            constraintsSet.addUndConstraint(new Pair(binary.rexpr.getType(), number, PairOperator.SMALLERNEQDOT));
+            constraintsSet.addUndConstraint(new Pair(binary.lexpr().getType(), number, PairOperator.SMALLERNEQDOT));
+            constraintsSet.addUndConstraint(new Pair(binary.rexpr().getType(), number, PairOperator.SMALLERNEQDOT));
             //Rückgabetyp ist Boolean
             constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.EQUALSDOT));
 
@@ -390,7 +383,7 @@ public class TYPEStmt implements StatementVisitor{
             //constraintsSet.addUndConstraint(new Pair(binary.rexpr.getType(), number, PairOperator.SMALLERDOT));
             //Rückgabetyp ist Boolean
             //constraintsSet.addUndConstraint(new Pair(bool, binary.getType(), PairOperator.EQUALSDOT));
-        }else if(binary.operation.equals(BinaryExpr.Operator.EQUAL) || binary.operation.equals(BinaryExpr.Operator.NOTEQUAL)){
+        }else if(binary.operation().equals(BinaryExpr.Operator.EQUAL) || binary.operation().equals(BinaryExpr.Operator.NOTEQUAL)){
             /*Auszug aus https://docs.oracle.com/javase/specs/jls/se9/html/jls-15.html#jls-15.21
             The equality operators may be used to compare two operands that are convertible (§5.1.8) to numeric type, or two operands of type boolean or Boolean, or two operands that are each of either reference type or the null type. All other cases result in a compile-time error.
              */
@@ -407,27 +400,27 @@ public class TYPEStmt implements StatementVisitor{
     	//PL 2018-06-23 Sie haben einen Typ. Der muesste hier eingefuegt werden
     	//wie hier fuer double gezeigt. Im Momment auskommentiert, weil zu wenige Literaltypen
     	//funktionieren
-    	if (literal.value instanceof Short) {
+    	if (literal.value() instanceof Short) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(), shortt, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Byte) { 
+    	if (literal.value() instanceof Byte) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(), bytee, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Float) { 
+    	if (literal.value() instanceof Float) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(), floatt, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Double) {
+    	if (literal.value() instanceof Double) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(), doublee, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Long) { 
+    	if (literal.value() instanceof Long) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(), longg, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Integer) { 
+    	if (literal.value() instanceof Integer) {
     		//constraintsSet.addUndConstraint(new Pair(literal.getType(),integer, PairOperator.EQUALSDOT)); 
     		// /*
     		HashSet<JavaClassName> clNames = info.getAvailableClasses().stream().map(x -> x.getClassName()).collect(Collectors.toCollection(HashSet::new));
@@ -464,23 +457,23 @@ public class TYPEStmt implements StatementVisitor{
     		// */
     		return;
     	}
-    	if (literal.value instanceof Short) { 
+    	if (literal.value() instanceof Short) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(),shortt, PairOperator.EQUALSDOT)); 
     		return;
     	}
-    	if (literal.value instanceof Byte) { 
+    	if (literal.value() instanceof Byte) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(),bytee, PairOperator.EQUALSDOT));
     		return; 
     	}
-    	if (literal.value instanceof Float) { 
+    	if (literal.value() instanceof Float) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(),floatt, PairOperator.EQUALSDOT)); 
     		return;
     	}
-    	if (literal.value instanceof String) { 
+    	if (literal.value() instanceof String) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(),string, PairOperator.EQUALSDOT));
     		return;
     	}
-    	if (literal.value instanceof Boolean) {
+    	if (literal.value() instanceof Boolean) {
     		constraintsSet.addUndConstraint(new Pair(literal.getType(),bool, PairOperator.EQUALSDOT));
     		return;
     	}
@@ -491,13 +484,13 @@ public class TYPEStmt implements StatementVisitor{
 
     @Override
     public void visit(Return returnExpr) {
-        returnExpr.retexpr.accept(this);
+        returnExpr.retexpr().accept(this);
         constraintsSet.addUndConstraint(new Pair(returnExpr.getType(),info.getCurrentTypeScope().getReturnType(), PairOperator.EQUALSDOT));
     }
 
     @Override
     public void visit(ReturnVoid aReturn) {
-        visit((Return) aReturn);
+        visit(aReturn);
     }
 
     @Override
@@ -541,11 +534,11 @@ public class TYPEStmt implements StatementVisitor{
     public void visit(WhileStmt whileStmt) {
         RefType booleanType = new RefType(ASTFactory.createClass(java.lang.Boolean.class).getClassName(), new NullToken());
         //Expression inferieren:
-        whileStmt.expr.accept(this);
+        whileStmt.expr().accept(this);
         //Expression muss boolean sein:
-        constraintsSet.addUndConstraint(new Pair(whileStmt.expr.getType(), booleanType, PairOperator.EQUALSDOT));
+        constraintsSet.addUndConstraint(new Pair(whileStmt.expr().getType(), booleanType, PairOperator.EQUALSDOT));
         //LoopBlock inferieren:
-        whileStmt.loopBlock.accept(this);
+        whileStmt.loopBlock().accept(this);
     }
 
     @Override
@@ -589,7 +582,7 @@ public class TYPEStmt implements StatementVisitor{
         */
         
         RefTypeOrTPHOrWildcardOrGeneric retType = assumption.getReceiverType(resolver);
-        methodConstraint.add(new Pair(forMethod.receiver.getType(), retType,
+        methodConstraint.add(new Pair(forMethod.receiver().getType(), retType,
         		             PairOperator.EQUALSDOT));//PL 2020-03-17 SMALLERDOT in EQUALSDOT umgewandelt, weil alle geerbten Methoden in den jeweilen Klassen enthalten sind. 
         		       
         //Fuer Bytecodegenerierung PL 2020-03-09 wird derzeit nicht benutzt ANFANG
@@ -608,9 +601,9 @@ public class TYPEStmt implements StatementVisitor{
     protected Set<Pair> generateParameterConstraints(MethodCall foMethod, MethodAssumption assumption,
                                                      TypeInferenceBlockInformation info, GenericsResolver resolver) {
         Set<Pair> ret = new HashSet<>();
-        for(int i = 0;i<foMethod.arglist.getArguments().size();i++){
-            foMethod.arglist.getArguments().get(i).accept(this);
-            RefTypeOrTPHOrWildcardOrGeneric argType = foMethod.arglist.getArguments().get(i).getType();
+        for(int i = 0;i<foMethod.arglist().getArguments().size();i++){
+            foMethod.arglist().getArguments().get(i).accept(this);
+            RefTypeOrTPHOrWildcardOrGeneric argType = foMethod.arglist().getArguments().get(i).getType();
             RefTypeOrTPHOrWildcardOrGeneric assType = assumption.getArgTypes(resolver).get(i);
             ret.add(new Pair(argType, assType, PairOperator.SMALLERDOT));
             
@@ -653,7 +646,7 @@ public class TYPEStmt implements StatementVisitor{
                     RefTypeOrTPHOrWildcardOrGeneric retType = m.getReturnType();//info.checkGTV(m.getReturnType());
 
                     ret.add(new MethodAssumption(cl, retType, convertParams(m.getParameterList(),info),
-                           createTypeScope(cl, m), m.isInherited));
+                           createTypeScope(cl, m), m.isInherited()));
                 }
             }
         }
@@ -685,10 +678,10 @@ public class TYPEStmt implements StatementVisitor{
         List<MethodAssumption> ret = new ArrayList<>();
         for(ClassOrInterface cl : info.getAvailableClasses()){
             if(cl.getClassName().equals(ofType.getName())){
-                for(Method m : cl.getConstructors()){
+                for(Constructor m : cl.getConstructors()){
                     if(m.getParameterList().getFormalparalist().size() == argList.getArguments().size()){
                         ret.add(new MethodAssumption(cl, ofType, convertParams(m.getParameterList(),
-                                info), createTypeScope(cl, m), m.isInherited));
+                                info), createTypeScope(cl, Constructor.getMethod()), m.isInherited()));
                     }
                 }
             }
@@ -704,7 +697,7 @@ public class TYPEStmt implements StatementVisitor{
         methodConstraint.add(new Pair(assumption.getReturnType(resolver), forConstructor.getType(),
                 PairOperator.SMALLERDOT));
         //WELCHEN SINN MACHT DIESER CONSTRAINT??? 
-        methodConstraint.addAll(generateParameterConstraints(forConstructor, assumption, info, resolver));
+        methodConstraint.addAll(generateParameterConstraints(NewClass.getMethodcall(), assumption, info, resolver));
         return methodConstraint;
     }
 
diff --git a/src/test/java/astfactory/ASTFactoryTest.java b/src/test/java/astfactory/ASTFactoryTest.java
index 6285cf0a..71e17ffc 100644
--- a/src/test/java/astfactory/ASTFactoryTest.java
+++ b/src/test/java/astfactory/ASTFactoryTest.java
@@ -3,7 +3,7 @@ package astfactory;
 //import javafx.collections.ObservableList;
 import de.dhbwstuttgart.syntaxtree.ClassOrInterface;
 import de.dhbwstuttgart.syntaxtree.factory.ASTFactory;
-import de.dhbwstuttgart.syntaxtree.type.GenericRefType;
+import de.dhbwstuttgart.syntaxtree.GenericRefType;
 import org.junit.Test;
 
 import java.lang.reflect.ParameterizedType;
diff --git a/src/test/java/constraintSimplify/FamilyOfGenerics.java b/src/test/java/constraintSimplify/FamilyOfGenerics.java
index e5c9ad13..1e75aa4f 100644
--- a/src/test/java/constraintSimplify/FamilyOfGenerics.java
+++ b/src/test/java/constraintSimplify/FamilyOfGenerics.java
@@ -6,9 +6,9 @@ import de.dhbwstuttgart.bytecode.genericsGenerator.GeneratedGenericsFinder;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.statement.Block;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-import de.dhbwstuttgart.syntaxtree.type.TypePlaceholder;
+import de.dhbwstuttgart.syntaxtree.Block;
+import de.dhbwstuttgart.syntaxtree.RefType;
+import de.dhbwstuttgart.syntaxtree.TypePlaceholder;
 import de.dhbwstuttgart.typeinference.result.ResultSet;
 import org.junit.Test;
 
diff --git a/src/test/java/parser/GeneralParserTest.java b/src/test/java/parser/GeneralParserTest.java
index 4e7d9868..1ae0ecd2 100644
--- a/src/test/java/parser/GeneralParserTest.java
+++ b/src/test/java/parser/GeneralParserTest.java
@@ -42,7 +42,8 @@ public class GeneralParserTest{
 		filenames.add("StructuralTypes.jav");
 		*/
 //		filenames.add("ExtendsTest.jav");
-		filenames.add("PackageNameTest.jav");
+		//filenames.add("PackageNameTest.jav");
+		filenames.add("AntlrTest.jav");
 		try{
 			new JavaTXCompiler(filenames.stream().map(s -> new File(rootDirectory + s)).collect(Collectors.toList()));
 		}catch(Exception exc){
diff --git a/src/test/java/targetast/ASTToTypedTargetAST.java b/src/test/java/targetast/ASTToTypedTargetAST.java
index 4a46db0c..28d299a9 100644
--- a/src/test/java/targetast/ASTToTypedTargetAST.java
+++ b/src/test/java/targetast/ASTToTypedTargetAST.java
@@ -4,7 +4,7 @@ import de.dhbwstuttgart.core.JavaTXCompiler;
 import de.dhbwstuttgart.parser.NullToken;
 import de.dhbwstuttgart.parser.scope.JavaClassName;
 import de.dhbwstuttgart.syntaxtree.*;
-import de.dhbwstuttgart.syntaxtree.type.RefType;
+import de.dhbwstuttgart.syntaxtree.RefType;
 import de.dhbwstuttgart.target.generate.ASTToTargetAST;
 import de.dhbwstuttgart.target.tree.TargetClass;
 import de.dhbwstuttgart.typeinference.result.ResultSet;