diff --git a/.travis.yml b/.travis.yml
index b61ea4704..c6f17fd85 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,7 @@
 language: node_js
 node_js:
-  - "0.10"
-  - "0.12"
-  - "node"
+- 4
+- 6
+- 8
 script: npm test
 sudo: false
diff --git a/appveyor.yml b/appveyor.yml
index 4ee5c89ec..70665c251 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,7 +1,8 @@
 # Test against this version of Node.js
 environment:
   matrix:
-  - nodejs_version: "0.12"
+  - nodejs_version: "4"
+  - nodejs_version: "6"
 
 # Install scripts. (runs after repo cloning)
 install:
diff --git a/examples/simple/components/tabs.js b/examples/simple/components/tabs.js
index 88bc8d01a..d02c92f3b 100644
--- a/examples/simple/components/tabs.js
+++ b/examples/simple/components/tabs.js
@@ -1,4 +1,4 @@
-import can from 'can/';
+import CanComponent from 'can-component';
 import tabsStache from './tabs.stache!';
 /**
  * @module {function} components/tabs/ <tabs>
@@ -7,7 +7,7 @@ import tabsStache from './tabs.stache!';
  * @signature `<tabs>`
  * Creates a tabs component.
  */
-export default can.Component.extend({
+export default CanComponent.extend({
 	tag: "tabs",
 	template: tabsStache,
 	scope: { ... }
diff --git a/lib/configured/configured_test.js b/lib/configured/configured_test.js
index 3b7fc1c70..a7e18390a 100644
--- a/lib/configured/configured_test.js
+++ b/lib/configured/configured_test.js
@@ -104,7 +104,7 @@ describe("lib/configured", function(){
 				done(e)
 			} else {
 				configured.getProject({
-					source: "git://github.com/bitovi/canjs#minor",
+					source: "git://github.com/canjs/canjs#master",
 					path: path.join(__dirname,"test","tmp","canjs"),
 					npmInstall: ["stealjs/steal#master"]
 				}).then(function(){
@@ -122,7 +122,7 @@ describe("lib/configured", function(){
 
 
 	it(".geneateProject is able to read the documentjs.json without versions and build a site", function(done){
-		this.timeout(10000);
+		this.timeout(30000);
 		rmdir(path.join(__dirname,"test","api"), function(e){
 			if(e) {
 				done(e);
@@ -141,7 +141,7 @@ describe("lib/configured", function(){
 	});
 
 	it(".geneateProject is able to take a docObject instead of reading one", function(done){
-		this.timeout(10000);
+		this.timeout(30000);
 		rmdir(path.join(__dirname,"test","tmp","example_project"), function(e){
 			if(e) {
 				done(e);
@@ -176,15 +176,17 @@ describe("lib/configured", function(){
 			open("test/tmp/multiple_versions/1.0.0/api/index.html",function(browser, close){
 				var select = browser.window.document.getElementsByTagName("select")[0],
 					$ = browser.window.$;
-					$(select).val("3.0.0").trigger("change");
 
-					waitFor(browser, function(window){
-						return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/3.0.0/api/index.html"
-					}, function(){
-						assert.ok(true,"updated page");
-						close();
-						next();
-					}, close);
+				$(select).val("3.0.0");
+				select.dispatchEvent(new browser.window.Event('change'));
+
+				waitFor(browser, function(window){
+					return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/3.0.0/api/index.html"
+				}, function(){
+					assert.ok(true,"updated page");
+					close();
+					next();
+				}, close);
 
 			},done);
 		};
@@ -193,15 +195,17 @@ describe("lib/configured", function(){
 			open("test/tmp/multiple_versions/api/index.html",function(browser, close){
 				var select = browser.window.document.getElementsByTagName("select")[0],
 					$ = browser.window.$;
-					$(select).val("3.0.0").trigger("change");
 
-					waitFor(browser, function(window){
-						return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/3.0.0/api/index.html"
-					}, function(){
-						assert.ok(true,"updated page");
-						close();
-						next();
-					}, close);
+				$(select).val("3.0.0");
+				select.dispatchEvent(new browser.window.Event('change'));
+
+				waitFor(browser, function(window){
+					return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/3.0.0/api/index.html"
+				}, function(){
+					assert.ok(true,"updated page");
+					close();
+					next();
+				}, close);
 
 			},done);
 		};
@@ -210,15 +214,17 @@ describe("lib/configured", function(){
 			open("test/tmp/multiple_versions/3.0.0/api/index.html",function(browser, close){
 				var select = browser.window.document.getElementsByTagName("select")[0],
 					$ = browser.window.$;
-					$(select).val("2.0.0").trigger("change");
 
-					waitFor(browser, function(window){
-						return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/api/index.html"
-					}, function(){
-						assert.ok(true,"updated page");
-						close();
-						next();
-					}, close);
+				$(select).val("2.0.0");
+				select.dispatchEvent(new browser.window.Event('change'));
+
+				waitFor(browser, function(window){
+					return window.location.href == "http://localhost:8081/test/tmp/multiple_versions/api/index.html"
+				}, function(){
+					assert.ok(true,"updated page");
+					close();
+					next();
+				}, close);
 
 			},done);
 		};
@@ -258,7 +264,7 @@ describe("lib/configured", function(){
 
 
 	it(".generateProject is able to build something without a documentjs.json", function(done){
-		this.timeout(10000);
+		this.timeout(30000);
 		rmdir(path.join(__dirname,"test","docs"), function(e){
 			if(e) {
 				done(e);
diff --git a/lib/generate/test/generate_test.js b/lib/generate/test/generate_test.js
index 2b4259a30..1fc65b11b 100644
--- a/lib/generate/test/generate_test.js
+++ b/lib/generate/test/generate_test.js
@@ -39,7 +39,7 @@ var open = function(url, callback, done){
 describe("documentjs/lib/generate/generate",function(){
 	
 	it("works",function(done){
-		this.timeout(30000);
+		this.timeout(10000);
 		rmdir(__dirname+"/out",function(error){
 		
 			generate({
@@ -62,6 +62,7 @@ describe("documentjs/lib/generate/generate",function(){
 	});
 	
 	it("@outline works", function(done){
+		this.timeout(30000);
 		generate({
 			glob: __dirname+"/example/*.js",
 			dest: __dirname+"/out",
diff --git a/lib/generators/html/html_test.js b/lib/generators/html/html_test.js
index aaffecf75..56bad8b0b 100644
--- a/lib/generators/html/html_test.js
+++ b/lib/generators/html/html_test.js
@@ -33,7 +33,7 @@ describe("documentjs/lib/generators/html",function(){
 				}, options));
 			});
 			html.generate(docMap,options).then(function(){
-				if(!fs.existsSync(path.join(__dirname,"test","tmp","static","can","can.js"))) {
+				if(!fs.existsSync(path.join(__dirname,"test","tmp","static","can-control","can-control.js"))) {
 					done(new Error("canjs does not exist"));
 				} else if(fs.existsSync(path.join(__dirname,"test","tmp","static","bundles","static.js"))) {
 					done(new Error("static build exists"));
diff --git a/lib/tags/alias.js b/lib/tags/alias.js
index 6f7e98438..233e30be3 100644
--- a/lib/tags/alias.js
+++ b/lib/tags/alias.js
@@ -21,7 +21,7 @@ var _default = require("./_default"),
  * /**
  *  * @alias WidgetFactory
  *  *|
- *  can.Class.extend("jQuery.Controller",
+ *  CanClass.extend("jQuery.Controller",
  *  ...
  * @codeend 
  */
diff --git a/lib/tags/deprecated.js b/lib/tags/deprecated.js
index fc327d167..ecd4dba2f 100644
--- a/lib/tags/deprecated.js
+++ b/lib/tags/deprecated.js
@@ -33,7 +33,7 @@ var tnd = require('./helpers/typeNameDescription')
  * /**
  *  * @function
  *  * @deprecated {1.0} This method has been replaced 
- *  * by [can.Model.parseModel].
+ *  * by [CanModel.parseModel].
  *  *
  *  * @param {String} name
  *  *|
diff --git a/lib/tags/helpers/typer_test.js b/lib/tags/helpers/typer_test.js
index d344c05a4..088353150 100644
--- a/lib/tags/helpers/typer_test.js
+++ b/lib/tags/helpers/typer_test.js
@@ -5,9 +5,9 @@ var typer = require("./typer"),
 describe("documentjs/tags/helpers/typer", function(){
 	
 	it("name",function(){
-		assert.deepEqual( typer.type("can.Control"), {
+		assert.deepEqual( typer.type("CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}]
 		});
 	});
@@ -43,11 +43,11 @@ describe("documentjs/tags/helpers/typer", function(){
 	});
 	
 	it("union",function(){
-		assert.deepEqual( typer.type("(can.Control|can.Model)"), {
+		assert.deepEqual( typer.type("(CanControl|CanModel)"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			},{
-				type: "can.Model"
+				type: "CanModel"
 			}]
 		});
 	});
@@ -67,16 +67,16 @@ describe("documentjs/tags/helpers/typer", function(){
 	});
 	
 	it("nullable",function(){
-		assert.deepEqual( typer.type("?can.Control"), {
+		assert.deepEqual( typer.type("?CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			nullable: true
 		});
 		
-		assert.deepEqual( typer.type("?can.Control"), {
+		assert.deepEqual( typer.type("?CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			nullable: true
 		});
@@ -85,9 +85,9 @@ describe("documentjs/tags/helpers/typer", function(){
 	
 	
 	it("nonnullable",function(){
-		assert.deepEqual( typer.type("!can.Control"), {
+		assert.deepEqual( typer.type("!CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			nonnull: true
 		});
@@ -123,18 +123,18 @@ describe("documentjs/tags/helpers/typer", function(){
 	});
 	
 	it("variable params",function(){
-		assert.deepEqual( typer.type("...can.Control"), {
+		assert.deepEqual( typer.type("...CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			variable: true
 		});
 	})
 	
 	it("variable params",function(){
-		assert.deepEqual( typer.type("...can.Control"), {
+		assert.deepEqual( typer.type("...CanControl"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			variable: true
 		});
@@ -143,14 +143,14 @@ describe("documentjs/tags/helpers/typer", function(){
 	
 	it("variable params",function(){
 		
-		assert.deepEqual( typer.type("function(...can.Observe){}"), {
+		assert.deepEqual( typer.type("function(...CanObserve){}"), {
 			types: [{
 				type: "function",
 				constructs: undefined,
 				context: undefined,
 				returns: {types: [{type: "undefined"}]},
 				params: [
-					{types: [{type: "can.Observe"}], variable: true}
+					{types: [{type: "CanObserve"}], variable: true}
 				]
 			}],
 		});
@@ -159,9 +159,9 @@ describe("documentjs/tags/helpers/typer", function(){
 	
 	// NON-STANDARD types ...
 	it("optional",function(){
-		assert.deepEqual( typer.type("can.Control="), {
+		assert.deepEqual( typer.type("CanControl="), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			}],
 			optional: true
 		});
@@ -178,17 +178,17 @@ describe("documentjs/tags/helpers/typer", function(){
 	});
 	
 	it("parenthesis-less union", function(){
-		assert.deepEqual( typer.type("can.Control|can.Model"), {
+		assert.deepEqual( typer.type("CanControl|CanModel"), {
 			types: [{
-				type: "can.Control"
+				type: "CanControl"
 			},{
-				type: "can.Model"
+				type: "CanModel"
 			}]
 		});
 	})
 	
 	it("parenthesis-less union with function", function(){
-		assert.deepEqual( typer.type("function|can.Model"), {
+		assert.deepEqual( typer.type("function|CanModel"), {
 			types: [{
 				type: "function",
 				type: "function",
@@ -197,7 +197,7 @@ describe("documentjs/tags/helpers/typer", function(){
 				returns: {types: [{type: "undefined"}]},
 				params: []
 			},{
-				type: "can.Model"
+				type: "CanModel"
 			}]
 		});
 	});
diff --git a/lib/tags/plugin.js b/lib/tags/plugin.js
index 572c777f7..e8309be30 100644
--- a/lib/tags/plugin.js
+++ b/lib/tags/plugin.js
@@ -12,8 +12,8 @@
 	 * 
 	 * @codestart
 	 * /**
-	 *  * @@page can.Construct.super
-	 *  * @@parent can.Construct.plugins
+	 *  * @@page CanConstruct.super
+	 *  * @@parent CanConstruct.plugins
 	 *  * @@plugin can/construct/super
 	 *  * @@test can/construct/super/qunit.html
 	 *  *|
diff --git a/lib/tags/property_test.js b/lib/tags/property_test.js
index 4d51b0896..7bcc50801 100644
--- a/lib/tags/property_test.js
+++ b/lib/tags/property_test.js
@@ -27,8 +27,8 @@ describe("documentjs/lib/tags/property",function(){
 		
 		var obj = {};
 		var docMap = {Foo: {name: "Foo", type: "constructor"}}
-		property.add.call(obj,"@property {can.Map|Object|function} bar a description",null,docMap.Foo, docMap );
-		option.add.call(obj,"@option {can.Map} can.Map description");
+		property.add.call(obj,"@property {CanMap|Object|function} bar a description",null,docMap.Foo, docMap );
+		option.add.call(obj,"@option {CanMap} CanMap description");
 		option.add.call(obj,"@option {Object} Object description");
 		option.add.call(obj,"@option {function(String)} Function description");
 		
@@ -37,7 +37,7 @@ describe("documentjs/lib/tags/property",function(){
 			name: "Foo.bar",
 			type: "property",
 			types: [
-				{type: "can.Map", description: "can.Map description"},
+				{type: "CanMap", description: "CanMap description"},
 				{type: "Object", description: "Object description", options: []},
 				{
 					constructs: undefined,
diff --git a/lib/tags/signature.js b/lib/tags/signature.js
index 20b8cf068..49d27df41 100644
--- a/lib/tags/signature.js
+++ b/lib/tags/signature.js
@@ -10,9 +10,9 @@
 	 * @codestart javascript
 	 * /**
 	 *  * Capitalizes a string.
-	 *  * @@signature `can.capitalize(s)` Example:
+	 *  * @@signature `CanCapitalize(s)` Example:
 	 *  *
-	 *  *     can.capitalize("foo") //-> "Bar"
+	 *  *     CanCapitalize("foo") //-> "Bar"
 	 *  * 
 	 *  * @@param {String} s the string to be lowercased.
 	 *  * @@return {String} a string with the first character capitalized, 
diff --git a/package.json b/package.json
index e51195f9d..348beb8d5 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,6 @@
   },
   "scripts": {
     "test": "mocha test.js --reporter spec",
-    "postinstall": "install-engine-dependencies",
     "publish": "git push origin && git push origin --tags",
     "release:prerelease": "npm version prerelease && npm publish",
     "release:patch": "npm version patch && npm publish",
@@ -23,18 +22,21 @@
     "release:major": "npm version major && npm publish"
   },
   "devDependencies": {
+    "connect": "^2.14.4",
     "mocha": ">= 1.18.0",
     "qunit-mocha-ui": "*",
     "rimraf": "2.1",
-    "connect": "^2.14.4"
+    "zombie": "^4.2.1"
   },
   "dependencies": {
     "async": "~0.2.7",
-    "can": "2.3.8",
+    "can-control": "^3.0.10",
+    "can-map": "^3.0.7",
+    "can-stache": "^3.0.24",
+    "can-util": "^3.6.1",
     "chokidar": "^1.0.0-rc5",
     "cross-spawn-async": "^2.1.9",
     "documentjs-github-download": "^0.3.0",
-    "engine-dependencies": "^0.2.0",
     "esprima": "~2.5.0",
     "fs-extra": "^0.24.0",
     "glob": "~6.0.3",
@@ -45,43 +47,13 @@
     "md5": "^2.0.0",
     "minimatch": "~1.0.0",
     "q": "~1.0.1",
-    "steal": "0.13.X",
-    "steal-tools": "0.13.X",
+    "steal": "0.16.X",
+    "steal-stache": "^3.0.7",
+    "steal-tools": "0.16.X",
     "yargs": "^1.3.1"
   },
-  "engineDependencies": {
-    "node": {
-      "0.10.x": {
-        "devDependencies": {
-          "zombie": "^3.1.1"
-        }
-      },
-      "0.12.x": {
-        "devDependencies": {
-          "zombie": "^3.1.1"
-        }
-      },
-      "^4.0.0": {
-        "devDependencies": {
-          "zombie": "^4.2.1"
-        }
-      },
-      "^5.0.0": {
-        "devDependencies": {
-          "zombie": "^4.2.1"
-        }
-      }
-    },
-    "iojs": {
-      "^3.0.0": {
-        "devDependencies": {
-          "zombie": "^4.1.0"
-        }
-      }
-    }
-  },
   "system": {
-    "npmDependencies": []
+    "npmAlgorithm": "flat"
   },
   "homepage": "http://documentjs.com",
   "repository": {
diff --git a/site/default/static/build.js b/site/default/static/build.js
index 0a4323902..d1c247e2f 100644
--- a/site/default/static/build.js
+++ b/site/default/static/build.js
@@ -1,4 +1,6 @@
-
+var assign = require("can-util/js/assign/assign");
+var fs = require('fs');
+var map = require('./map');
 var stealTools = require("steal-tools"),
 	fsx = require('../../../../lib/fs_extras'),
 	Q = require('q'),
@@ -19,26 +21,60 @@ module.exports = function(options, folders){
 	if(options.devBuild) {
 		var promise = Q.all([
 			fsx.copy(path.join(folders.build), path.join(folders.dist) ),
-			fsx.copy(path.join("node_modules","steal"), path.join(folders.dist,"steal") ),
-			fsx.copy(path.join("node_modules","can"), path.join(folders.dist,"can") ),
-			fsx.copy(path.join("node_modules","jquery"), path.join(folders.dist,"jquery") )
+			fsx.copy(path.join("node_modules"), path.join(folders.dist) ),
 		]);
 		// copy everything and steal.js
 		return promise;
 	} else {
+		// manually configure Can/Steal packages for Steal build
+		var paths = {
+			'jquery': path.relative(__dirname, require.resolve('jquery'))
+		};
+
+		// generate the remaining paths
+		var mapCopy = {};
+		for (var packageName in map) {
+			if (map.hasOwnProperty(packageName)) {
+				// map[packageName] can either be just a string (e.g. jquery) or
+				// an object, so we want the path for the module, not an object
+				var resolvePath = (typeof map[packageName] === 'object') ? map[packageName][packageName] : map[packageName];
+				if (!resolvePath) {// Fall back to Node’s resolution for npm 3+
+					resolvePath = require.resolve(packageName);
+				}
+
+				// Get the path relative to the build folder
+				var moduleRelativePath = path.relative(__dirname, resolvePath);
+
+				// Update the paths object with the AMD configuration
+				paths[packageName + '/*'] = path.dirname(moduleRelativePath) + '/*.js';
+				paths[packageName] = moduleRelativePath;
+
+				// Make a copy of the object without the key
+				// that was used to locate the module
+				if (map[packageName][packageName]) {
+					mapCopy[packageName] = assign({}, map[packageName]);
+					delete mapCopy[packageName][packageName];
+				} else {
+					mapCopy[packageName] = map[packageName];
+				}
+			}
+		}
+
+		// conditional map
+		// write it out for the client to consume
+		var mapJSON = JSON.stringify(mapCopy);
+		fs.writeFileSync(path.join(__dirname, 'map.json'), mapJSON);
 
-		var jQueryRelative = path.relative( __dirname, require.resolve("jquery") );
-		var canJSRelative = path.dirname( path.relative( __dirname, require.resolve("can") ) )+"/*.js";
-		
 		// makes sure can is not added to the global so we can build nicely.
 		global.GLOBALCAN = false;
 		return stealTools.build({
 			main: "static",
-			config: __dirname+"/config.js",
+			config: __dirname + "/config.js",
 			bundlesPath: __dirname+"/bundles",
-			paths:  {
-				"jquery": jQueryRelative,
-				"can/*": canJSRelative
+			paths: paths,
+			map: mapCopy,
+			ext: {
+				'stache': 'steal-stache'
 			}
 		},{
 			minify: options.minifyBuild === false ? false : true,
@@ -65,7 +101,4 @@ module.exports = function(options, folders){
 
 		});
 	}
-
-
-
 };
diff --git a/site/default/static/config.js b/site/default/static/config.js
index f41da0e2d..d5b5184dd 100644
--- a/site/default/static/config.js
+++ b/site/default/static/config.js
@@ -1,34 +1,29 @@
 (function () {
+	var map = require('./map.json');
 	var isClient = typeof window !== "undefined";
-	
+
 	var configData = {
-		map: {
-			"jquery/jquery": "jquery",
-			"can/util/util": "can/util/jquery/jquery",
-			"benchmark/benchmark": "benchmark",
-			"mustache": "can/view/mustache/system"
+		map: map,
+		ext: {
+			'stache': 'steal-stache'
 		},
 		meta: {
 			jquery: {
 				exports: "jQuery"
 			},
 			prettify: {format: "global"}
-		},
-		ext: {
-			ejs: "can/view/ejs/system",
-			mustache: "can/view/mustache/system",
-			stache: "can/view/stache/system"
 		}
 	};
-	
+
 	if(isClient) {
 		// when not a client, these values are set by build.js.
 		configData.paths = {
 			"jquery": "jquery/dist/jquery.js",
-			"can/*": "can/*.js" 
+			"can/*": "can/*.js"
 		};
 	}
-	
+
+
 	System.config(configData);
 })();
 
diff --git a/site/default/static/content_list.js b/site/default/static/content_list.js
index 9e152e10a..682c0e231 100644
--- a/site/default/static/content_list.js
+++ b/site/default/static/content_list.js
@@ -1,85 +1,86 @@
-steal("can/control","jquery","can/observe",function(Control, $){
+var CanControl = require("can-control");
+var $ = require("jquery");
+require("can-map");
 
-	var contentList = function(sections, tag){
-		var element = $("<"+tag+">");
-		$.each(sections, function(i, section){
-			$li = $("<li>");
-			$a = $("<a>").attr("href","#"+section.id).text(section.text);
-			element.append( $li.append($a) );
-			
-			if(section.sections && section.sections.length) {
-				$li.append( contentList(section.sections, tag) );
-			}
+var contentList = function(sections, tag){
+	var element = $("<"+tag+">");
+	$.each(sections, function(i, section){
+		$li = $("<li>");
+		$a = $("<a>").attr("href","#"+section.id).text(section.text);
+		element.append( $li.append($a) );
+
+		if(section.sections && section.sections.length) {
+			$li.append( contentList(section.sections, tag) );
+		}
+	});
+	return element;
+};
+
+module.exports = CanControl.extend({
+	init: function() {
+		var sections = [];
+		this.$element = $(this.element);
+
+		this.collectSignatures().each(function(ix) {
+			var h2 = $('h2', this);
+			this.id = 'sig_' + h2.text().replace(/\s/g,"").replace(/[^\w]/g,"_");
+			//this.id = encodeURIComponent(h2.text());
+			sections.push({id: this.id, text: h2.text()});
 		});
-		return element;
-	};
 
-	return can.Control.extend({
-		init: function() {
-			var sections = [];
-	
-			this.collectSignatures().each(function(ix) {
-				var h2 = $('h2', this);
-				this.id = 'sig_' + h2.text().replace(/\s/g,"").replace(/[^\w]/g,"_");
-				//this.id = encodeURIComponent(h2.text());
-				sections.push({id: this.id, text: h2.text()});
-			});
-			
-			var headingStack = [],
-				last = function(){
-					return headingStack[ headingStack.length -1 ]
-				};
-			
-			var ch = this.collectHeadings().each(function(ix) {
-				var el = $(this);
-				this.id = 'section_' + el.text().replace(/\s/g,"").replace(/[^\w]/g,"_");
-				var num = +this.nodeName.substr(1);
-				var section = {
-					id: this.id, 
-					text: el.text(),
-					num: num,
-					sections: []
-				};
-				
-				while(last() && (last().num >= num) ) {
-					headingStack.pop();
-				}
-				
-				if(!headingStack.length) {
-					sections.push(section);
-					headingStack.push(section);
-				} else {
-					last().sections.push(section);
-					headingStack.push(section);
-				}	
-			});
-	
-			this.element.html( contentList(sections, 
-				( ( window.docObject.outline && window.docObject.outline.tag ) || "ul" ).toLowerCase() ) );
-	
-			if(window.location.hash.length) {
-				var id = window.location.hash.replace('#', ''),
-					anchor = document.getElementById(id);
+		var headingStack = [],
+			last = function(){
+				return headingStack[ headingStack.length -1 ]
+			};
+
+		var ch = this.collectHeadings().each(function(ix) {
+			var el = $(this);
+			this.id = 'section_' + el.text().replace(/\s/g,"").replace(/[^\w]/g,"_");
+			var num = +this.nodeName.substr(1);
+			var section = {
+				id: this.id,
+				text: el.text(),
+				num: num,
+				sections: []
+			};
+
+			while(last() && (last().num >= num) ) {
+				headingStack.pop();
+			}
 
-				if(anchor) {
-					anchor.scrollIntoView(true);
-				}
+			if(!headingStack.length) {
+				sections.push(section);
+				headingStack.push(section);
+			} else {
+				last().sections.push(section);
+				headingStack.push(section);
 			}
-		},
-		collectSignatures: function() {
-			var cloned = $('.content .signature').clone();
-			// remove release numbers
-			cloned.find(".release").remove();
-			return cloned;
-		},
-		collectHeadings: function() {
-			var depth = ( window.docObject.outline && window.docObject.outline.depth ) || 1;
-			var headings = [];
-			for(var i = 0; i  < depth; i++) {
-				headings.push("h"+(i+2));
+		});
+
+		this.$element.html( contentList(sections,
+			( ( window.docObject.outline && window.docObject.outline.tag ) || "ul" ).toLowerCase() ) );
+
+		if(window.location.hash.length) {
+			var id = window.location.hash.replace('#', ''),
+				anchor = document.getElementById(id);
+
+			if(anchor) {
+				anchor.scrollIntoView(true);
 			}
-			return $('.content .comment').find(headings.join(","));
 		}
-	});
-
-});
\ No newline at end of file
+	},
+	collectSignatures: function() {
+		var cloned = $('.content .signature').clone();
+		// remove release numbers
+		cloned.find(".release").remove();
+		return cloned;
+	},
+	collectHeadings: function() {
+		var depth = ( window.docObject.outline && window.docObject.outline.depth ) || 1;
+		var headings = [];
+		for(var i = 0; i  < depth; i++) {
+			headings.push("h"+(i+2));
+		}
+		return $('.content .comment').find(headings.join(","));
+	}
+});
diff --git a/site/default/static/demo_frame.js b/site/default/static/demo_frame.js
index 2274b1978..9bdb2fde2 100644
--- a/site/default/static/demo_frame.js
+++ b/site/default/static/demo_frame.js
@@ -1,13 +1,15 @@
-steal("can/control","./demo_frame.mustache!","jquery","can/observe","./prettify.js",function(Control,demoFrameMustache,$){
-	
-	
+var CanControl = require("can-control");
+var demoFrameTemplate = require("./demo_frame.stache!");
+var $ = require("jquery");
+require("can-map");
+require("./prettify");
 
-return can.Control.extend({
+module.exports = CanControl.extend({
 	init: function() {
-		
 		var docConfig = window.docConfig || {};
+		this.element = $(this.element);
 		// Render out the demo container.
-		this.element.html(demoFrameMustache( {demoSrc: (docConfig.demoSrcRoot || ".." )+'/' + this.element.data('demoSrc')}));
+		this.element.html(demoFrameTemplate( {demoSrc: (docConfig.demoSrcRoot || ".." )+'/' + this.element.data('demoSrc')}));
 
 		// Start with the demo tab showing.
 		this.showTab('demo');
@@ -85,5 +87,3 @@ return can.Control.extend({
 		return prettyPrintOne(unescaped.replace(/</g, '&lt;'));
 	}
 });
-
-});
\ No newline at end of file
diff --git a/site/default/static/demo_frame.mustache b/site/default/static/demo_frame.stache
similarity index 100%
rename from site/default/static/demo_frame.mustache
rename to site/default/static/demo_frame.stache
diff --git a/site/default/static/frame_helper.js b/site/default/static/frame_helper.js
index 012271d50..765e9c006 100644
--- a/site/default/static/frame_helper.js
+++ b/site/default/static/frame_helper.js
@@ -1,36 +1,37 @@
-steal('can/control','jquery','./demo_frame.js',function(Control, $,DemoFrame){
+var CanControl = require("can-control");
+var $ = require("jquery");
+var DemoFrame = require("./demo_frame");
 
-	return Control.extend( {
-		init: function() {
-			this.replaceIframes();
-			this.replaceDemos();
-		},
-		replaceIframes: function() {
-			// @iframe can/test/demo.html 400
-			// <div class="iframe_wrapper" data-iframe-src="can/test/demo.html" data-iframe-height="400"></div>
-			$('.iframe_wrapper', this.element).each(function() {
-				var wrapper = $(this),
-					iframe = $('<iframe src="../' + wrapper.data('iframeSrc') + '">');
-				
-				if(wrapper.data('iframeHeight')) {
-					iframe.height(wrapper.data('iframeHeight'));
-				}
-	
-				wrapper.append(iframe);
-			});
-		},
-		replaceDemos: function() {
-			// @demo can/control/control.html 400
-			// <div class="demo_wrapper" data-demo-src="can/control/control.html"></div>
-			$('.demo_wrapper', this.element).each(function() {
-				var wrapper = $(this);
-				new DemoFrame(wrapper);
-				
-				if(wrapper.data('demoHeight')) {
-					iframe.height(wrapper.data('demoHeight'));
-				}
-			});
-		}
-	});
+module.exports = CanControl.extend({
+	init: function() {
+		this.$element = $(this.element);
+		this.replaceIframes();
+		this.replaceDemos();
+	},
+	replaceIframes: function() {
+		// @iframe can/test/demo.html 400
+		// <div class="iframe_wrapper" data-iframe-src="can/test/demo.html" data-iframe-height="400"></div>
+		$('.iframe_wrapper', this.$element).each(function() {
+			var wrapper = $(this),
+				iframe = $('<iframe src="../' + wrapper.data('iframeSrc') + '">');
+			
+			if(wrapper.data('iframeHeight')) {
+				iframe.height(wrapper.data('iframeHeight'));
+			}
 
-})
\ No newline at end of file
+			wrapper.append(iframe);
+		});
+	},
+	replaceDemos: function() {
+		// @demo can/control/control.html 400
+		// <div class="demo_wrapper" data-demo-src="can/control/control.html"></div>
+		$('.demo_wrapper', this.$element).each(function() {
+			var wrapper = $(this);
+			new DemoFrame(wrapper);
+			
+			if(wrapper.data('demoHeight')) {
+				iframe.height(wrapper.data('demoHeight'));
+			}
+		});
+	}
+});
diff --git a/site/default/static/map.js b/site/default/static/map.js
new file mode 100644
index 000000000..240f8b44e
--- /dev/null
+++ b/site/default/static/map.js
@@ -0,0 +1,96 @@
+var fs = require('fs');
+var path = require('path');
+
+// Helper for recursively getting all the JS files in a directory
+var getJSFiles = function(dir, filelist) {
+	var files = fs.readdirSync(dir);
+	filelist = filelist || [];
+	files.forEach(function(file) {
+		if (file !== 'node_modules') {
+			var fullPath = path.join(dir, file);
+			if (fs.statSync(fullPath).isDirectory()) {
+				filelist = getJSFiles(fullPath, filelist);
+			} else if (file.substr(-3) === '.js') {
+				filelist.push(fullPath);
+			}
+		}
+	});
+	return filelist;
+};
+
+// Get most of the can-* and steal-* packages from node_modules
+var getCanAndStealModules = function(moduleFolder) {
+	try {
+		var fileNames = fs.readdirSync(path.join(moduleFolder, 'node_modules'));
+		return fileNames.filter(function(fileName) {
+			var isCanModule = fileName.substr(0, 4) === 'can-';
+			var isStealModule = fileName.substr(0, 6) === 'steal-' && fileName !== 'steal-tools';
+			return isCanModule || isStealModule;
+		});
+	} catch (error) {
+		return;
+	}
+};
+var moduleNames = getCanAndStealModules('');
+
+// This map will be exported
+var modulesMap = {
+	"benchmark/benchmark": "benchmark",
+	"jquery/jquery": "jquery"
+};
+
+// This function is used recursively to update the exported modulesMap
+var updateMapWithModules = function(moduleNames, prefix) {
+	moduleNames.forEach(function(moduleName) {
+
+		// If the module has already been defined, skip it
+		if (modulesMap[moduleName]) {
+			return;
+		}
+
+		var moduleMap = {};
+		var modulePath = path.join(prefix, 'node_modules', moduleName);
+
+		// Get all of the .js files in this module’s directory
+		var jsFiles = getJSFiles(modulePath);
+
+		// Run through all the JS files in the module and create a map like
+		// "can-cid": {"build": "can-cid/build"}
+		jsFiles.forEach(function(jsFile) {
+			// jsFile looks like node_modules/can-cid/build.js
+			// or node_modules\can-cid\build.js on Windows
+
+			// …normalize to use forward slashes for the module names
+			var jsFileModule = jsFile.replace(new RegExp('\\\\', 'g'), '/');
+
+			// pathWithModuleName will look like “can-cid/build”
+			var pathWithModuleName = jsFileModule.substr((prefix.length ? prefix.length + 1 : 0) + 'node_modules'.length + 1).slice(0, -3);
+
+			// pathWithoutModuleName will look like “build”
+			var pathWithoutModuleName = pathWithModuleName.substr(moduleName.length + 1);
+
+			// for the main file (e.g. can-cid/can-cid), include the full path;
+			// otherwise, used the short module name (e.g. can-cid/build)
+			if (pathWithoutModuleName === moduleName) {
+				moduleMap[pathWithoutModuleName]= jsFileModule;
+			} else {
+				moduleMap[pathWithoutModuleName]= pathWithModuleName;
+			}
+		});
+
+		// Update the exported map
+		modulesMap[moduleName] = moduleMap;
+
+		// If this module has node_modules that are can-* or steal-*,
+		// then go through them recursively
+		var subModuleNames = getCanAndStealModules(modulePath);
+		if (subModuleNames) {
+			updateMapWithModules(subModuleNames, modulePath);
+		}
+	});
+};
+
+// Start at the root folder
+updateMapWithModules(moduleNames, '');
+
+module.exports = modulesMap;
diff --git a/site/default/static/static.js b/site/default/static/static.js
index 75d9d1c66..f10626855 100644
--- a/site/default/static/static.js
+++ b/site/default/static/static.js
@@ -1,18 +1,18 @@
-steal("./content_list.js",
-	"./frame_helper.js",
-	"./versions.js",
-	"./styles/styles.less!",
-	"./prettify",function(ContentList, FrameHelper, Versions){
-	var codes = document.getElementsByTagName("code");
-	for(var i = 0; i < codes.length; i ++){
-		var code = codes[i];
-		if(code.parentNode.nodeName.toUpperCase() === "PRE"){
-			code.className = code.className +" prettyprint";
-		}
+var ContentList = require("./content_list");
+var FrameHelper = require("./frame_helper");
+var Versions = require("./versions");
+require("./styles/styles.less!");
+require("./prettify");
+
+var codes = document.getElementsByTagName("code");
+for(var i = 0; i < codes.length; i ++){
+	var code = codes[i];
+	if(code.parentNode.nodeName.toUpperCase() === "PRE"){
+		code.className = code.className +" prettyprint";
 	}
-	prettyPrint();
-	
-	new ContentList(".contents");
-	new FrameHelper(".docs");
-	new Versions( $("#versions, .sidebar-title:first") );
-});
+}
+prettyPrint();
+
+new ContentList(".contents");
+new FrameHelper(".docs");
+new Versions( $("#versions, .sidebar-title:first")[0] );
diff --git a/site/default/static/versions.js b/site/default/static/versions.js
index daaf53507..445295e0d 100644
--- a/site/default/static/versions.js
+++ b/site/default/static/versions.js
@@ -1,147 +1,144 @@
-steal("can/control", "can/util","jquery",function(Control, can, $){
-	var pageConfig = window.docObject || {};
-	
-	var endsWithSlash = function(path){
-		return path[path.length -1] === "/";
-	};
-	
-	var combine = function(first, second){
-		var right = first[first.length -1],
-			left = second[0];
-		if(right != "/" && left != "/") {
-			return steal.joinURIs(first,second);
-		} else if(right == "/" && left == "/") {
-			return left+second.substr(1);
+var CanControl = require("can-control");
+var each = require("can-util/js/each/");
+var $ = require("jquery");
+
+var pageConfig = window.docObject || {};
+
+var endsWithSlash = function(path){
+	return path[path.length -1] === "/";
+};
+
+var combine = function(first, second){
+	var right = first[first.length -1],
+		left = second[0];
+	if(right != "/" && left != "/") {
+		return steal.joinURIs(first,second);
+	} else if(right == "/" && left == "/") {
+		return left+second.substr(1);
+	} else {
+		return first+second;
+	}
+};
+var dirname = function(path){
+	var parts = path.split("/");
+	parts.pop();
+	return parts.join("/");
+};
+var removeTrailingSlash = function(path){
+	if(endsWithSlash(path)) {
+		return path.substr(0, path.length -1);
+	} else {
+		return path;
+	}
+};
+
+module.exports = CanControl.extend({
+	setup: function(el, options){
+		var container;
+		el = $(el);
+		if(el.attr("id") === "versions" && el[0].nodeName.toLowerCase() === "select") {
+			container = el;
 		} else {
-			return first+second;
+			container = $("<select id='versions'/>").hide();
+			el.after(container);
 		}
-	};
-	var dirname = function(path){
-		var parts = path.split("/");
-		parts.pop();
-		return parts.join("/");
-	};
-	var removeTrailingSlash = function(path){
-		if(endsWithSlash(path)) {
-			return path.substr(0, path.length -1);
-		} else {
-			return path;
+
+		return CanControl.prototype.setup.call(this, container[0], options);
+	},
+	init: function(){
+		this.$element = $(this.element);
+		if(pageConfig.project && pageConfig.project.version) {
+			var self = this;
+			
+			$.ajax(pageConfig.docConfigDest || "../../documentjs.json", {
+				success: function(docConfig){
+					self.docConfig = docConfig;
+					var versions = [];
+					$.each(docConfig.versions||[], function(name){
+						versions.push(name);
+					});
+					self.addOptions(versions);
+				},
+				error: function(){
+					// self.addOptions(["0.0.0","0.0.1"]);
+				},
+				dataType: "json"
+			});
 		}
-	};
-	return Control.extend({
-		setup: function(el, options){
-			var container;
-			el = $(el);
-			if(el.attr("id") === "versions" && el[0].nodeName.toLowerCase() === "select") {
-				container = el;
-			} else {
-				container = $("<select id='versions'/>").hide();
-				el.after(container);
-			}
+		
+	},
+	addOptions: function(versions){
+		this.versions = versions;
+		var html = "",
+			self = this;
+		each(versions, function(version){
+			html += "<option value='"+version+"'"+
+						(version == pageConfig.project.version ? " SELECTED" : "") +
+					">"+ self.getVersionSelectText(version)+
+					"</option>";
+		});
+		this.$element.html(html).fadeIn();
+	},
+	getVersionSelectText: function(version){
+		return pageConfig.versionsSelectText ? 
+			pageConfig.versionsSelectText.replace(/<%=\s*version\s*%>/,""+version) : 
+			version;
+	},
+	getVersionedParentPath: function(version ){
+		var path = (this.docConfig.versionDest || "./<%= version %>/<%= name %>").replace(/<%=\s*version\s*%>/,""+version)
+			.replace(/<%=\s*name\s*%>/,""+pageConfig.project.name);
+		return dirname(path);
+	},
+	getDefaultParentPath: function(){
+		var path = (this.docConfig.defaultDest || "./<%= name %>").replace(/<%=\s*name\s*%>/,""+pageConfig.project.name);
+		return dirname(path);
+	},
+	'change': function(el, ev) {
+		var newVersion = this.$element.val(),
+			version = pageConfig.project.version,
+			loc = ""+window.location,
+			isVersioned = loc.indexOf("/"+version+"/") >= 0,
+			versions = this.versions,
+			isNewCurrentVersion = false,
+			defaultVersion = this.docConfig.defaultVersion,
+			defaultDest = this.getDefaultParentPath();
 			
-			return Control.prototype.setup.call(this, container, options);
-		},
-		init: function(){
-			if(pageConfig.project && pageConfig.project.version) {
-				var self = this;
-				
-				$.ajax(pageConfig.docConfigDest || "../../documentjs.json", {
-					success: function(docConfig){
-						self.docConfig = docConfig;
-						var versions = [];
-						$.each(docConfig.versions||[], function(name){
-							versions.push(name);
-						});
-						self.addOptions(versions);
-					},
-					error: function(){
-						// self.addOptions(["0.0.0","0.0.1"]);	
-					},
-					dataType: "json"
-				});
+		for(var i =0 ; i < versions.length; i++){
+			if(versions[i] == defaultVersion && versions[i] == newVersion){
+				isNewCurrentVersion = true;
 			}
+		}
+
+		// All of this needs to use defaultDest and dest
+
+		// going old to new
+		if( isVersioned && isNewCurrentVersion )  {
+			var afterVersion = loc.replace(new RegExp(".*"+version),"");
 			
-		},
-		addOptions: function(versions){
-			this.versions = versions;
-			var html = "",
-				self = this;
-			can.each(versions, function(version){
-				html += "<option value='"+version+"'"+
-							(version == pageConfig.project.version ? 
-								" SELECTED" : "") +
-						">"+ self.getVersionSelectText(version)+
-						"</option>";
-			});
-			this.element.html(html).fadeIn();
-		},
-		getVersionSelectText: function(version){
-			return pageConfig.versionsSelectText ? 
-				pageConfig.versionsSelectText.replace(/<%=\s*version\s*%>/,""+version) : 
-				version;
-		},
-		getVersionedParentPath: function(version ){
-			
-			var path = (this.docConfig.versionDest || "./<%= version %>/<%= name %>").replace(/<%=\s*version\s*%>/,""+version)
-				.replace(/<%=\s*name\s*%>/,""+pageConfig.project.name);
-			return dirname(path);
-		},
-		getDefaultParentPath: function(){
-			var path = (this.docConfig.defaultDest || "./<%= name %>").replace(/<%=\s*name\s*%>/,""+pageConfig.project.name);
-			return dirname(path);
-		},
-		'change': function(el, ev) {
-			var newVersion = this.element.val(),
-				version = pageConfig.project.version,
-				loc = ""+window.location,
-				isVersioned = loc.indexOf("/"+version+"/") >= 0,
-				versions = this.versions,
-				isNewCurrentVersion = false,
-				defaultVersion = this.docConfig.defaultVersion,
-				defaultDest = this.getDefaultParentPath();
+			var toDocumentJSON = steal.joinURIs(window.location.pathname, 
+				pageConfig.docConfigDest );
 				
-			for(var i =0 ; i < versions.length; i++){
+			var toDefaultDest = steal.joinURIs(toDocumentJSON,defaultDest);
+			toDefaultDest = removeTrailingSlash(toDefaultDest);
+			window.location = toDefaultDest+afterVersion;
 			
-				if(versions[i] == defaultVersion && versions[i] == newVersion){
-					isNewCurrentVersion = true;
-				} 
-			}
-	
-			// All of this needs to use defaultDest and dest
-	
-			// going old to new
-			if( isVersioned && isNewCurrentVersion )  {
-				var afterVersion = loc.replace(new RegExp(".*"+version),"");
-				
-				var toDocumentJSON = steal.joinURIs(window.location.pathname, 
-					pageConfig.docConfigDest );
-					
-				var toDefaultDest = steal.joinURIs(toDocumentJSON,defaultDest);
-				toDefaultDest = removeTrailingSlash(toDefaultDest);
-				window.location = toDefaultDest+afterVersion;
-				
-			// going new to old
-			} else if( !isVersioned ) {
-				// need to preserve where we are
-				var toDocumentJSON = steal.joinURIs(window.location.pathname, 
-					pageConfig.docConfigDest );
-				var toDefaultDest = steal.joinURIs(toDocumentJSON,defaultDest);
-				toDefaultDest = removeTrailingSlash(toDefaultDest);
-				// get what's added after the default dest
-				var after = window.location.pathname.replace( toDefaultDest, "");
-				// get the versioned part
-				var versioned = combine(toDocumentJSON, this.getVersionedParentPath(newVersion));
+		// going new to old
+		} else if( !isVersioned ) {
+			// need to preserve where we are
+			var toDocumentJSON = steal.joinURIs(window.location.pathname, 
+				pageConfig.docConfigDest );
+			var toDefaultDest = steal.joinURIs(toDocumentJSON,defaultDest);
+			toDefaultDest = removeTrailingSlash(toDefaultDest);
+			// get what's added after the default dest
+			var after = window.location.pathname.replace( toDefaultDest, "");
+			// get the versioned part
+			var versioned = combine(toDocumentJSON, this.getVersionedParentPath(newVersion));
 
-				window.location = versioned+after;
-				
-			} else {
-				// going old to old
-				
-				window.location = loc.replace("/"+version+"/","/"+newVersion+"/");
-			}
+			window.location = versioned+after;
+		} else {
+			// going old to old
 			
+			window.location = loc.replace("/"+version+"/","/"+newVersion+"/");
 		}
-	});
-
+	}
 });
-
diff --git a/site/default/templates/layout.mustache b/site/default/templates/layout.mustache
index 25b4ea9d9..80e5a07ea 100644
--- a/site/default/templates/layout.mustache
+++ b/site/default/templates/layout.mustache
@@ -83,11 +83,11 @@
 		    }
 		  }
 		</script>
-		<script type='text/javascript' 
+		<script type='text/javascript'
 				data-main="static"
-				data-config="./static/config.js"
+				data-config="./config.js"
 				src="./static/steal.production.js"
-	    		bundles-path="bundles"></script>
+	    		bundles-path="static/bundles"></script>
 	{{/if}}
 </body>