diff --git a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
index 744aa27..c9327d6 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/java/JavaParser.java
@@ -12,6 +12,7 @@ import java.util.List;
 import be.jeffcheasey88.peeratcode.parser.Parser;
 import be.jeffcheasey88.peeratcode.parser.Token;
 import be.jeffcheasey88.peeratcode.parser.Tokenizer;
+import be.jeffcheasey88.peeratcode.parser.state.BuilderStateTree;
 import be.jeffcheasey88.peeratcode.parser.state.StateTree;
 
 public class JavaParser  extends Parser<JavaFile> {
@@ -36,6 +37,7 @@ public class JavaParser  extends Parser<JavaFile> {
 	public JavaParser(){
 		Tokenizer tokenizer = new Tokenizer();
 		
+		StateTree<JavaFile> clazz = new StateTree<>();
 		
 		StateTree<JavaFile> importState = new StateTree<>();
 		importState.then((validator) -> {
@@ -60,7 +62,7 @@ public class JavaParser  extends Parser<JavaFile> {
 		
 		StateTree<JavaFile> main = new StateTree<>();
 		
-		main.then((validator) -> {			
+		BuilderStateTree<JavaFile, JavaElement> pack = main.then((validator) -> {			
 			if(validator.validate(
 					(token) -> token.getValue().equals("package"),
 					(bag, token) -> bag.set(new LinkedList<>()))){
@@ -73,8 +75,9 @@ public class JavaParser  extends Parser<JavaFile> {
 				return validator.validate((token) -> token.getValue().equals(";"));
 			}
 			return false;
-		}).<JavaElement>end((javafile, bag) -> javafile.setPackage(bag))
-			.multiple(importState);
+		}).<JavaElement>end((javafile, bag) -> javafile.setPackage(bag));
+		pack.multiple(importState);
+		pack.thenNoChild(clazz);
 		
 		
 		System.out.println((System.currentTimeMillis()-time)+"ms");
diff --git a/src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java b/src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java
index d33b9b8..1e82f7c 100644
--- a/src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java
+++ b/src/be/jeffcheasey88/peeratcode/parser/state/BuilderStateTree.java
@@ -35,6 +35,24 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 	}
 	
 	void internalSeedNoChilds(TokenValidator validator, E element){
+		if(multiple != null){
+			TokenValidator branch = validator.branch();
+			if(multiple.checker == null){
+				BuilderStateTree<E, ?> builded;
+				while((builded = multiple.internalSeed(branch, element)) != null){
+					validator.merge(branch);
+					builded.build(validator, element);
+				}
+			}else{
+				while(multiple.checker.apply(branch)){
+					BuilderStateTree<E, ?> builded = multiple.internalSeed(branch, element);
+					if(builded != null){
+						validator.merge(branch);
+						builded.build(validator, element);
+					}
+				}
+			}
+		}
 		for(StateTree<E> child : this.childs){
 			TokenValidator branch = validator.branch();
 			if(child.checker == null){
@@ -55,25 +73,6 @@ public class BuilderStateTree<E, B> extends StateTree<B>{
 				}
 			}
 		}
-		
-		if(multiple != null){
-			TokenValidator branch = validator.branch();
-			if(multiple.checker == null){
-				BuilderStateTree<E, ?> builded;
-				while((builded = multiple.internalSeed(branch, element)) != null){
-					validator.merge(branch);
-					builded.build(validator, element);
-				}
-				return;
-			}
-			while(multiple.checker.apply(branch)){
-				BuilderStateTree<E, ?> builded = multiple.internalSeed(branch, element);
-				if(builded != null){
-					validator.merge(branch);
-					builded.build(validator, element);
-				}
-			}
-		}
 	}
 	
 	public <T extends StateTree<E>> StateTree<E> thenNoChild(StateTree<E> child){