diff --git a/.gitignore b/.gitignore
index f1f400e..a752fc6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 /.jiri
-/.pub
-/packages
-.packages
-snapshot_blob.bin
-app.flx
\ No newline at end of file
+/dart/.pub
+/dart/packages
+/dart/.packages
+/dart/snapshot_blob.bin
+/dart/app.flx
diff --git a/AUTHORS b/dart/AUTHORS
similarity index 100%
rename from AUTHORS
rename to dart/AUTHORS
diff --git a/CONTRIBUTING.md b/dart/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to dart/CONTRIBUTING.md
diff --git a/CONTRIBUTORS b/dart/CONTRIBUTORS
similarity index 100%
rename from CONTRIBUTORS
rename to dart/CONTRIBUTORS
diff --git a/LICENSE b/dart/LICENSE
similarity index 100%
rename from LICENSE
rename to dart/LICENSE
diff --git a/Makefile b/dart/Makefile
similarity index 75%
rename from Makefile
rename to dart/Makefile
index c3ef734..2cde208 100644
--- a/Makefile
+++ b/dart/Makefile
@@ -1,3 +1,15 @@
+
+default: run
+
+.PHONY: dartanalyzer
+dartanalyzer: packages
+	dartanalyzer lib/main.dart
+
+.PHONY: dartfmt
+dartfmt: packages
+	dartfmt --overwrite lib
+
+.PHONY: packages
 packages:
 	pub upgrade
 
diff --git a/PATENTS b/dart/PATENTS
similarity index 100%
rename from PATENTS
rename to dart/PATENTS
diff --git a/README.md b/dart/README.md
similarity index 100%
rename from README.md
rename to dart/README.md
diff --git a/VERSION b/dart/VERSION
similarity index 100%
rename from VERSION
rename to dart/VERSION
diff --git a/lib/main.dart b/dart/lib/main.dart
similarity index 100%
rename from lib/main.dart
rename to dart/lib/main.dart
diff --git a/pubspec.lock b/dart/pubspec.lock
similarity index 98%
rename from pubspec.lock
rename to dart/pubspec.lock
index 509bd29..5790cde 100644
--- a/pubspec.lock
+++ b/dart/pubspec.lock
@@ -176,7 +176,7 @@
   shelf:
     description: shelf
     source: hosted
-    version: "0.6.4"
+    version: "0.6.4+1"
   shelf_path:
     description: shelf_path
     source: hosted
@@ -236,7 +236,7 @@
   typed_data:
     description: typed_data
     source: hosted
-    version: "1.1.0"
+    version: "1.1.1"
   uri:
     description: uri
     source: hosted
diff --git a/pubspec.yaml b/dart/pubspec.yaml
similarity index 100%
rename from pubspec.yaml
rename to dart/pubspec.yaml