diff --git a/.gitignore b/.gitignore
index ad48a980f..063d7633c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -45,8 +45,10 @@ test/coverage
 
 /modules/universal/browser/typings
 /modules/universal/server/typings
+/modules/universal/node/typings
 /modules/**/dist
 /modules/**/node_modules
 /modules/**/typings
 /modules/angular2-grunt-prerender/tasks
+/modules/grunt-prerender/tasks
 
diff --git a/examples/app/server/express/server.ts b/examples/app/server/express/server.ts
index 9331069f3..97b55014f 100644
--- a/examples/app/server/express/server.ts
+++ b/examples/app/server/express/server.ts
@@ -5,21 +5,17 @@ var path = require('path');
 
 module.exports = function(ROOT) {
   var app = express();
-  var {ng2ExpressEngine} = require('angular2-universal-preview');
+  var {expressEngine} = require('angular2-universal-preview');
   // rendering engine
-
-  app.engine('ng2.html', ng2ExpressEngine);
+  app.engine('ng2.html', expressEngine);
   app.set('views', path.join(ROOT, 'examples'));
   app.set('view engine', 'ng2.html');
   app.set('view options', { doctype: 'html' });
 
-  console.log(__dirname);
-
   var routes = require('./routes');
   var api = require('./api');
   var graphApi = require('./graph_api');
 
-
   app.use(serveStatic(`${ROOT}/dist`));
   app.use(serveStatic(`${ROOT}/examples/app/public`));
 
diff --git a/index.js b/index.js
index e4c05dd63..9cb44052e 100644
--- a/index.js
+++ b/index.js
@@ -1,19 +1,10 @@
 var SERVER_IP = '127.0.0.1';
 
 var port = process.env.PORT || 3000;
-// var ssl  = process.env.SSLPORT || 4000;
 
 // Module dependencies
 var http = require('http');
-// require('nocycle').detect();
-// var https = require('https');
 
-/*
-var options = {
-  key:  fs.readFileSync('/private/etc/apache2/ssl/ssl.key'),
-  cert: fs.readFileSync('/private/etc/apache2/ssl/ssl.crt')
-};
-*/
 
 // Start server
 var framework = process.argv[2] || 'express';
@@ -28,11 +19,12 @@ if (framework === 'hapi') {
     port,
     address: SERVER_IP
   });
