diff --git a/README b/README
index ea5b028..7b691c3 100644
--- a/README
+++ b/README
@@ -34,14 +34,16 @@ it is only tested on Ubuntu 14.04/amd64.
 
 Obtain:
 
-  $ go get bitbucket.org/s_l_teichmann/mtredisalize
+  $ go get bitbucket.org/s_l_teichmann/mtredisalize/cmd/mtredisalize
 
 Development:
 
+  $ go get -u github.com/mattn/go-sqlite3
   $ go install github.com/mattn/go-sqlite3
+  $ go get -u github.com/jmhodges/levigo
   $ go install github.com/jmhodges/levigo
   $ hg clone  https://s_l_teichmann@bitbucket.org/s_l_teichmann/mtredisalize
-  $ cd mtredisalize
+  $ cd mtredisalize/cmd/mtredisalize
   $ go build
 
 Usage:
diff --git a/interleaver/leveldb.go b/cmd/mtdbconverter/leveldb.go
similarity index 100%
rename from interleaver/leveldb.go
rename to cmd/mtdbconverter/leveldb.go
diff --git a/interleaver/main.go b/cmd/mtdbconverter/main.go
similarity index 100%
rename from interleaver/main.go
rename to cmd/mtdbconverter/main.go
diff --git a/interleaver/sqlite.go b/cmd/mtdbconverter/sqlite.go
similarity index 100%
rename from interleaver/sqlite.go
rename to cmd/mtdbconverter/sqlite.go
diff --git a/backend.go b/cmd/mtredisalize/backend.go
similarity index 100%
rename from backend.go
rename to cmd/mtredisalize/backend.go
diff --git a/connection.go b/cmd/mtredisalize/connection.go
similarity index 100%
rename from connection.go
rename to cmd/mtredisalize/connection.go
diff --git a/leveldb.go b/cmd/mtredisalize/leveldb.go
similarity index 100%
rename from leveldb.go
rename to cmd/mtredisalize/leveldb.go
diff --git a/main.go b/cmd/mtredisalize/main.go
similarity index 100%
rename from main.go
rename to cmd/mtredisalize/main.go
diff --git a/misc.go b/cmd/mtredisalize/misc.go
similarity index 100%
rename from misc.go
rename to cmd/mtredisalize/misc.go
diff --git a/parser.go b/cmd/mtredisalize/parser.go
similarity index 100%
rename from parser.go
rename to cmd/mtredisalize/parser.go
diff --git a/sqlite.go b/cmd/mtredisalize/sqlite.go
similarity index 100%
rename from sqlite.go
rename to cmd/mtredisalize/sqlite.go
diff --git a/tilemapper/client.go b/cmd/tilemapper/client.go
similarity index 100%
rename from tilemapper/client.go
rename to cmd/tilemapper/client.go
diff --git a/tilemapper/colors.go b/cmd/tilemapper/colors.go
similarity index 100%
rename from tilemapper/colors.go
rename to cmd/tilemapper/colors.go
diff --git a/tilemapper/colors.txt b/cmd/tilemapper/colors.txt
similarity index 100%
rename from tilemapper/colors.txt
rename to cmd/tilemapper/colors.txt
diff --git a/tilemapper/image.go b/cmd/tilemapper/image.go
similarity index 100%
rename from tilemapper/image.go
rename to cmd/tilemapper/image.go
diff --git a/tilemapper/main.go b/cmd/tilemapper/main.go
similarity index 100%
rename from tilemapper/main.go
rename to cmd/tilemapper/main.go