diff --git a/einheit.nimble b/einheit.nimble
index 6517203..6539343 100644
--- a/einheit.nimble
+++ b/einheit.nimble
@@ -1,11 +1,14 @@
-[Package]
-name          = "einheit"
+# Package
+
 version       = "0.1.6"
 author        = "Joey Payne"
 description   = "Tool for providing unit tests. Einheit is German for Unit."
 license       = "MIT"
 
-bin = "einheit"
+srcDir = "src"
 
-[Deps]
-Requires: "nim >= 0.11.3"
+# Deps
+requires "nim >= 0.11.3"
+
+task test, "Run tests":
+  exec "nim c -r tests/test.nim"
diff --git a/einheit.nim b/src/einheit.nim
similarity index 100%
rename from einheit.nim
rename to src/einheit.nim
diff --git a/utils.nim b/src/utils.nim
similarity index 100%
rename from utils.nim
rename to src/utils.nim
diff --git a/tests/nim.cfg b/tests/nim.cfg
new file mode 100644
index 0000000..85bf6c4
--- /dev/null
+++ b/tests/nim.cfg
@@ -0,0 +1 @@
+--path:"../src/"
diff --git a/tests/test b/tests/test
new file mode 100755
index 0000000..2e4a206
Binary files /dev/null and b/tests/test differ
diff --git a/test.nim b/tests/test.nim
similarity index 100%
rename from test.nim
rename to tests/test.nim