-  module.exports.Server = server.start(() => {
-    console.log(`Listening on port: ${port}`);
-    // for smoke testing
-    // smokeTest();
-  });
+  module.exports.Server = server
+    .start(() => {
+      console.log(`Listening on port: ${port}`);
+      // for smoke testing
+      // smokeTest();
+    });
 
 } else {
   // express or other express compliant frameworks
@@ -45,22 +37,16 @@ if (framework === 'hapi') {
     process.exit(1);
   }
 
-  module.exports.Server = http.createServer(server).listen(port, SERVER_IP,
-    function() {
+  module.exports.Server = http
+    .createServer(server)
+    .listen(port, SERVER_IP, function() {
       console.log(`Listening on port: ${port}`);
       // for smoke testing
       // smokeTest();
     });
 
 }
-console.log(`Using framework: ${framework}`);
-
-
-/*
-https.createServer(options, server).listen(ssl, function() {
-  console.log('Listening on port: ' + ssl + ' in ' + process.env.NODE_ENV);
-});
-*/
+console.log(`Using framework: "${framework}"`);
 
 
 function smokeTest() {
diff --git a/modules/angular2-gulp-prerender/index.ts b/modules/angular2-gulp-prerender/index.ts
deleted file mode 100644
index 34cdf8bdc..000000000
--- a/modules/angular2-gulp-prerender/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import * as GulpAngular2Render from './src/prerender';
-
-export * from './src/prerender';
-export default GulpAngular2Render;
diff --git a/modules/angular2-express-engine/angular2-express-engine.d.ts b/modules/express-engine/angular2-express-engine.d.ts
similarity index 100%
rename from modules/angular2-express-engine/angular2-express-engine.d.ts
rename to modules/express-engine/angular2-express-engine.d.ts
diff --git a/modules/angular2-express-engine/index.ts b/modules/express-engine/index.ts
similarity index 100%
rename from modules/angular2-express-engine/index.ts
rename to modules/express-engine/index.ts
diff --git a/modules/angular2-express-engine/package.json b/modules/express-engine/package.json
similarity index 100%
rename from modules/angular2-express-engine/package.json
rename to modules/express-engine/package.json
diff --git a/modules/angular2-express-engine/src/engine.ts b/modules/express-engine/src/engine.ts
similarity index 90%
rename from modules/angular2-express-engine/src/engine.ts
rename to modules/express-engine/src/engine.ts
index a4f5e474c..172633d06 100644
--- a/modules/angular2-express-engine/src/engine.ts
+++ b/modules/express-engine/src/engine.ts
@@ -178,6 +178,19 @@ export function expressEngine(filePath: string, options: engineOptions, done: Fu
   }
 };
 
+export const ng2engine = function(...args) {
+  console.warn('DEPRECATION WARNING: `ng2engine` is no longer supported and will be removed in next release. use `expressEngine`');
+  return expressEngine(...args);
+}
+export const ng2Engine = function(...args) {
+  console.warn('DEPRECATION WARNING: `ng2Engine` is no longer supported and will be removed in next release. use `expressEngine`');
+  return expressEngine(...args);
+}
+export const ng2ExpressEngine = function(...args) {
+  console.warn('DEPRECATION WARNING: `ng2ExpressEngine` is no longer supported and will be removed in next release. use `expressEngine`');
+  return expressEngine(...args);
+}
+
 export function simpleReplace(filePath: string, options: engineOptions, done: Function) {
   // defaults
   options = options || <engineOptions>{};
diff --git a/modules/angular2-express-engine/tsconfig.json b/modules/express-engine/tsconfig.json
similarity index 100%
rename from modules/angular2-express-engine/tsconfig.json
rename to modules/express-engine/tsconfig.json
diff --git a/modules/angular2-grunt-prerender/.gitignore b/modules/grunt-prerender/.gitignore
similarity index 100%
rename from modules/angular2-grunt-prerender/.gitignore
rename to modules/grunt-prerender/.gitignore
diff --git a/modules/angular2-grunt-prerender/.jshintrc b/modules/grunt-prerender/.jshintrc
similarity index 100%
rename from modules/angular2-grunt-prerender/.jshintrc
rename to modules/grunt-prerender/.jshintrc
diff --git a/modules/angular2-grunt-prerender/LICENSE-MIT b/modules/grunt-prerender/LICENSE-MIT
similarity index 100%
rename from modules/angular2-grunt-prerender/LICENSE-MIT
rename to modules/grunt-prerender/LICENSE-MIT
diff --git a/modules/angular2-grunt-prerender/index.ts b/modules/grunt-prerender/index.ts
similarity index 100%
rename from modules/angular2-grunt-prerender/index.ts
rename to modules/grunt-prerender/index.ts
diff --git a/modules/angular2-grunt-prerender/package.json b/modules/grunt-prerender/package.json
similarity index 100%
rename from modules/angular2-grunt-prerender/package.json
rename to modules/grunt-prerender/package.json
diff --git a/modules/angular2-grunt-prerender/src/prerender.ts b/modules/grunt-prerender/src/prerender.ts
similarity index 100%
rename from modules/angular2-grunt-prerender/src/prerender.ts
rename to modules/grunt-prerender/src/prerender.ts
diff --git a/modules/angular2-grunt-prerender/tsconfig.json b/modules/grunt-prerender/tsconfig.json
similarity index 100%
rename from modules/angular2-grunt-prerender/tsconfig.json
rename to modules/grunt-prerender/tsconfig.json
diff --git a/modules/angular2-gulp-prerender/index.js b/modules/gulp-prerender/index.js
similarity index 100%
rename from modules/angular2-gulp-prerender/index.js
rename to modules/gulp-prerender/index.js
diff --git a/modules/gulp-prerender/index.ts b/modules/gulp-prerender/index.ts
new file mode 100644
index 000000000..fa347b3ca
--- /dev/null
+++ b/modules/gulp-prerender/index.ts
@@ -0,0 +1,4 @@
+import * as Prerender from './src/prerender';
+
+export * from './src/prerender';
+export default Prerender;
diff --git a/modules/angular2-gulp-prerender/package.json b/modules/gulp-prerender/package.json
similarity index 100%
rename from modules/angular2-gulp-prerender/package.json
rename to modules/gulp-prerender/package.json
diff --git a/modules/angular2-gulp-prerender/src/prerender.ts b/modules/gulp-prerender/src/prerender.ts
similarity index 100%
rename from modules/angular2-gulp-prerender/src/prerender.ts
rename to modules/gulp-prerender/src/prerender.ts
diff --git a/modules/angular2-gulp-prerender/tsconfig.json b/modules/gulp-prerender/tsconfig.json
similarity index 100%
rename from modules/angular2-gulp-prerender/tsconfig.json
rename to modules/gulp-prerender/tsconfig.json
diff --git a/modules/angular2-hapi-engine/angular2-hapi-engine.d.ts b/modules/hapi-engine/angular2-hapi-engine.d.ts
similarity index 100%
rename from modules/angular2-hapi-engine/angular2-hapi-engine.d.ts
rename to modules/hapi-engine/angular2-hapi-engine.d.ts
diff --git a/modules/angular2-hapi-engine/index.ts b/modules/hapi-engine/index.ts
similarity index 100%
rename from modules/angular2-hapi-engine/index.ts
rename to modules/hapi-engine/index.ts
diff --git a/modules/angular2-hapi-engine/package.json b/modules/hapi-engine/package.json
similarity index 100%
rename from modules/angular2-hapi-engine/package.json
rename to modules/hapi-engine/package.json
diff --git a/modules/angular2-hapi-engine/src/engine.ts b/modules/hapi-engine/src/engine.ts
similarity index 100%
rename from modules/angular2-hapi-engine/src/engine.ts
rename to modules/hapi-engine/src/engine.ts
diff --git a/modules/angular2-hapi-engine/tsconfig.json b/modules/hapi-engine/tsconfig.json
similarity index 100%
rename from modules/angular2-hapi-engine/tsconfig.json
rename to modules/hapi-engine/tsconfig.json
diff --git a/modules/angular2-hapi-engine/typings.json b/modules/hapi-engine/typings.json
similarity index 100%
rename from modules/angular2-hapi-engine/typings.json
rename to modules/hapi-engine/typings.json
diff --git a/modules/universal/package.json b/modules/universal/package.json
index c94376aed..9332b3e78 100644
--- a/modules/universal/package.json
+++ b/modules/universal/package.json
@@ -13,7 +13,7 @@
   "typescript": {
     "definition": "universal.d.ts"
   },
-  "version": "0.55.4",
+  "version": "0.60.0",
   "description": "Universal (isomorphic) javascript support for Angular2",
   "homepage": "https://github.com/angular/universal",
   "license": "MIT",
@@ -35,8 +35,8 @@
     "url": "https://github.com/angular/universal/issues"
   },
   "devDependencies": {
-    "angular2-express-engine": "file:../angular2-express-engine",
-    "angular2-hapi-engine": "file:../angular2-hapi-engine",
+    "angular2-express-engine": "file:../express-engine",
+    "angular2-hapi-engine": "file:../hapi-engine",
     "preboot": "file:../preboot",
     "typescript": "^1.7.3"
   },
@@ -51,10 +51,10 @@
     "preboot": "~1.1.0",
     "angular2-express-engine": "*",
     "angular2-hapi-engine": "*",
-    "rxjs": "~5.0.0-beta.0",
-    "angular2": "2.0.0-beta.1 - 2.0.0-beta.7",
+    "rxjs": "~5.0.0-beta.2",
+    "angular2": "2.0.0-beta.7",
     "es6-shim": "^0.33.3",
-    "zone.js": "0.5.10 - 0.5.15",
+    "zone.js": "~0.5.15",
     "css": "^2.2.1",
     "parse5": "^1.5.0"
   }
diff --git a/modules/angular2-webpack-prerender/index.ts b/modules/webpack-prerender/index.ts
similarity index 100%
rename from modules/angular2-webpack-prerender/index.ts
rename to modules/webpack-prerender/index.ts
diff --git a/modules/angular2-webpack-prerender/package.json b/modules/webpack-prerender/package.json
similarity index 100%
rename from modules/angular2-webpack-prerender/package.json
rename to modules/webpack-prerender/package.json
diff --git a/modules/angular2-webpack-prerender/src/prerender.ts b/modules/webpack-prerender/src/prerender.ts
similarity index 100%
rename from modules/angular2-webpack-prerender/src/prerender.ts
rename to modules/webpack-prerender/src/prerender.ts
diff --git a/modules/angular2-webpack-prerender/tsconfig.json b/modules/webpack-prerender/tsconfig.json
similarity index 100%
rename from modules/angular2-webpack-prerender/tsconfig.json
rename to modules/webpack-prerender/tsconfig.json
diff --git a/package.json b/package.json
index 53838c95d..7e676b0c0 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
     "remove-ng2-types": "rimraf node_modules/angular2/typings node_modules/angular2/bundles/typings node_modules/angular2/manual_typings node_modules/angular2/ts/manual_typings node_modules/angular2/ts/typings",
     "remove-dist": "rimraf dist modules/**/dist !node_modules/**/*",
     "remove-tsd-typing": "rimraf ./tsd_typings",
-    "remove-local-modules": "rimraf node_modules/preboot node_modules/angular2-universal-preview node_modules/angular2-universal node_modules/angular2-express-engine",
+    "remove-local-modules": "rimraf node_modules/preboot node_modules/angular2-universal-preview node_modules/angular2-universal node_modules/angular2-express-engine node_modules/angular2-hapi-engine",
     "update": "npm run remove-local-modules && npm install",
     "tsd": "tsd reinstall && tsd link",
     "postinstall": "npm run tsd && npm run remove-ng2-types && npm run build && npm run webdriver-update"
@@ -92,10 +92,11 @@
   },
   "dependencies": {
     "angular2": "2.0.0-beta.7",
-    "angular2-express-engine": "file:modules/angular2-express-engine",
-    "angular2-hapi-engine": "file:modules/angular2-hapi-engine",
+    "angular2-express-engine": "file:modules/express-engine",
+    "angular2-hapi-engine": "file:modules/hapi-engine",
     "angular2-universal": "file:modules/universal",
     "angular2-universal-preview": "file:modules/universal",
+    "preboot": "file:modules/preboot",
     "browserify": "^11.0.0",
     "css": "^2.2.1",
     "es6-shim": "^0.33.8",
@@ -109,7 +110,6 @@
     "lodash": "^3.10.1",
     "nocycle": "^1.1.1",
     "parse5": "^1.5.0",
-    "preboot": "file:modules/preboot",
     "q": "^1.4.1",
     "reflect-metadata": "0.1.2",
     "require-dir": "^0.3.0",
diff --git a/tsconfig.json b/tsconfig.json
index ebf99cce5..3613eefb2 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -17,14 +17,14 @@
     "node_modules/angular2/typings",
     "node_modules/angular2/manual_typings",
     "node_modules/angular2/bundles/typings",
-    "modules/angular2-express-engine/dist",
-    "modules/angular2-express-engine/node_modules",
-    "modules/angular2-gulp-prerender/node_modules",
-    "modules/angular2-gulp-prerender/dist",
-    "modules/angular2-grunt-prerender/node_modules",
-    "modules/angular2-grunt-prerender/tasks",
-    "modules/angular2-webpack-prerender/node_modules",
-    "modules/angular2-webpack-prerender/dist",
+    "modules/express-engine/dist",
+    "modules/express-engine/node_modules",
+    "modules/gulp-prerender/node_modules",
+    "modules/gulp-prerender/dist",
+    "modules/grunt-prerender/node_modules",
+    "modules/grunt-prerender/tasks",
+    "modules/webpack-prerender/node_modules",
+    "modules/webpack-prerender/dist",
     "modules/universal/dist",
     "modules/universal/node_modules",
     "modules/preboot/dist",