diff --git a/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java b/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java
deleted file mode 100644
index 1e40355..0000000
--- a/app/src/androidTest/java/be/mathsaey/stoofnogaan/ExampleInstrumentedTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package be.mathsaey.stoofnogaan;
-
-import android.content.Context;
-import android.support.test.InstrumentationRegistry;
-import android.support.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("be.mathsaey.stoofnogaan", appContext.getPackageName());
-    }
-}
diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java b/app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java
similarity index 100%
rename from app/src/main/java/be/mathsaey/stoofnogaan/MainActivity.java
rename to app/src/main/java/be/mathsaey/stoofnogaan/ui/MainActivity.java
diff --git a/app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java b/app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java
similarity index 100%
rename from app/src/main/java/be/mathsaey/stoofnogaan/TaskView.java
rename to app/src/main/java/be/mathsaey/stoofnogaan/ui/TaskView.java
diff --git a/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java b/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java
deleted file mode 100644
index 9de5c17..0000000
--- a/app/src/test/java/be/mathsaey/stoofnogaan/ExampleUnitTest.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package be.mathsaey.stoofnogaan;
-
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-public class ExampleUnitTest {
-    @Test
-    public void addition_isCorrect() throws Exception {
-        assertEquals(4, 2 + 2);
-    }
-}
\ No newline at end of file