diff --git a/.classpath b/.classpath
index 9e9cade..7fae055 100644
--- a/.classpath
+++ b/.classpath
@@ -14,7 +14,6 @@
 	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
 		<attributes>
 			<attribute name="test" value="true"/>
-			<attribute name="optional" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
@@ -31,7 +30,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<attributes>
-			<attribute name="module" value="true"/>
 			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
diff --git a/pom.xml b/pom.xml
index 6299416..992ad59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,18 +27,6 @@
 
 	</properties>
   
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.junit</groupId>
-				<artifactId>junit-bom</artifactId>
-				<version>5.3.2</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-  
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
@@ -87,36 +75,33 @@
 		</dependency>
 		
 		<!-- TESTING -->
-		<dependency>
-			<groupId>org.hamcrest</groupId>
-			<artifactId>hamcrest-all</artifactId>
-			<version>1.3</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
+				<version>5.3.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-engine</artifactId>
+				<version>5.3.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-params</artifactId>
+				<version>5.3.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-launcher</artifactId>
-			<scope>test</scope>
+				<version>1.5.0-M1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.platform</groupId>
 			<artifactId>junit-platform-runner</artifactId>
-			<scope>test</scope>
+				<version>1.5.0-M1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
@@ -130,6 +115,11 @@
 			<version>2.24.5</version>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hamcrest</groupId>
+			<artifactId>hamcrest-library</artifactId>
+			<version>2.1-rc4</version>
+		</dependency>
 	</dependencies>
 	
 	<build>
@@ -145,7 +135,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.1</version>
+				<version>3.0.0-M3</version>
 			</plugin>
 
 			<plugin>
diff --git a/src/main/java/de/kreth/property2java/Generator.java b/src/main/java/de/kreth/property2java/Generator.java
index 7c81b93..508d173 100644
--- a/src/main/java/de/kreth/property2java/Generator.java
+++ b/src/main/java/de/kreth/property2java/Generator.java
@@ -13,6 +13,7 @@ import java.util.Map;
 import java.util.Properties;
 
 import de.kreth.property2java.cli.ArgumentConfiguration;
+import de.kreth.property2java.config.FreemarkerConfig;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
 
diff --git a/src/main/java/de/kreth/property2java/FreemarkerConfig.java b/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java
similarity index 88%
rename from src/main/java/de/kreth/property2java/FreemarkerConfig.java
rename to src/main/java/de/kreth/property2java/config/FreemarkerConfig.java
index 67fdd98..4a66f9f 100644
--- a/src/main/java/de/kreth/property2java/FreemarkerConfig.java
+++ b/src/main/java/de/kreth/property2java/config/FreemarkerConfig.java
@@ -1,4 +1,4 @@
-package de.kreth.property2java;
+package de.kreth.property2java.config;
 
 import java.io.IOException;