diff --git a/src/de/dhbwstuttgart/parser/CompilationUnitEvaluator.java b/src/de/dhbwstuttgart/parser/CompilationUnitEvaluator.java
new file mode 100644
index 00000000..496dd290
--- /dev/null
+++ b/src/de/dhbwstuttgart/parser/CompilationUnitEvaluator.java
@@ -0,0 +1,12 @@
+package de.dhbwstuttgart.parser;
+import org.antlr.v4.runtime.tree.*;
+import de.dhbwstuttgart.syntaxtree.*;
+public class CompilationUnitEvaluator extends Java8BaseListener{
+	@Override
+	public void exitCompilationUnit(Java8Parser.CompilationUnitContext ctx) {
+		// SourceFile result = new SourceFile(new List<Class>());
+		System.out.println("sourceFile(");
+		System.out.println(ctx.packageDeclaration());
+		System.out.println(")");
+	}
+}
diff --git a/src/de/dhbwstuttgart/parser/JavaClassName.java b/src/de/dhbwstuttgart/parser/JavaClassName.java
deleted file mode 100644
index 4e6ba81b..00000000
--- a/src/de/dhbwstuttgart/parser/JavaClassName.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package de.dhbwstuttgart.parser;
-
-import de.dhbwstuttgart.typeinference.Menge;
-
-import de.dhbwstuttgart.syntaxtree.type.RefType;
-
-/**
- * Stellt den Namen einer Java Klasse dar. 
- * Dieser kann auch den Packagenamen mit beinhalten: de.dhbwstuttgart.typeinference.Menge
- * 
- * @author janulrich
- * 
- *
- */
-public class JavaClassName {
-
-	private String name;
-	private PackageName packageName;
-	
-	/**
-	 * TODO: JavaClassName sollten aus den Assumptions generiert werden.
-	 * Diese wissen, welche Typen und Typnamen existieren und können direkt auf Korrektheit prüfen.
-	 */
-	JavaClassName(String name){
-		if(name == null)throw new NullPointerException();
-		
-		String[] names = name.split("[.]");
-		boolean match = true;
-		if(names.length == 1){
-			//packageName = new PackageName();
-			this.name = name;
-		}else {
-			name = names[names.length-1];
-			Menge<String> packageNames = new Menge<String>();
-			for(int i = 0; i<names.length-1;i++){
-				packageNames.add(names[i]);
-			}
-			packageName = new PackageName(packageNames);
-			this.name = names[names.length-1];
-		}
-	}
-	
-	//Auto-generated hashCode:
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((name == null) ? 0 : name.hashCode());
-		//result = prime * result
-		//		+ ((packageName == null) ? 0 : packageName.hashCode()); //PackageName does not infect hashCode
-		return result;
-	}
-
-	/**
-	 * Namen sind nur gleich, wenn bei den beiden zu vergleichenden JavaClassNames auch das Package angegeben ist
-	 */
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if(obj instanceof String)
-			return this.toString().equals(obj) || (this.name != null && this.name.equals(obj)); //Auch mit Strings als Klassennamen kompatibel TODO: sollte bald obsolet sein
-		if (getClass() != obj.getClass())
-			return false;
-		JavaClassName other = (JavaClassName) obj;
-		if (name == null) {
-			if (other.name != null)
-				return false;
-		} else if (!name.equals(other.name))
-			return false;
-		if (packageName != null && other.packageName != null) {
-			if (!packageName.equals(other.packageName))
-				return false;//Spezialfall, nicht beide Typen müssen eindeutig mit Packagenamen angegeben werden
-		}
-		return true;
-	}
-
-	@Override
-	public String toString() {
-		return (packageName!=null ? packageName.toString() : "") + name;
-	}
-}
-
-class PackageName{
-
-	Menge<String> names = new Menge<String>();
-	
-	public PackageName(Menge<String> packageNames) {
-		names = packageNames;
-	}
-
-	public PackageName() {
-		//Do nothing
-	}
-
-	@Override
-	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((names == null) ? 0 : names.hashCode());
-		return result;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
-		PackageName other = (PackageName) obj;
-		if (names == null) {
-			if (other.names != null)
-				return false;
-		} else if (!names.equals(other.names))
-			return false;
-		return true;
-	}
-	
-	@Override
-	public String toString() {
-		String ret = "";
-		if(names == null)return "";
-		for(String n : names)ret+=n+".";
-		return ret;
-	}
-}
diff --git a/src/de/dhbwstuttgart/parser/JavaClassRegistry.java b/src/de/dhbwstuttgart/parser/JavaClassRegistry.java
deleted file mode 100644
index 4282f662..00000000
--- a/src/de/dhbwstuttgart/parser/JavaClassRegistry.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package de.dhbwstuttgart.parser;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Speichert die Klassen im aktuellen Projektscope
- */
-public class JavaClassRegistry {
-    public List<JavaClassName> existingClasses = new ArrayList<>();
-
-    public JavaClassName getName(String className) {
-        for(JavaClassName name : existingClasses){
-            if(name.toString().equals(className))return name;
-        }
-        throw new TypeNotPresentException(className, new Throwable());
-    }
-}