diff --git a/.classpath b/.classpath
index 466eb65..e1964c3 100644
--- a/.classpath
+++ b/.classpath
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="src" path="src/test/java"/>
+	<classpathentry kind="src" path="src/test/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.8.0_66">
 		<attributes>
 			<attribute name="owner.project.facets" value="java"/>
@@ -13,5 +15,6 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
 	<classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component
index cdc4f9c..710fb6c 100644
--- a/.settings/org.eclipse.wst.common.component
+++ b/.settings/org.eclipse.wst.common.component
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
     <wb-module deploy-name="VideoEncoder">
         <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/resources"/>
         <property name="context-root" value="VideoEncoder"/>
         <property name="java-output-path" value="/VideoEncoder/build/classes"/>
     </wb-module>
diff --git a/src/videoencoder/encoding/Zencoder.java b/src/main/java/videoencoder/encoding/Zencoder.java
similarity index 100%
rename from src/videoencoder/encoding/Zencoder.java
rename to src/main/java/videoencoder/encoding/Zencoder.java
diff --git a/src/videoencoder/encoding/base/IEncoder.java b/src/main/java/videoencoder/encoding/base/IEncoder.java
similarity index 100%
rename from src/videoencoder/encoding/base/IEncoder.java
rename to src/main/java/videoencoder/encoding/base/IEncoder.java
diff --git a/src/videoencoder/servlets/EncodingController.java b/src/main/java/videoencoder/servlets/EncodingController.java
similarity index 100%
rename from src/videoencoder/servlets/EncodingController.java
rename to src/main/java/videoencoder/servlets/EncodingController.java
diff --git a/src/test/java/videoencoder/encoding/EncodingTest.java b/src/test/java/videoencoder/encoding/EncodingTest.java
new file mode 100644
index 0000000..bd972b1
--- /dev/null
+++ b/src/test/java/videoencoder/encoding/EncodingTest.java
@@ -0,0 +1,14 @@
+package videoencoder.encoding;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+public class EncodingTest {
+
+	@Test
+	public void testEncode() {
+		fail("Not yet implemented");
+	}
+
+}