diff --git a/src/test/java/java/astfactory/ASTFactoryTest.java b/src/test/java/astfactory/ASTFactoryTest.java
similarity index 100%
rename from src/test/java/java/astfactory/ASTFactoryTest.java
rename to src/test/java/astfactory/ASTFactoryTest.java
diff --git a/src/test/java/java/bytecode/BinaryTest.java b/src/test/java/bytecode/BinaryTest.java
similarity index 100%
rename from src/test/java/java/bytecode/BinaryTest.java
rename to src/test/java/bytecode/BinaryTest.java
diff --git a/src/test/java/java/bytecode/ClassGenLamTest.java b/src/test/java/bytecode/ClassGenLamTest.java
similarity index 100%
rename from src/test/java/java/bytecode/ClassGenLamTest.java
rename to src/test/java/bytecode/ClassGenLamTest.java
diff --git a/src/test/java/java/bytecode/FacTest.java b/src/test/java/bytecode/FacTest.java
similarity index 100%
rename from src/test/java/java/bytecode/FacTest.java
rename to src/test/java/bytecode/FacTest.java
diff --git a/src/test/java/java/bytecode/FacultyTest.java b/src/test/java/bytecode/FacultyTest.java
similarity index 100%
rename from src/test/java/java/bytecode/FacultyTest.java
rename to src/test/java/bytecode/FacultyTest.java
diff --git a/src/test/java/java/bytecode/FieldTest.java b/src/test/java/bytecode/FieldTest.java
similarity index 100%
rename from src/test/java/java/bytecode/FieldTest.java
rename to src/test/java/bytecode/FieldTest.java
diff --git a/src/test/java/java/bytecode/FieldTph2Test.java b/src/test/java/bytecode/FieldTph2Test.java
similarity index 100%
rename from src/test/java/java/bytecode/FieldTph2Test.java
rename to src/test/java/bytecode/FieldTph2Test.java
diff --git a/src/test/java/java/bytecode/FieldTphConsMethTest.java b/src/test/java/bytecode/FieldTphConsMethTest.java
similarity index 100%
rename from src/test/java/java/bytecode/FieldTphConsMethTest.java
rename to src/test/java/bytecode/FieldTphConsMethTest.java
diff --git a/src/test/java/java/bytecode/FieldTphMMethTest.java b/src/test/java/bytecode/FieldTphMMethTest.java
similarity index 100%
rename from src/test/java/java/bytecode/FieldTphMMethTest.java
rename to src/test/java/bytecode/FieldTphMMethTest.java
diff --git a/src/test/java/java/bytecode/GenTest.java b/src/test/java/bytecode/GenTest.java
similarity index 100%
rename from src/test/java/java/bytecode/GenTest.java
rename to src/test/java/bytecode/GenTest.java
diff --git a/src/test/java/java/bytecode/GreaterEqualTest.java b/src/test/java/bytecode/GreaterEqualTest.java
similarity index 100%
rename from src/test/java/java/bytecode/GreaterEqualTest.java
rename to src/test/java/bytecode/GreaterEqualTest.java
diff --git a/src/test/java/java/bytecode/GreaterThanTest.java b/src/test/java/bytecode/GreaterThanTest.java
similarity index 100%
rename from src/test/java/java/bytecode/GreaterThanTest.java
rename to src/test/java/bytecode/GreaterThanTest.java
diff --git a/src/test/java/java/bytecode/IdTest.java b/src/test/java/bytecode/IdTest.java
similarity index 100%
rename from src/test/java/java/bytecode/IdTest.java
rename to src/test/java/bytecode/IdTest.java
diff --git a/src/test/java/java/bytecode/InfTest.java b/src/test/java/bytecode/InfTest.java
similarity index 100%
rename from src/test/java/java/bytecode/InfTest.java
rename to src/test/java/bytecode/InfTest.java
diff --git a/src/test/java/java/bytecode/InheritTest.java b/src/test/java/bytecode/InheritTest.java
similarity index 100%
rename from src/test/java/java/bytecode/InheritTest.java
rename to src/test/java/bytecode/InheritTest.java
diff --git a/src/test/java/java/bytecode/InheritTest2.java b/src/test/java/bytecode/InheritTest2.java
similarity index 100%
rename from src/test/java/java/bytecode/InheritTest2.java
rename to src/test/java/bytecode/InheritTest2.java
diff --git a/src/test/java/java/bytecode/KompTphTest.java b/src/test/java/bytecode/KompTphTest.java
similarity index 100%
rename from src/test/java/java/bytecode/KompTphTest.java
rename to src/test/java/bytecode/KompTphTest.java
diff --git a/src/test/java/java/bytecode/LambdaCapturetest.java b/src/test/java/bytecode/LambdaCapturetest.java
similarity index 100%
rename from src/test/java/java/bytecode/LambdaCapturetest.java
rename to src/test/java/bytecode/LambdaCapturetest.java
diff --git a/src/test/java/java/bytecode/LambdaTest.java b/src/test/java/bytecode/LambdaTest.java
similarity index 100%
rename from src/test/java/java/bytecode/LambdaTest.java
rename to src/test/java/bytecode/LambdaTest.java
diff --git a/src/test/java/java/bytecode/LambdaVoidTest.java b/src/test/java/bytecode/LambdaVoidTest.java
similarity index 100%
rename from src/test/java/java/bytecode/LambdaVoidTest.java
rename to src/test/java/bytecode/LambdaVoidTest.java
diff --git a/src/test/java/java/bytecode/LessEqualTest.java b/src/test/java/bytecode/LessEqualTest.java
similarity index 100%
rename from src/test/java/java/bytecode/LessEqualTest.java
rename to src/test/java/bytecode/LessEqualTest.java
diff --git a/src/test/java/java/bytecode/LessThanTest.java b/src/test/java/bytecode/LessThanTest.java
similarity index 100%
rename from src/test/java/java/bytecode/LessThanTest.java
rename to src/test/java/bytecode/LessThanTest.java
diff --git a/src/test/java/java/bytecode/MatrixOpTest.java b/src/test/java/bytecode/MatrixOpTest.java
similarity index 100%
rename from src/test/java/java/bytecode/MatrixOpTest.java
rename to src/test/java/bytecode/MatrixOpTest.java
diff --git a/src/test/java/java/bytecode/MatrixTest.java b/src/test/java/bytecode/MatrixTest.java
similarity index 100%
rename from src/test/java/java/bytecode/MatrixTest.java
rename to src/test/java/bytecode/MatrixTest.java
diff --git a/src/test/java/java/bytecode/MergeTest.java b/src/test/java/bytecode/MergeTest.java
similarity index 100%
rename from src/test/java/java/bytecode/MergeTest.java
rename to src/test/java/bytecode/MergeTest.java
diff --git a/src/test/java/java/bytecode/OLFunTest.java b/src/test/java/bytecode/OLFunTest.java
similarity index 100%
rename from src/test/java/java/bytecode/OLFunTest.java
rename to src/test/java/bytecode/OLFunTest.java
diff --git a/src/test/java/java/bytecode/OLTest.java b/src/test/java/bytecode/OLTest.java
similarity index 100%
rename from src/test/java/java/bytecode/OLTest.java
rename to src/test/java/bytecode/OLTest.java
diff --git a/src/test/java/java/bytecode/OpTest.java b/src/test/java/bytecode/OpTest.java
similarity index 100%
rename from src/test/java/java/bytecode/OpTest.java
rename to src/test/java/bytecode/OpTest.java
diff --git a/src/test/java/java/bytecode/OverloadingSortingTest.java b/src/test/java/bytecode/OverloadingSortingTest.java
similarity index 100%
rename from src/test/java/java/bytecode/OverloadingSortingTest.java
rename to src/test/java/bytecode/OverloadingSortingTest.java
diff --git a/src/test/java/java/bytecode/OverloadingTest.java b/src/test/java/bytecode/OverloadingTest.java
similarity index 100%
rename from src/test/java/java/bytecode/OverloadingTest.java
rename to src/test/java/bytecode/OverloadingTest.java
diff --git a/src/test/java/java/bytecode/PlusTest.java b/src/test/java/bytecode/PlusTest.java
similarity index 100%
rename from src/test/java/java/bytecode/PlusTest.java
rename to src/test/java/bytecode/PlusTest.java
diff --git a/src/test/java/java/bytecode/PostIncTest.java b/src/test/java/bytecode/PostIncTest.java
similarity index 100%
rename from src/test/java/java/bytecode/PostIncTest.java
rename to src/test/java/bytecode/PostIncTest.java
diff --git a/src/test/java/java/bytecode/PreIncTest.java b/src/test/java/bytecode/PreIncTest.java
similarity index 100%
rename from src/test/java/java/bytecode/PreIncTest.java
rename to src/test/java/bytecode/PreIncTest.java
diff --git a/src/test/java/java/bytecode/PutTest.java b/src/test/java/bytecode/PutTest.java
similarity index 100%
rename from src/test/java/java/bytecode/PutTest.java
rename to src/test/java/bytecode/PutTest.java
diff --git a/src/test/java/java/bytecode/RelOpsTest.java b/src/test/java/bytecode/RelOpsTest.java
similarity index 100%
rename from src/test/java/java/bytecode/RelOpsTest.java
rename to src/test/java/bytecode/RelOpsTest.java
diff --git a/src/test/java/java/bytecode/SimpleCycleTest.java b/src/test/java/bytecode/SimpleCycleTest.java
similarity index 100%
rename from src/test/java/java/bytecode/SimpleCycleTest.java
rename to src/test/java/bytecode/SimpleCycleTest.java
diff --git a/src/test/java/java/bytecode/SortingTest.java b/src/test/java/bytecode/SortingTest.java
similarity index 100%
rename from src/test/java/java/bytecode/SortingTest.java
rename to src/test/java/bytecode/SortingTest.java
diff --git a/src/test/java/java/bytecode/SubMatTest.java b/src/test/java/bytecode/SubMatTest.java
similarity index 100%
rename from src/test/java/java/bytecode/SubMatTest.java
rename to src/test/java/bytecode/SubMatTest.java
diff --git a/src/test/java/java/bytecode/Tph2Test.java b/src/test/java/bytecode/Tph2Test.java
similarity index 100%
rename from src/test/java/java/bytecode/Tph2Test.java
rename to src/test/java/bytecode/Tph2Test.java
diff --git a/src/test/java/java/bytecode/Tph3Test.java b/src/test/java/bytecode/Tph3Test.java
similarity index 100%
rename from src/test/java/java/bytecode/Tph3Test.java
rename to src/test/java/bytecode/Tph3Test.java
diff --git a/src/test/java/java/bytecode/Tph5Test.java b/src/test/java/bytecode/Tph5Test.java
similarity index 100%
rename from src/test/java/java/bytecode/Tph5Test.java
rename to src/test/java/bytecode/Tph5Test.java
diff --git a/src/test/java/java/bytecode/Tph6Test.java b/src/test/java/bytecode/Tph6Test.java
similarity index 100%
rename from src/test/java/java/bytecode/Tph6Test.java
rename to src/test/java/bytecode/Tph6Test.java
diff --git a/src/test/java/java/bytecode/TphTest.java b/src/test/java/bytecode/TphTest.java
similarity index 100%
rename from src/test/java/java/bytecode/TphTest.java
rename to src/test/java/bytecode/TphTest.java
diff --git a/src/test/java/java/bytecode/TypedIDTest.java b/src/test/java/bytecode/TypedIDTest.java
similarity index 100%
rename from src/test/java/java/bytecode/TypedIDTest.java
rename to src/test/java/bytecode/TypedIDTest.java
diff --git a/src/test/java/java/bytecode/VectorAddTest.java b/src/test/java/bytecode/VectorAddTest.java
similarity index 100%
rename from src/test/java/java/bytecode/VectorAddTest.java
rename to src/test/java/bytecode/VectorAddTest.java
diff --git a/src/test/java/java/bytecode/VectorSuperTest.java b/src/test/java/bytecode/VectorSuperTest.java
similarity index 100%
rename from src/test/java/java/bytecode/VectorSuperTest.java
rename to src/test/java/bytecode/VectorSuperTest.java
diff --git a/src/test/java/java/bytecode/WhileTest.java b/src/test/java/bytecode/WhileTest.java
similarity index 100%
rename from src/test/java/java/bytecode/WhileTest.java
rename to src/test/java/bytecode/WhileTest.java
diff --git a/src/test/java/java/bytecode/YTest.java b/src/test/java/bytecode/YTest.java
similarity index 100%
rename from src/test/java/java/bytecode/YTest.java
rename to src/test/java/bytecode/YTest.java
diff --git a/src/test/java/java/bytecode/applyLambdaTest.java b/src/test/java/bytecode/applyLambdaTest.java
similarity index 100%
rename from src/test/java/java/bytecode/applyLambdaTest.java
rename to src/test/java/bytecode/applyLambdaTest.java
diff --git a/src/test/java/java/bytecode/mathStrucIntegerTest.java b/src/test/java/bytecode/mathStrucIntegerTest.java
similarity index 100%
rename from src/test/java/java/bytecode/mathStrucIntegerTest.java
rename to src/test/java/bytecode/mathStrucIntegerTest.java
diff --git a/src/test/java/java/bytecode/mathStrucMatrixOPTest.java.txt b/src/test/java/bytecode/mathStrucMatrixOPTest.java.txt
similarity index 100%
rename from src/test/java/java/bytecode/mathStrucMatrixOPTest.java.txt
rename to src/test/java/bytecode/mathStrucMatrixOPTest.java.txt
diff --git a/src/test/java/java/bytecode/mathStrucTest.java b/src/test/java/bytecode/mathStrucTest.java
similarity index 100%
rename from src/test/java/java/bytecode/mathStrucTest.java
rename to src/test/java/bytecode/mathStrucTest.java
diff --git a/src/test/java/java/bytecode/mathStrucVectorAddTest.java.txt b/src/test/java/bytecode/mathStrucVectorAddTest.java.txt
similarity index 100%
rename from src/test/java/java/bytecode/mathStrucVectorAddTest.java.txt
rename to src/test/java/bytecode/mathStrucVectorAddTest.java.txt
diff --git a/src/test/java/java/constraintSimplify/FamilyOfGenerics.java b/src/test/java/constraintSimplify/FamilyOfGenerics.java
similarity index 100%
rename from src/test/java/java/constraintSimplify/FamilyOfGenerics.java
rename to src/test/java/constraintSimplify/FamilyOfGenerics.java
diff --git a/src/test/java/java/finiteClosure/SuperInterfacesTest.java b/src/test/java/finiteClosure/SuperInterfacesTest.java
similarity index 100%
rename from src/test/java/java/finiteClosure/SuperInterfacesTest.java
rename to src/test/java/finiteClosure/SuperInterfacesTest.java
diff --git a/src/test/java/java/insertGenerics/FamilyOfGeneratedGenericsTest.java b/src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
similarity index 100%
rename from src/test/java/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
rename to src/test/java/insertGenerics/FamilyOfGeneratedGenericsTest.java
diff --git a/src/test/java/java/insertGenerics/TestAny.java b/src/test/java/insertGenerics/TestAny.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestAny.java
rename to src/test/java/insertGenerics/TestAny.java
diff --git a/src/test/java/java/insertGenerics/TestClassField.java b/src/test/java/insertGenerics/TestClassField.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestClassField.java
rename to src/test/java/insertGenerics/TestClassField.java
diff --git a/src/test/java/java/insertGenerics/TestContraVariant.java b/src/test/java/insertGenerics/TestContraVariant.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestContraVariant.java
rename to src/test/java/insertGenerics/TestContraVariant.java
diff --git a/src/test/java/java/insertGenerics/TestExample42.java b/src/test/java/insertGenerics/TestExample42.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestExample42.java
rename to src/test/java/insertGenerics/TestExample42.java
diff --git a/src/test/java/java/insertGenerics/TestExample42_allInOneMethod.java b/src/test/java/insertGenerics/TestExample42_allInOneMethod.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestExample42_allInOneMethod.java
rename to src/test/java/insertGenerics/TestExample42_allInOneMethod.java
diff --git a/src/test/java/java/insertGenerics/TestGGFinder.java b/src/test/java/insertGenerics/TestGGFinder.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestGGFinder.java
rename to src/test/java/insertGenerics/TestGGFinder.java
diff --git a/src/test/java/java/insertGenerics/TestLocalVarLambda.java b/src/test/java/insertGenerics/TestLocalVarLambda.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestLocalVarLambda.java
rename to src/test/java/insertGenerics/TestLocalVarLambda.java
diff --git a/src/test/java/java/insertGenerics/TestMutualRecursion.java b/src/test/java/insertGenerics/TestMutualRecursion.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestMutualRecursion.java
rename to src/test/java/insertGenerics/TestMutualRecursion.java
diff --git a/src/test/java/java/insertGenerics/TestReturnVar.java b/src/test/java/insertGenerics/TestReturnVar.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestReturnVar.java
rename to src/test/java/insertGenerics/TestReturnVar.java
diff --git a/src/test/java/java/insertGenerics/TestSecondLineOfClassConstraints.java b/src/test/java/insertGenerics/TestSecondLineOfClassConstraints.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestSecondLineOfClassConstraints.java
rename to src/test/java/insertGenerics/TestSecondLineOfClassConstraints.java
diff --git a/src/test/java/java/insertGenerics/TestTPHsAndGenerics.java b/src/test/java/insertGenerics/TestTPHsAndGenerics.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTPHsAndGenerics.java
rename to src/test/java/insertGenerics/TestTPHsAndGenerics.java
diff --git a/src/test/java/java/insertGenerics/TestTPHsAndGenerics2.java b/src/test/java/insertGenerics/TestTPHsAndGenerics2.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTPHsAndGenerics2.java
rename to src/test/java/insertGenerics/TestTPHsAndGenerics2.java
diff --git a/src/test/java/java/insertGenerics/TestThreeArgs.java b/src/test/java/insertGenerics/TestThreeArgs.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestThreeArgs.java
rename to src/test/java/insertGenerics/TestThreeArgs.java
diff --git a/src/test/java/java/insertGenerics/TestTransitiveClosure.java b/src/test/java/insertGenerics/TestTransitiveClosure.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTransitiveClosure.java
rename to src/test/java/insertGenerics/TestTransitiveClosure.java
diff --git a/src/test/java/java/insertGenerics/TestTwoArgs.java b/src/test/java/insertGenerics/TestTwoArgs.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTwoArgs.java
rename to src/test/java/insertGenerics/TestTwoArgs.java
diff --git a/src/test/java/java/insertGenerics/TestTwoArgs2.java b/src/test/java/insertGenerics/TestTwoArgs2.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTwoArgs2.java
rename to src/test/java/insertGenerics/TestTwoArgs2.java
diff --git a/src/test/java/java/insertGenerics/TestTwoCalls.java b/src/test/java/insertGenerics/TestTwoCalls.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestTwoCalls.java
rename to src/test/java/insertGenerics/TestTwoCalls.java
diff --git a/src/test/java/java/insertGenerics/TestVector.java b/src/test/java/insertGenerics/TestVector.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestVector.java
rename to src/test/java/insertGenerics/TestVector.java
diff --git a/src/test/java/java/insertGenerics/TestVectorArg.java b/src/test/java/insertGenerics/TestVectorArg.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestVectorArg.java
rename to src/test/java/insertGenerics/TestVectorArg.java
diff --git a/src/test/java/java/insertGenerics/TestVoidMeth.java b/src/test/java/insertGenerics/TestVoidMeth.java
similarity index 100%
rename from src/test/java/java/insertGenerics/TestVoidMeth.java
rename to src/test/java/insertGenerics/TestVoidMeth.java
diff --git a/src/test/java/java/log4jTesting.xml b/src/test/java/log4jTesting.xml
similarity index 100%
rename from src/test/java/java/log4jTesting.xml
rename to src/test/java/log4jTesting.xml
diff --git a/src/test/java/java/packages/Bytecode.java b/src/test/java/packages/Bytecode.java
similarity index 100%
rename from src/test/java/java/packages/Bytecode.java
rename to src/test/java/packages/Bytecode.java
diff --git a/src/test/java/java/packages/CheckPackageFolder.java b/src/test/java/packages/CheckPackageFolder.java
similarity index 100%
rename from src/test/java/java/packages/CheckPackageFolder.java
rename to src/test/java/packages/CheckPackageFolder.java
diff --git a/src/test/java/java/packages/ConsoleInterfaceTest.java b/src/test/java/packages/ConsoleInterfaceTest.java
similarity index 100%
rename from src/test/java/java/packages/ConsoleInterfaceTest.java
rename to src/test/java/packages/ConsoleInterfaceTest.java
diff --git a/src/test/java/java/packages/ImportTest.java b/src/test/java/packages/ImportTest.java
similarity index 100%
rename from src/test/java/java/packages/ImportTest.java
rename to src/test/java/packages/ImportTest.java
diff --git a/src/test/java/java/packages/LoadDefaultPackageClassesTest.java b/src/test/java/packages/LoadDefaultPackageClassesTest.java
similarity index 100%
rename from src/test/java/java/packages/LoadDefaultPackageClassesTest.java
rename to src/test/java/packages/LoadDefaultPackageClassesTest.java
diff --git a/src/test/java/java/packages/OLOneFileTest.java b/src/test/java/packages/OLOneFileTest.java
similarity index 100%
rename from src/test/java/java/packages/OLOneFileTest.java
rename to src/test/java/packages/OLOneFileTest.java
diff --git a/src/test/java/java/packages/OLTest.java b/src/test/java/packages/OLTest.java
similarity index 100%
rename from src/test/java/java/packages/OLTest.java
rename to src/test/java/packages/OLTest.java
diff --git a/src/test/java/java/packages/ParsePackageName.java b/src/test/java/packages/ParsePackageName.java
similarity index 100%
rename from src/test/java/java/packages/ParsePackageName.java
rename to src/test/java/packages/ParsePackageName.java
diff --git a/src/test/java/java/packages/mathStrucMatrixOPTest.java.txt b/src/test/java/packages/mathStrucMatrixOPTest.java.txt
similarity index 100%
rename from src/test/java/java/packages/mathStrucMatrixOPTest.java.txt
rename to src/test/java/packages/mathStrucMatrixOPTest.java.txt
diff --git a/src/test/java/java/packages/mathStrucVectorTest.java b/src/test/java/packages/mathStrucVectorTest.java
similarity index 100%
rename from src/test/java/java/packages/mathStrucVectorTest.java
rename to src/test/java/packages/mathStrucVectorTest.java
diff --git a/src/test/java/java/parser/AntlrTest.jav b/src/test/java/parser/AntlrTest.jav
similarity index 100%
rename from src/test/java/java/parser/AntlrTest.jav
rename to src/test/java/parser/AntlrTest.jav
diff --git a/src/test/java/java/parser/BoundedParameter.jav b/src/test/java/parser/BoundedParameter.jav
similarity index 100%
rename from src/test/java/java/parser/BoundedParameter.jav
rename to src/test/java/parser/BoundedParameter.jav
diff --git a/src/test/java/java/parser/CastTest.jav b/src/test/java/parser/CastTest.jav
similarity index 100%
rename from src/test/java/java/parser/CastTest.jav
rename to src/test/java/parser/CastTest.jav
diff --git a/src/test/java/java/parser/ExtendsTest.jav b/src/test/java/parser/ExtendsTest.jav
similarity index 100%
rename from src/test/java/java/parser/ExtendsTest.jav
rename to src/test/java/parser/ExtendsTest.jav
diff --git a/src/test/java/java/parser/FeatherWeightJava.jav b/src/test/java/parser/FeatherWeightJava.jav
similarity index 100%
rename from src/test/java/java/parser/FeatherWeightJava.jav
rename to src/test/java/parser/FeatherWeightJava.jav
diff --git a/src/test/java/java/parser/FieldInitializationTest.jav b/src/test/java/parser/FieldInitializationTest.jav
similarity index 100%
rename from src/test/java/java/parser/FieldInitializationTest.jav
rename to src/test/java/parser/FieldInitializationTest.jav
diff --git a/src/test/java/java/parser/FieldVarTest.jav b/src/test/java/parser/FieldVarTest.jav
similarity index 100%
rename from src/test/java/java/parser/FieldVarTest.jav
rename to src/test/java/parser/FieldVarTest.jav
diff --git a/src/test/java/java/parser/GeneralParserTest.java b/src/test/java/parser/GeneralParserTest.java
similarity index 100%
rename from src/test/java/java/parser/GeneralParserTest.java
rename to src/test/java/parser/GeneralParserTest.java
diff --git a/src/test/java/java/parser/GenericFieldVarTest.jav b/src/test/java/parser/GenericFieldVarTest.jav
similarity index 100%
rename from src/test/java/java/parser/GenericFieldVarTest.jav
rename to src/test/java/parser/GenericFieldVarTest.jav
diff --git a/src/test/java/java/parser/ImportTest.jav b/src/test/java/parser/ImportTest.jav
similarity index 100%
rename from src/test/java/java/parser/ImportTest.jav
rename to src/test/java/parser/ImportTest.jav
diff --git a/src/test/java/java/parser/ImportTest2.jav b/src/test/java/parser/ImportTest2.jav
similarity index 100%
rename from src/test/java/java/parser/ImportTest2.jav
rename to src/test/java/parser/ImportTest2.jav
diff --git a/src/test/java/java/parser/ImportTestGeneric.jav b/src/test/java/parser/ImportTestGeneric.jav
similarity index 100%
rename from src/test/java/java/parser/ImportTestGeneric.jav
rename to src/test/java/parser/ImportTestGeneric.jav
diff --git a/src/test/java/java/parser/NewTest.jav b/src/test/java/parser/NewTest.jav
similarity index 100%
rename from src/test/java/java/parser/NewTest.jav
rename to src/test/java/parser/NewTest.jav
diff --git a/src/test/java/java/parser/OpratorTest.jav b/src/test/java/parser/OpratorTest.jav
similarity index 100%
rename from src/test/java/java/parser/OpratorTest.jav
rename to src/test/java/parser/OpratorTest.jav
diff --git a/src/test/java/java/parser/PackageNameTest.jav b/src/test/java/parser/PackageNameTest.jav
similarity index 100%
rename from src/test/java/java/parser/PackageNameTest.jav
rename to src/test/java/parser/PackageNameTest.jav
diff --git a/src/test/java/java/parser/StatementsTest.jav b/src/test/java/parser/StatementsTest.jav
similarity index 100%
rename from src/test/java/java/parser/StatementsTest.jav
rename to src/test/java/parser/StatementsTest.jav
diff --git a/src/test/java/java/parser/StructuralTypes.jav b/src/test/java/parser/StructuralTypes.jav
similarity index 100%
rename from src/test/java/java/parser/StructuralTypes.jav
rename to src/test/java/parser/StructuralTypes.jav
diff --git a/src/test/java/java/parser/WhileTest.jav b/src/test/java/parser/WhileTest.jav
similarity index 100%
rename from src/test/java/java/parser/WhileTest.jav
rename to src/test/java/parser/WhileTest.jav
diff --git a/src/test/java/java/typeinference/JavaTXCompilerTest.java b/src/test/java/typeinference/JavaTXCompilerTest.java
similarity index 100%
rename from src/test/java/java/typeinference/JavaTXCompilerTest.java
rename to src/test/java/typeinference/JavaTXCompilerTest.java
diff --git a/src/test/java/java/typeinference/Meth_GenTest.java b/src/test/java/typeinference/Meth_GenTest.java
similarity index 100%
rename from src/test/java/java/typeinference/Meth_GenTest.java
rename to src/test/java/typeinference/Meth_GenTest.java
diff --git a/src/test/java/java/typeinference/UnifyTest.java b/src/test/java/typeinference/UnifyTest.java
similarity index 100%
rename from src/test/java/java/typeinference/UnifyTest.java
rename to src/test/java/typeinference/UnifyTest.java
diff --git a/src/test/java/java/visualisation/ToString.java b/src/test/java/visualisation/ToString.java
similarity index 100%
rename from src/test/java/java/visualisation/ToString.java
rename to src/test/java/visualisation/ToString.java