diff --git a/Makefile b/Makefile
deleted file mode 100644
index 1b286ad..0000000
--- a/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-
-FILES = tnetstring.nim
-
-default: development
-
-debug: ${FILES}
-	nim --assertions:on --nimcache:.cache c ${FILES}
-
-development: ${FILES}
-	# can use gdb with this...
-	nim -r --debugInfo --linedir:on --define:testing --nimcache:.cache c ${FILES}
-
-debugger: ${FILES}
-	nim --debugger:on --nimcache:.cache c ${FILES}
-
-release: ${FILES}
-	nim -d:release --opt:speed --nimcache:.cache c ${FILES}
-
-docs:
-	nim doc ${FILES}
-	#nim buildIndex ${FILES}
-
-clean:
-	cat .hgignore | xargs rm -rf
-
diff --git a/tnetstring.nim b/src/tnetstring.nim
similarity index 100%
rename from tnetstring.nim
rename to src/tnetstring.nim
diff --git a/tnetstring.nimble b/tnetstring.nimble
index 72c37a3..98d8886 100644
--- a/tnetstring.nimble
+++ b/tnetstring.nimble
@@ -1,10 +1,18 @@
-[Package]
-name          = "tnetstring"
-version       = "0.1.1"
-author        = "Mahlon E. Smith <mahlon@martini.nu>"
-description   = "Parsing and serializing for the TNetstring format."
-license       = "MIT"
+version     = "0.2.0"
+author      = "Mahlon E. Smith"
+description = "Parsing and serialization for the TNetstring format."
+license     = "BSD-3-Clause"
+srcDir      = "src"
 
-[Deps]
-Requires: "nim >= 0.11.0"
+requires "nim ^= 2.0.0"
+
+task test, "Run the test suite.":
+    exec "testament all"
+    exec "testament html"
+
+task clean, "Remove all non-repository artifacts.":
+    exec "fossil clean -x"
+
+task docs, "Generate automated documentation.":
+    exec "nim doc --project --outdir:docs src/tnetstring.nim"