diff --git a/lib/node/.npmignore b/.npmignore
similarity index 100%
rename from lib/node/.npmignore
rename to .npmignore
diff --git a/build-all-windows.bat b/build-all-windows.bat
deleted file mode 100644
index db237cc..0000000
--- a/build-all-windows.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-anvil
-
-copy ./lib/standard/postal.* ./example/standard/js
-copy ./lib/amd/postal.* ./example/amd/js/libs/postal
-copy ./lib/amd/postal.js ./example/node/client/js/lib
-copy ./lib/node/postal.js ./example/node/messaging
\ No newline at end of file
diff --git a/build-all.sh b/build-all.sh
deleted file mode 100755
index 175874c..0000000
--- a/build-all.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-anvil
-
-cp ./lib/standard/postal.* ./example/standard/js
-cp ./lib/amd/postal.* ./example/amd/js/libs/postal
-cp ./lib/amd/postal.js ./example/node/client/js/lib
-cp ./lib/node/postal.js ./example/node/messaging
\ No newline at end of file
diff --git a/build.json b/build.json
index 51a9ff8..1aa4f10 100644
--- a/build.json
+++ b/build.json
@@ -1,27 +1,17 @@
 {
-	"source" : "src",
-	"output" : "lib",
-    "name" : {
-        "postal.node.js"                   : "node/postal.js",
-        "postal.standard.js"               : "standard/postal.js",
-        "postal.standard.min.js"           : "standard/postal.min.js",
-        "postal.amd.js"                    : "amd/postal.js",
-        "postal.amd.min.js"                : "amd/postal.min.js",
-	    "classic-resolver.node.js"         : "node/classic-resolver.js",
-	    "classic-resolver.standard.js"     : "standard/classic-resolver.js",
-	    "classic-resolver.standard.min.js" : "standard/classic-resolver.min.js",
-	    "classic-resolver.amd.js"          : "amd/classic-resolver.js",
-	    "classic-resolver.amd.min.js"      : "amd/classic-resolver.min.js"
+	"anvil.uglify" : {
+        "exclude": ["./node/postal.js", "./node/classic-resolver.js"]
     },
-	"lint" : {},
-	"uglify" : {
-        "exclude": ["postal.node.js", "classic-resolver.node.min.js"]
+	"anvil.http": {
+		"paths": {
+        	"/": "./"
+        },
+        "port" : 8080
     },
-	"extensions" : {
-		"uglify" : "min"
-	},
-    "hosts": {
-        "/": "./"
-    },
-	"port" : 8080
+    "anvil.output": {
+    	"./lib/standard/postal.*": "./example/standard/js",
+    	"./lib/amd/postal.*": "./example/amd/js/libs/postal",
+    	"./lib/amd/postal.*": "./example/node/client/js/lib",
+    	"./lib/amd/postal.js": "./example/node/messaging"
+    }
 }
\ No newline at end of file
diff --git a/src/VersionHeader.js b/header.js
similarity index 69%
rename from src/VersionHeader.js
rename to header.js
index e458d1a..38959a2 100644
--- a/src/VersionHeader.js
+++ b/header.js
@@ -1,6 +1,6 @@
-/*
- postal.js
- Author: Jim Cowart
- License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
- Version 0.7.1
- */
+/*
+ {{{name}}}
+ Author: {{{author}}}
+ License: Dual licensed MIT (http://www.opensource.org/licenses/mit-license) & GPL (http://www.opensource.org/licenses/gpl-license)
+ Version {{{version}}}
+ */
\ No newline at end of file
diff --git a/lib/node/package.json b/package.json
similarity index 85%
rename from lib/node/package.json
rename to package.json
index 89cd275..6814fbb 100644
--- a/lib/node/package.json
+++ b/package.json
@@ -7,11 +7,7 @@
         "type" : "git",
         "url" : "git://github.com/ifandelse/postal.js.git"
     },
-    "author" : {
-        "name" : "Jim Cowart",
-        "email" : "JustFindMeOnTwitter@MyUsernameIs_ifandelse.com",
-        "url" : "http://freshbrewedcode.com/jimcowart"
-    },
+    "author" : "Jim Cowart (http://freshbrewedcode.com/jimcowart)",
     "contributors": [
         {
             "name"  : "Jim Cowart",
@@ -24,9 +20,9 @@
             "url"   : "http://freshbrewedcode.com/alexrobson"
         },
         {
-	        "name"  : "Nicholas Cloud",
-	        "email" : "WhyNotJustComment@OnMyBlog.com",
-	        "url"   : "http://nicholascloud.com"
+          "name"  : "Nicholas Cloud",
+          "email" : "WhyNotJustComment@OnMyBlog.com",
+          "url"   : "http://nicholascloud.com"
         },
         {
             "name"  : "Doug Neiner",
diff --git a/src/classic-resolver.amd.js b/src/amd/classic-resolver.js
similarity index 74%
rename from src/classic-resolver.amd.js
rename to src/amd/classic-resolver.js
index 0cfb3d3..210eeaf 100644
--- a/src/classic-resolver.amd.js
+++ b/src/amd/classic-resolver.js
@@ -1,6 +1,6 @@
 define( [
 	'postal'
 ], function ( postal ) {
-	//import("BindingsResolver.js");
+	//import("../BindingsResolver.js");
 	postal.configuration.resolver = classicBindingsResolver;
 } );
\ No newline at end of file
diff --git a/src/amd/postal.js b/src/amd/postal.js
new file mode 100644
index 0000000..657501f
--- /dev/null
+++ b/src/amd/postal.js
@@ -0,0 +1,13 @@
+// This is the amd-module version of postal.js
+// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
+define( ["underscore"], function ( _, undefined ) {
+	//import("../Constants.js");
+	//import("../DistinctPredicate.js");
+	//import("../ConsecutiveDistinctPredicate.js");
+	//import("../ChannelDefinition.js");
+	//import("../SubscriptionDefinition.js");
+	//import("../AmqpBindingsResolver.js");
+	//import("../LocalBus.js");
+	//import("../Api.js");
+	return postal;
+} );
\ No newline at end of file
diff --git a/src/classic-resolver.node.js b/src/node/classic-resolver.js
similarity index 78%
rename from src/classic-resolver.node.js
rename to src/node/classic-resolver.js
index ba5d2d8..6cf0962 100644
--- a/src/classic-resolver.node.js
+++ b/src/node/classic-resolver.js
@@ -1,4 +1,4 @@
-//import("BindingsResolver.js");
+//import("../BindingsResolver.js");
 
 module.exports = {
 	configure: function(postal) {
diff --git a/src/node/postal.js b/src/node/postal.js
new file mode 100644
index 0000000..b13283e
--- /dev/null
+++ b/src/node/postal.js
@@ -0,0 +1,14 @@
+// This is the node.js version of postal.js
+// If you need the standard or amd client lib version, go to http://github.com/ifandelse/postal.js
+var _ = require( 'underscore' );
+
+//import("../Constants.js");
+//import("../DistinctPredicate.js");
+//import("../ConsecutiveDistinctPredicate.js");
+//import("../ChannelDefinition.js");
+//import("../SubscriptionDefinition.js");
+//import("../AmqpBindingsResolver.js");
+//import("../LocalBus.js");
+//import("../Api.js");
+
+module.exports = postal;
\ No newline at end of file
diff --git a/src/postal.amd.js b/src/postal.amd.js
deleted file mode 100644
index 44c1b08..0000000
--- a/src/postal.amd.js
+++ /dev/null
@@ -1,14 +0,0 @@
-//import("VersionHeader.js");
-// This is the amd-module version of postal.js
-// If you need the standard lib style version, go to http://github.com/ifandelse/postal.js
-define( ["underscore"], function ( _, undefined ) {
-	//import("Constants.js");
-	//import("DistinctPredicate.js");
-	//import("ConsecutiveDistinctPredicate.js");
-	//import("ChannelDefinition.js");
-	//import("SubscriptionDefinition.js");
-	//import("AmqpBindingsResolver.js");
-	//import("LocalBus.js");
-	//import("Api.js");
-	return postal;
-} );
\ No newline at end of file
diff --git a/src/postal.node.js b/src/postal.node.js
deleted file mode 100644
index 3efa906..0000000
--- a/src/postal.node.js
+++ /dev/null
@@ -1,15 +0,0 @@
-//import("VersionHeader.js");
-// This is the node.js version of postal.js
-// If you need the standard or amd client lib version, go to http://github.com/ifandelse/postal.js
-var _ = require( 'underscore' );
-
-//import("Constants.js");
-//import("DistinctPredicate.js");
-//import("ConsecutiveDistinctPredicate.js");
-//import("ChannelDefinition.js");
-//import("SubscriptionDefinition.js");
-//import("AmqpBindingsResolver.js");
-//import("LocalBus.js");
-//import("Api.js");
-
-module.exports = postal;
\ No newline at end of file
diff --git a/src/postal.standard.js b/src/postal.standard.js
deleted file mode 100644
index 1248709..0000000
--- a/src/postal.standard.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//import("VersionHeader.js");
-// This is the standard lib version of postal.js
-// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
-;(function ( _, global, undefined ) {
-
-//import("Constants.js");
-//import("ConsecutiveDistinctPredicate.js");
-//import("DistinctPredicate.js");
-//import("ChannelDefinition.js");
-//import("SubscriptionDefinition.js");
-//import("AmqpBindingsResolver.js");
-//import("LocalBus.js");
-//import("Api.js");
-
-	global.postal = postal;
-
-})( _, window );
\ No newline at end of file
diff --git a/src/classic-resolver.standard.js b/src/standard/classic-resolver.js
similarity index 74%
rename from src/classic-resolver.standard.js
rename to src/standard/classic-resolver.js
index 4df4bf8..fa51b6a 100644
--- a/src/classic-resolver.standard.js
+++ b/src/standard/classic-resolver.js
@@ -1,4 +1,4 @@
 (function(postal, undefined){
-	//import("BindingsResolver.js");
+	//import("../BindingsResolver.js");
 	postal.configuration.resolver = classicBindingsResolver;
 })(window.postal);
\ No newline at end of file
diff --git a/src/standard/postal.js b/src/standard/postal.js
new file mode 100644
index 0000000..c41211a
--- /dev/null
+++ b/src/standard/postal.js
@@ -0,0 +1,16 @@
+// This is the standard lib version of postal.js
+// If you need the amd-module style version, go to http://github.com/ifandelse/postal.js
+;(function ( _, global, undefined ) {
+
+//import("../Constants.js");
+//import("../ConsecutiveDistinctPredicate.js");
+//import("../DistinctPredicate.js");
+//import("../ChannelDefinition.js");
+//import("../SubscriptionDefinition.js");
+//import("../AmqpBindingsResolver.js");
+//import("../LocalBus.js");
+//import("../Api.js");
+
+	global.postal = postal;
+
+})( _, window );
\ No newline at end of file