diff --git a/.gitignore b/.gitignore
index de447e7..4ef6b74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 .idea/
 *.iml
-/out
+/target
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..f3eccf3
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>de.uni_luebeck.isp</groupId>
+    <artifactId>WhileInterpreter</artifactId>
+    <version>1.0</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.0</version>
+                <configuration>
+                    <source>1.6</source>
+                    <target>1.6</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+    </dependencies>
+</project>
\ No newline at end of file
diff --git a/src/Main.java b/src/main/java/Main.java
similarity index 100%
rename from src/Main.java
rename to src/main/java/Main.java
diff --git a/src/expression/Addition.java b/src/main/java/expression/Addition.java
similarity index 100%
rename from src/expression/Addition.java
rename to src/main/java/expression/Addition.java
diff --git a/src/expression/Expression.java b/src/main/java/expression/Expression.java
similarity index 100%
rename from src/expression/Expression.java
rename to src/main/java/expression/Expression.java
diff --git a/src/expression/Identifier.java b/src/main/java/expression/Identifier.java
similarity index 100%
rename from src/expression/Identifier.java
rename to src/main/java/expression/Identifier.java
diff --git a/src/expression/Int.java b/src/main/java/expression/Int.java
similarity index 100%
rename from src/expression/Int.java
rename to src/main/java/expression/Int.java
diff --git a/src/expression/Subtraction.java b/src/main/java/expression/Subtraction.java
similarity index 100%
rename from src/expression/Subtraction.java
rename to src/main/java/expression/Subtraction.java
diff --git a/src/interpreter/Evaluator.java b/src/main/java/interpreter/Evaluator.java
similarity index 93%
rename from src/interpreter/Evaluator.java
rename to src/main/java/interpreter/Evaluator.java
index 526f16b..6aec331 100644
--- a/src/interpreter/Evaluator.java
+++ b/src/main/java/interpreter/Evaluator.java
@@ -8,7 +8,7 @@ import java.util.Map;
 public class Evaluator extends Visitor<Integer> {
 
     final Expression expression;
-    final Map<String, Integer> valuation = new HashMap<>();
+    final Map<String, Integer> valuation = new HashMap<String, Integer>();
 
     public Evaluator(Expression expression, Map<String, Integer> valuation) {
         this.expression = expression;
diff --git a/src/interpreter/Interpreter.java b/src/main/java/interpreter/Interpreter.java
similarity index 89%
rename from src/interpreter/Interpreter.java
rename to src/main/java/interpreter/Interpreter.java
index 541adf8..eb965f6 100644
--- a/src/interpreter/Interpreter.java
+++ b/src/main/java/interpreter/Interpreter.java
@@ -7,10 +7,10 @@ import java.util.Map;
 
 public class Interpreter extends Visitor {
     final Program program;
-    final Map<String, Integer> valuation = new HashMap<>();
+    final Map<String, Integer> valuation = new HashMap<String, Integer>();
 
     public Map<String, Integer> getValuation() {
-        Map<String, Integer> result = new HashMap<>();
+        Map<String, Integer> result = new HashMap<String, Integer>();
         result.putAll(valuation);
         return result;
     }
diff --git a/src/interpreter/InterpreterException.java b/src/main/java/interpreter/InterpreterException.java
similarity index 100%
rename from src/interpreter/InterpreterException.java
rename to src/main/java/interpreter/InterpreterException.java
diff --git a/src/interpreter/Visitor.java b/src/main/java/interpreter/Visitor.java
similarity index 100%
rename from src/interpreter/Visitor.java
rename to src/main/java/interpreter/Visitor.java
diff --git a/src/parser/Parser.java b/src/main/java/parser/Parser.java
similarity index 97%
rename from src/parser/Parser.java
rename to src/main/java/parser/Parser.java
index 2981cde..65dfbd8 100644
--- a/src/parser/Parser.java
+++ b/src/main/java/parser/Parser.java
@@ -28,7 +28,7 @@ public class Parser {
 
     Program program() {
         Program firstStatement = statement();
-        List<Program> moreStatements = new ArrayList<>();
+        List<Program> moreStatements = new ArrayList<Program>();
         while (test(";")) {
             consume(";");
             Program statement = statement();
@@ -148,7 +148,7 @@ public class Parser {
 
     Expression expression() {
         Expression firstAtom = atom();
-        List<OperatorWithExpression> moreAtoms = new ArrayList<>();
+        List<OperatorWithExpression> moreAtoms = new ArrayList<OperatorWithExpression>();
         while(testOperator()) {
             Operator operator = operator();
             Expression expression = atom();
diff --git a/src/parser/SyntaxException.java b/src/main/java/parser/SyntaxException.java
similarity index 100%
rename from src/parser/SyntaxException.java
rename to src/main/java/parser/SyntaxException.java
diff --git a/src/program/Assignment.java b/src/main/java/program/Assignment.java
similarity index 100%
rename from src/program/Assignment.java
rename to src/main/java/program/Assignment.java
diff --git a/src/program/Call.java b/src/main/java/program/Call.java
similarity index 100%
rename from src/program/Call.java
rename to src/main/java/program/Call.java
diff --git a/src/program/Composition.java b/src/main/java/program/Composition.java
similarity index 100%
rename from src/program/Composition.java
rename to src/main/java/program/Composition.java
diff --git a/src/program/Conditional.java b/src/main/java/program/Conditional.java
similarity index 100%
rename from src/program/Conditional.java
rename to src/main/java/program/Conditional.java
diff --git a/src/program/Loop.java b/src/main/java/program/Loop.java
similarity index 100%
rename from src/program/Loop.java
rename to src/main/java/program/Loop.java
diff --git a/src/program/Program.java b/src/main/java/program/Program.java
similarity index 100%
rename from src/program/Program.java
rename to src/main/java/program/Program.java
diff --git a/test/interpreter/EvaluatorTest.java b/src/test/java/interpreter/EvaluatorTest.java
similarity index 87%
rename from test/interpreter/EvaluatorTest.java
rename to src/test/java/interpreter/EvaluatorTest.java
index 9a08a41..ef87dc9 100644
--- a/test/interpreter/EvaluatorTest.java
+++ b/src/test/java/interpreter/EvaluatorTest.java
@@ -11,7 +11,7 @@ import static org.junit.Assert.assertEquals;
 public class EvaluatorTest {
     @Test
     public void testEval() {
-        Map<String, Integer> valuation = new HashMap<>();
+        Map<String, Integer> valuation = new HashMap<String, Integer>();
         valuation.put("x", 7);
         valuation.put("y", 2);
         Expression expression = new Addition(new Identifier("x"), new Subtraction(new Identifier("y"), new Int(-4)));
diff --git a/test/interpreter/InterpreterTest.java b/src/test/java/interpreter/InterpreterTest.java
similarity index 100%
rename from test/interpreter/InterpreterTest.java
rename to src/test/java/interpreter/InterpreterTest.java
diff --git a/test/parser/ParserTest.java b/src/test/java/parser/ParserTest.java
similarity index 100%
rename from test/parser/ParserTest.java
rename to src/test/java/parser/ParserTest.java