diff --git a/.versions b/.versions
index fb30cb9..11148e6 100644
--- a/.versions
+++ b/.versions
@@ -6,7 +6,7 @@ ecmascript-runtime@0.7.0
 ecmascript-runtime-client@0.10.0
 ecmascript-runtime-server@0.9.0
 fetch@0.1.1
-frozeman:build-client@0.4.3
+frozeman:build-client@1.0.0
 inter-process-messaging@0.1.1
 meteor@1.9.3
 minifier-css@1.5.0
diff --git a/README.md b/README.md
index 6f94837..a068a8b 100644
--- a/README.md
+++ b/README.md
@@ -4,23 +4,29 @@
 
 # Meteor Build Client
 
-This tool builds and bundles the client part of a Meteor app with a simple index.html,
-so it can be hosted on any server or even loaded via the `file://` protocol.
+This tool builds and bundles the client part of a Meteor app with a simple `index.html`, so it can be hosted on any server or even loaded via the `file://` protocol.
 
 ## Installation
 
-    $ [sudo] npm install -g meteor-build-client
+```shell
+npm install -g meteor-build-client
+```
 
 ## Usage
 
-    // cd into your meteor app
-    $ cd myApp
+```shell
+// cd into your meteor app
+cd /my/app
+
+// run meteor-build-client
+meteor-build-client ../output/directory
+```
 
-    // run meteor-build-client
-    $ meteor-build-client ../myOutputFolder
+## Important notes:
 
-**Warning** the content of the output folder will be deleted before building the new output! So dont do things like
-`$ meteor-build-client /home`!
+- __Warning__: the content of the output folder will be deleted before building the new output! So don't do things like `meteor-build-client /home`!
+- __Do not use dynamic imports!__ e.g. `import('/eager/file');`;
+- By default this package link __legacy__ ES5 bundle build.
 
 ### Output
 
@@ -33,70 +39,86 @@ The content of the output folder could look as follows:
 
 For a list of options see:
 
-    $ meteor-build-client --help
+```shell
+meteor-build-client --help
+```
 
 ### Passing a settings.json
 
 You can pass an additional settings file using the `--settings` or `-s` option:
 
-    $ meteor-build-client ../myOutputFolder -s ../settings.json
+```shell
+meteor-build-client ../output/directory -s ../settings.json
+```
 
 **Note** Only the `public` property of that JSON file will be add to the `Meteor.settings` property.
 
-
 ### App URL
 
 Additionally you can set the `ROOT_URL` of your app using the `--url` or `-u` option:
 
-    $ meteor-build-client ../myOutputFolder -u http://myserver.com
-
-If you pass `"default"`, your app will try to connect to the server where the application was served from.
+```shell
+meteor-build-client ../output/directory -u https://myserver.com
+```
 
-If this option was not set, it will set the server to `""` (empty string) and will add a `Meteor.disconnect()` after Meteor was loaded.
+If you pass `"default"`, your app will try to connect to the server where the application was served from. If this option was not set, it will set the server to `""` (empty string) and will add a `Meteor.disconnect()` after Meteor was loaded.
 
 ### Absolute or relative paths
 
-If you want to be able to start you app by simply opening the index.html (using the `file://` protocol),
-you need to link your files relative. You can do this by setting the `--path` or `-p` option:
+If you want to be able to start you app by simply opening the index.html (using the `file://` protocol), you need to link your files relative. You can do this by setting the `--path` or `-p` option:
 
-    $ meteor-build-client ../myOutputFolder -p ""
+```shell
+meteor-build-client ../output/directory -p ""
+```
 
 The default path value is `"/"`.
 
 *Note* When set a path value, it will also replace this path in you Meteor CSS file, so that fonts etc link correctly.
 
-
 ### Using your own build folder
 
-If you want to use your own build folder by running `meteor build` yourself, specify the `--usebuild` flag and meteor-build-client will not run the meteor build command for you. It will expect that the build folder be located up a directory from the app folder (A sibling to /app, Meteor's default location). 
+To use pre-build Meteor application, built using `meteor build` command manually, specify the `--usebuild <path-to-build>` flag and `meteor-build-client` will not run the `meteor build` command.
 
-### Using custom templates
+### Recommended packages for client-only build
 
-If you want to provide a custom template for the initial HTML provide an HTML file with the `--template` or `-t` option:
+If you're building server-less standalone web application we recommend to replace `meteor-base` with `meteor` and `webapp` packages.
 
-    $ meteor-build-client ../myOutputFolder -t ../myTemplate.html
+```diff
+@@ .meteor/packages
+- meteor-base
++ meteor
++ webapp
+```
 
-The template file need to contain the following placholders: `{{> head}}`, `{{> css}}` and `{{> scripts}}`.
-The following example adds a simple loading text to the initial HTML file (Your app should later take care of removing the loading text):
+### Template
+
+Following Meteor's recommended usage of `<meteor-bundled-css />` and `<meteor-bundled-js/>` this tags will be replaced with links to generated CSS and JS files respectively. Optionally, use `{{url-to-meteor-bundled-css}}` as a placeholder for URL to generated CSS file. We encourage to use `static-html` (*for non-Blaze projects*) or `blaze-html-templates` (*for Blaze projects*) package for creating bare HTML template in your app, minimal example:
+
+```html
+<!-- client/head.html -->
+<head>
+  <meta charset="UTF-8">
+  <!-- recommended "fragment" to mark as JS-powered website for search engines -->
+  <meta name="fragment" content="!">
+
+  <title>My Meteor App</title>
+
+  <!-- recommended "preload" for CSS bundle file -->
+  <link rel="preload" href="{{url-to-meteor-bundled-css}}" as="style">
+  <meteor-bundled-css />
+</head>
+```
+
+Where `<meteor-bundled-css />` will be replaced with `<link />` element to generated CSS file(s) and `{{url-to-meteor-bundled-css}}` will be replaced with URL to generated CSS file.
 
 ```html
-<!DOCTYPE html>
-<html>
-    <head>
-        {{> head}}
-        <link rel="stylesheet" type="text/css" href="/loadingScreen.css">
-    </head>
-    <body>
-        <h1>Loading...</h1>
-
-        {{> css}}
-        {{> scripts}}
-    </body>
-</html>
+<!-- client/body.html -->
+<body>
+  <meteor-bundled-js />
+</body>
 ```
-By linking a file from your `public` folder (e.g. `loadingScreen.css`) and moving the `{{> css}}` and `{{> scripts}}` placeholder to the end of the `<body>` tag,
-you can simply style your loading screen.
-Because the small CSS file (`loadingScreen.css`) and the body content will be loaded *before* the Meteor app script, the the user sees the nice Loading text.
+
+Where `<meteor-bundled-js />` will be replaced with `<script />` element(s) to generated JS file(s).
 
 ## Connecting to a Meteor server
 
@@ -104,46 +126,52 @@ In order to connect to a Meteor servers, create DDP connection by using `DDP.con
 
 ```js
 // This Should be in both server and client in a lib folder
-DDPConnection = (Meteor.isClient) ? DDP.connect("http://localhost:3000/") : {};
+DDPConnection = (Meteor.isClient) ? DDP.connect('http://localhost:3000/') : {};
 
 // When creating a new collection on the client use:
 if(Meteor.isClient) {
-    posts = new Mongo.Collection("posts", DDPConnection);
+  posts = new Mongo.Collection('posts', DDPConnection);
 
-    // set the new DDP connection to all internal packages, which require one
-    Meteor.connection = DDPConnection;
-    Accounts.connection = Meteor.connection;
-    Meteor.users = new Mongo.Collection('users');
-    Meteor.connection.subscribe('users');
+  // set the new DDP connection to all internal packages, which require one
+  Meteor.connection = DDPConnection;
+  Accounts.connection = Meteor.connection;
+  Meteor.users = new Mongo.Collection('users');
+  Meteor.connection.subscribe('users');
 
-    // And then you subscribe like this:
-    DDPConnection.subscribe("mySubscription");   
+  // And then you subscribe like this:
+  DDPConnection.subscribe('mySubscription');
 }
 ```
 
 ## Making routing work on a non Meteor server
 
-To be able to open URLs and let them be handled by the client side JavaScript, you need to rewrite URLs on the server side, so they point always to your index.html.
+To be able to open URLs and let them be handled by the client side JavaScript, you need to rewrite URLs on the server side, so they point always to `index.html`
+
+### Apache
 
 For apache a `.htaccess` with `mod_rewrite` could look as follow:
+
 ```bash
 <IfModule mod_rewrite.c>
-    RewriteEngine On
-    RewriteBase /
-
-    # Always pass through requests for files that exist
-    # Per http://stackoverflow.com/a/7090026/223225
-    RewriteCond %{REQUEST_FILENAME} -f [OR]
-    RewriteCond %{REQUEST_FILENAME} -d
-    RewriteRule . - [L]
-
-    # Send all other requests to index.html where the JavaScript router can take over
-    # and render the requested route
-    RewriteRule ^.*$ index.html [L]
+  RewriteEngine On
+  RewriteBase /
+
+  # Always pass through requests for files that exist
+  # Per http://stackoverflow.com/a/7090026/223225
+  RewriteCond %{REQUEST_FILENAME} -f [OR]
+  RewriteCond %{REQUEST_FILENAME} -d
+  RewriteRule . - [L]
+
+  # Send all other requests to index.html where the JavaScript router can take over
+  # and render the requested route
+  RewriteRule ^.*$ index.html [L]
 </IfModule>
 ```
 
-For nginx:
+### nginx:
+
+Use `try_files` and `error_page` to redirect all requests to non-existent files to `index.html`
+
 ```conf
 server {
   listen 80;
diff --git a/helpers.js b/helpers.js
new file mode 100644
index 0000000..cc9438b
--- /dev/null
+++ b/helpers.js
@@ -0,0 +1,5 @@
+module.exports = {
+  print(...args) {
+    console.info.apply(console, args);
+  }
+};
diff --git a/index.html b/index.html
index 7432677..10f072e 100644
--- a/index.html
+++ b/index.html
@@ -1,10 +1,2 @@
 <!DOCTYPE html>
-<html>
-    <head>
-        {{> css}}
-        {{> scripts}}
-        {{> head}}
-    </head>
-    <body>
-    </body>
-</html>
\ No newline at end of file
+<html><head>{{> head}}</head><body>{{> body}}</body></html>
\ No newline at end of file
diff --git a/main.js b/main.js
index f11b506..3533f85 100755
--- a/main.js
+++ b/main.js
@@ -1,94 +1,83 @@
 #!/usr/bin/env node
 
-var fs = require('fs');
+const { print } = require('./helpers.js');
+const fs = require('fs-extra');
+const pathLib = require('path');
 
 // CLI Options
-var program = require('commander');
+const program = require('commander');
 
-var Q = require('bluebird');
-
-var packageJson = require('./package.json');
+const Q = require('bluebird');
+const packageJson = require('./package.json');
 
 // VARIABLES
-var argPath = process.argv[2];
-var meteor = require('./meteor.js');
+const argPath = process.argv[2];
+const meteor = require('./meteor.js');
 
 program
-    .version(packageJson.version)
-    .usage('<output path> [options]')
-    .option('-p, --path <path>', 'The path used to link the files, default is "/", pass "" to link relative to the index.html.')
-    .option('-t, --template <file path>', 'Provide a custom index.html template. Use {{> head}}, {{> css}} and {{> scripts}} to place the meteor resources.')
-    .option('-s, --settings <settings.json>', 'Set optional data for Meteor.settings in your application.')
-    .option('-u, --url <url>', 'The Root URL of your app. If "default", Meteor will try to connect to the Server where it was served from. Default is: "" (empty string)')
-    .option('-b, --usebuild', 'If this flag is present, meteor-build-client will skip the `meteor build` step and opt for using your manually built ../build folder.')
-    .option('-D, --debug', 'Build in debug mode (don\'t minify, etc)')
-    .option('-v, --verbose', 'Add optional verbose option.')
-    .option('-hide, --hideSpinner', 'Hide spinner on command while executing within the option. Default is: true');
-    // .option('-d, --ddp <url>', 'The URL of your Meteor DDP server, e.g. "ddp+sockjs://ddp.myapp.com/sockjs". If you don\'t add any it will also add call "Meteor.disconnect();" to prevent the app from conneting.');
+  .version(packageJson.version)
+  .usage('<output path> [options]')
+  .option('-p, --path <path>', 'The path used to link the files, default is "/", pass "" to link relative to the index.html.')
+  .option('-t, --template <file path>', 'Provide a custom index.html template. Use {{> head}}, {{> css}} and {{> scripts}} to place the meteor resources.')
+  .option('-s, --settings <settings.json>', 'Set optional data for Meteor.settings in your application.')
+  .option('-u, --url <url>', 'The Root URL of your app. If "default", Meteor will try to connect to the Server where it was served from. Default is: "" (empty string)')
+  .option('-b, --usebuild <path>', 'If this flag is present, meteor-build-client will skip the `meteor build` step and opt for using your manually built <path> or ../build folder by default.', false)
+  .option('-D, --debug', 'Build in debug mode (don\'t minify, etc)')
+  .option('-v, --verbose', 'Add optional verbose option.')
+  .option('-d, --ddp <url>', 'The URL of your Meteor DDP server, e.g. "ddp+sockjs://ddp.myapp.com/sockjs". If you don\'t add any it will also add call "Meteor.disconnect();" to prevent the app from conneting.');
 
 program.on('--help', function(){
-    console.log('  Warning:');
-    console.log('');
-    console.log('  The content of the output folder will be deleted before building the new output!');
-    console.log('  Don\'t do something like: meteor-build-client /home !');
-    console.log('');
+  print('  Warning: \r\n');
+  print('  The content of the output folder will be deleted before building the new output!');
+  print('  Don\'t do something like: meteor-build-client /home !\r\n');
 });
 
 program.parse(process.argv);
 
 
 Q.try(function() {
-    if (!argPath) {
-        throw new Error("You need to provide a path for the build output, for example:\n\n$ meteor-build-client myBuildFolder");
-    }
+  if (!argPath) {
+    throw new Error('You need to provide a path for the build output, for example:\n\n$ meteor-build-client myBuildFolder');
+  }
 
-    if (!fs.lstatSync('./.meteor').isDirectory()) {
-        throw new Error('You\'re not in a Meteor app folder or inside a sub folder of your app.');
-    }
+  if (!fs.lstatSync('./.meteor').isDirectory()) {
+    throw new Error('You\'re not in a Meteor app folder or inside a sub folder of your app.');
+  }
 
-    if(program.template && !fs.lstatSync(program.template).isFile()) {
-        throw new Error('The template file "'+ program.template +'" doesn\'t exist or is not a valid template file');
-    }
-})
-.then(function() {
+  if(program.template && !fs.lstatSync(program.template).isFile()) {
+    throw new Error(`The template file "${program.template}" doesn't exist or is not a valid template file`);
+  }
+}).then(function() {
   /**
    * Allow the user to decide whether or not they want to use the
    * meteor-build-client build or their own
-  */
+   */
+  if(program.usebuild && fs.lstatSync(program.usebuild).isDirectory()) {
+    print(`Using ${program.usebuild}`);
+    print('Generating the index.html...');
 
-  if(program.usebuild && fs.lstatSync('../build').isDirectory()){
-    console.log('Using ../build');
-    console.log('Generating the index.html...');
-
-    return meteor.move();
-  }else{
-    console.log('Bundling Meteor app...');
-
-    return meteor.build(program)
-      .then(function(){
-        console.log('Generating the index.html...');
-
-        return meteor.move();
-      });
+    return meteor.move(pathLib.resolve(program.usebuild));
+  }
+  print('Bundling Meteor app...');
+
+  return meteor.build(program).then(function(){
+    print('Generating the index.html...');
+    return meteor.move(pathLib.resolve(argPath));
+  });
+}).then(function() {
+  return meteor.addIndexFile(program);
+}).then(function() {
+  return meteor.cleanUp(program);
+}).then(function() {
+  print('Done!');
+  print('-----');
+  print(`You can find webapp files in "${pathLib.resolve(argPath)}".`);
+}).catch(function(err) {
+  if (err.stderr || err.stdout) {
+    print('CAUGHT ERRORS:', err.stdout, err.stderr);
+  } else {
+    print('CAUGHT ERROR:', err);
   }
-})
-.then(function() {
-    return meteor.addIndexFile(program);
-})
-.then(function() {
-    return meteor.cleanUp();
-})
-.then(function() {
-    console.log('Done!');
-    console.log('-----');
-    console.log('You can find your files in "'+ require('path').resolve(argPath) +'".');
-})
-.catch(function(err) {
-    if (err.stderr || err.stdout) {
-        console.error(err.stdout, err.stderr);
-    } else {
-        console.error(err);
-    }
 
-    process.exit(-1);
+  process.exit(-1);
 });
diff --git a/meteor.js b/meteor.js
index fa0013a..90575de 100644
--- a/meteor.js
+++ b/meteor.js
@@ -1,244 +1,339 @@
 // MODULES
-var fs = require('fs');
-var path = require('path');
-var _ = require('underscore');
-var Q = require('bluebird');
-var spinner = require('simple-spinner');
-var spawn = require('buffered-spawn');
+const { print } = require('./helpers.js');
+const fs = require('fs-extra');
+const path = require('path');
+const _ = require('underscore');
+const Q = require('bluebird');
+const spawn = require('buffered-spawn');
 
 Q.promisifyAll(fs);
 
 // VARIABLES
-var argPath = process.argv[2],
-    basePath = './',
-    buildPath = path.resolve(argPath),
-    bundleName = path.basename(path.resolve(basePath));
+const argPath = process.argv[2];
+const basePath = './';
+const outputPath = path.resolve(argPath);
+let buildPath = path.resolve(argPath);
+// const bundleName = path.basename(path.resolve(basePath));
 
-// execute shell scripts
-var execute = function(command, name) {
-    return new Q(function(resolve, reject) {
-        //spinner.start();
-        
-        let cmd = spawn(command[0], command.slice(1), {
-            cwd: basePath
-        },function(err, stdout, stderr) {
-            //spinner.stop();
-
-            if (err){
-                console.log(err.message);
-                
-                reject(err);
-            } else {
-                resolve({
-                    stdout: stdout,
-                    stderr: stderr,
-                });
-            }
-        });        
-        cmd.stdout.pipe(process.stdout);
-        cmd.stderr.pipe(process.stderr);
-    });
+const RE = {
+  scripts: {
+    template: /{{ *> *scripts *}}/,
+    tag: /<meteor-bundled-js *\/>/
+  },
+  styles: {
+    template: /{{ *> *css *}}/,
+    tag: /<meteor-bundled-css *\/>/,
+    url: /{{ *url-to-meteor-bundled-css *}}/
+  },
+  templates: {
+    head: /{{ *> *head *}}/,
+    body: /{{ *> *body *}}/
+  },
+  fileName: {
+    js: /^[a-z0-9]{40}\.js$/,
+    css: /^[a-z0-9]{40}\.css$/
+  },
+  path: {
+    app: /^app\//
+  }
 };
 
-var deleteFolderRecursive = function(path) {
-    var files = [];
-    if( fs.existsSync(path) ) {
-        files = fs.readdirSync(path);
-        files.forEach(function(file,index){
-            var curPath = path + "/" + file;
-            if(fs.lstatSync(curPath).isDirectory()) { // recurse
-                deleteFolderRecursive(curPath);
-            } else { // delete file
-                fs.unlinkSync(curPath);
-            }
+// execute shell scripts
+const execute = (command) => {
+  return new Q(function(resolve, reject) {
+    const cmd = spawn(command[0], command.slice(1), {
+      cwd: basePath
+    }, function(err, stdout, stderr) {
+      if (err){
+        print('[execute] ERROR:', err.message);
+        reject(err);
+      } else {
+        resolve({
+          stdout: stdout,
+          stderr: stderr,
         });
-        fs.rmdirSync(path);
-    }
+      }
+    });
+    cmd.stdout.pipe(process.stdout);
+    cmd.stderr.pipe(process.stderr);
+  });
 };
 
+const deleteFolderRecursive = (_path) => {
+  let files = [];
+  if(fs.existsSync(_path)) {
+    files = fs.readdirSync(_path);
+    files.forEach((file) => {
+      const curPath = `${_path}/${file}`;
+      if (fs.lstatSync(curPath).isDirectory()) { // recurse
+        deleteFolderRecursive(curPath);
+      } else { // delete file
+        fs.unlinkSync(curPath);
+      }
+    });
+    fs.rmdirSync(_path);
+  }
+};
 
 module.exports = {
-    build: function(program){
-        return Q.try(function() {
-            // remove the bundle folder
-            deleteFolderRecursive(buildPath);
-
-            var command = ['meteor', 'build', argPath, '--directory'];
-            if (program.debug) {
-                command.push('--debug');
-            }
-            if (program.verbose) {
-                command.push('--verbose');
-            }
+  build(program){
+    return Q.try(function() {
+      deleteFolderRecursive(buildPath);
 
-            if (program.url) {
-                command.push('--server');
-                command.push(program.url);
-            }
-            if (program.debug) {
-                console.log(command.join(' '));
-            }
+      var command = ['meteor', 'build', argPath, '--directory'];
+      if (program.debug) {
+        command.push('--debug');
+      }
 
-            if (program.hideSpinner && program.hideSpinner) {
-                spinner.change_sequence([' '])
-            }
+      if (program.verbose) {
+        command.push('--verbose');
+      }
 
-            return execute(command, 'build the app, are you in your meteor apps folder?');                        
-        });
-    },
-    move: function(){
-        return Q.try(function() {
-            try {
-                _.each([
-                    '/bundle/programs/web.browser',
-                    '/bundle/programs/web.browser/app'
-                ], function(givenPath){
-                    var clientPath = path.join(buildPath, givenPath);
-                    var rootFolder = fs.readdirSync(clientPath);
-                    rootFolder = _.without(rootFolder, 'app');
-
-                    rootFolder.forEach( function (file) {
-                        var curSource = path.join(clientPath, file);
-
-                        fs.renameSync(path.join(clientPath, file), path.join(buildPath, file));
-                    });
-                });
-            } catch(e) {
-                // do nothing
-            }            
+      if (program.url) {
+        command.push('--server');
+        command.push(program.url);
+      }
+
+      if (program.debug) {
+        print('[build()] DEBUG:', command.join(' '));
+      }
+
+      return execute(command, 'build the app, are you in your meteor apps folder?');
+    });
+  },
+  move(_path){
+    buildPath = _path;
+    return Q.try(function() {
+      try {
+        const modernDirs = ['/bundle/programs/web.browser', '/bundle/programs/web.browser/app'];
+        const legacyDirs = ['/bundle/programs/web.browser.legacy', '/bundle/programs/web.browser.legacy/app'];
+        const dataPaths = fs.lstatSync(path.join(buildPath, legacyDirs[0])).isDirectory() ? legacyDirs : modernDirs;
+
+        _.each(dataPaths, (givenPath) => {
+          const clientPath = path.join(buildPath, givenPath);
+          let rootFolder = fs.readdirSync(clientPath);
+          rootFolder = _.without(rootFolder, 'app');
+          rootFolder.forEach((file) => {
+            fs.copySync(path.join(clientPath, file), path.join(outputPath, file));
+          });
         });
-    },
-    addIndexFile: function(program) {
-        return Q.try(function(resolve, reject) {
-            var starJson = require(path.resolve(buildPath) + '/bundle/star.json');
-            var settingsJson = program.settings ? require(path.resolve(program.settings)) : {};
-
-            var content = fs.readFileSync(program.template || path.resolve(__dirname, 'index.html'), {encoding: 'utf-8'});
-            var head;
-            try{
-                head = fs.readFileSync(path.join(buildPath, 'head.html'), {encoding: 'utf8'});
-            } catch(e) {
-                head = '<meta charset="utf-8" /> '; // provide default encoding
-                console.log('No <head> found in Meteor app...');
-            }
-            // ADD HEAD
-            content = content.replace(/{{ *> *head *}}/,head);
-
-            // get the css and js files
-            var files = {css:[],js:[]};
-            _.each(fs.readdirSync(buildPath), function(file){
-                if(/^[a-z0-9]{40}\.css$/.test(file))
-                    files['css'].push(file);
-                if(/^[a-z0-9]{40}\.js$/.test(file))
-                    files['js'].push(file);
-            });
+      } catch(e) {
+        print('[move()] Exception:', e);
+        // do nothing
+      }
+    });
+  },
+  addIndexFile(program) {
+    return Q.try(function() {
+      const starJson = require(`${path.resolve(buildPath)}/bundle/star.json`);
+      const settingsJson = program.settings ? require(path.resolve(program.settings)) : {};
 
-            // --debug case
-            if (program.debug) {
-                var json = fs.readFileSync(path.resolve(path.join(buildPath, 'program.json')), {encoding: 'utf-8'});
-                var prog = JSON.parse(json);
-
-                _.each(prog.manifest, function(item) {
-                    if (item.type == 'js' && item.url) {
-                        files['js'].push(item.path.replace(/^app\//, '') + '?hash=' + item.hash);
-                    }
-                    if (item.type == 'css' && item.url) {
-                        // for css file cases, do not append hash.
-                        files['css'].push(item.path.replace(/^app\//, ''));
-                    }
-                });
-            }
+      let content = fs.readFileSync(program.template || path.resolve(__dirname, 'index.html'), {encoding: 'utf-8'});
+      let body = '';
+      let head = '<meta charset="UTF-8">';
 
-            // MAKE PATHS ABSOLUTE
-            if(_.isString(program.path)) {
-
-                // fix paths in the CSS file
-                if(!_.isEmpty(files['css'])) {
-                    _.each(files['css'], function(css, i) {
-                        var cssFile = fs.readFileSync(path.join(buildPath, css), {encoding: 'utf8'});
-                        cssFile = cssFile.replace(/url\(\'\//g, 'url(\''+ program.path).replace(/url\(\//g, 'url('+ program.path);
-                        fs.unlinkSync(path.join(buildPath, css));
-                        fs.writeFileSync(path.join(buildPath, css), cssFile, {encoding: 'utf8'});
-
-                        files['css'][i] = program.path + css;
-                    })
-                }
-                if(!_.isEmpty(files['js'])) {
-                    _.each(files['js'], function(jsFile, i) {
-                        files['js'][i] = program.path + jsFile;
-                    })
-                }
-            } else {
-                if(!_.isEmpty(files['css'])) {
-                    _.each(files['css'], function(cssFile, i) {
-                        files['css'][i] = '/'+ cssFile;
-                    })
-                }
-                if(!_.isEmpty(files['js'])) {
-                    _.each(files['js'], function(jsFile, i) {
-                        files['js'][i] = '/'+ jsFile;
-                    })
-                }
-            }
+      try{
+        head = fs.readFileSync(path.join(outputPath, 'head.html'), {encoding: 'utf8'});
+      } catch(e) {
+        if (program.debug) {
+          print('FYI: No <head> found in Meteor app...');
+        }
+      }
 
+      try{
+        body = fs.readFileSync(path.join(outputPath, 'body.html'), {encoding: 'utf8'});
+      } catch(e) {
+        if (program.debug) {
+          print('FYI: No <body> found in Meteor app...');
+        }
+      }
 
-            // ADD CSS
-            var css = [];
-            _.each(files['css'], function(cssFile) {
-                css.push('<link rel="stylesheet" type="text/css" class="__meteor-css__" href="'+ cssFile +'?meteor_css_resource=true">');
-            })
-            css = css.join("\n        ");
-            content = content.replace(/{{ *> *css *}}/, css);
-
-            // ADD the SCRIPT files
-            var scripts = ['__meteor_runtime_config__'];
-            _.each(files['js'], function(jsFile) {
-                scripts.push('<script type="text/javascript" src="'+ jsFile +'"></script>');
-            })
-            scripts = scripts.join("\n        ");
-
-            // add the meteor runtime config
-            settings = {
-                'meteorRelease': starJson.meteorRelease,
-                'ROOT_URL_PATH_PREFIX': '',
-                meteorEnv: { NODE_ENV: 'production' },
-                autoupdate: { versions : {}},
-                // 'DDP_DEFAULT_CONNECTION_URL': program.url || '', // will reload infinite if Meteor.disconnect is not called
-                // 'appId': process.env.APP_ID || null,
-                // 'autoupdateVersion': null, // "ecf7fcc2e3d4696ea099fdd287dfa56068a692ec"
-                // 'autoupdateVersionRefreshable': null, // "c5600e68d4f2f5b920340f777e3bfc4297127d6e"
-                // 'autoupdateVersionCordova': null
-            };
-            // on url = "default", we dont set the ROOT_URL, so Meteor chooses the app serving url for its DDP connection
-            if(program.url !== 'default')
-                settings.ROOT_URL = program.url || '';
-
-
-            if(settingsJson.public)
-                settings.PUBLIC_SETTINGS = settingsJson.public;
-
-            scripts = scripts.replace('__meteor_runtime_config__', '<script type="text/javascript">__meteor_runtime_config__ = JSON.parse(decodeURIComponent("'+encodeURIComponent(JSON.stringify(settings))+'"));</script>');
-            
-            // add Meteor.disconnect() when no server is given
-            if(!program.url)
-                scripts += "\n"+'        <script type="text/javascript">Meteor.disconnect();</script>';
-
-            content = content.replace(/{{ *> *scripts *}}/, scripts);
-
-            // write the index.html
-            return fs.writeFileAsync(path.join(buildPath, 'index.html'), content);
-        });
-    },
-    cleanUp: function(callback) {
-        return Q.try(function() {
-            // remove files
-            deleteFolderRecursive(path.join(buildPath, 'bundle'));
-            fs.unlinkSync(path.join(buildPath, 'program.json'));
-            try{
-                fs.unlinkSync(path.join(buildPath, 'head.html'));
-            } catch (e){
-                console.log("Didn't unlink head.html; doesn't exist.");
-            }            
+      // ADD HEAD
+      content = content.replace(RE.templates.head, head);
+      content = content.replace(RE.templates.body, body);
+
+      // get the css and js files
+      const files = {
+        css: [],
+        js: []
+      };
+
+      _.each(fs.readdirSync(outputPath), (file) => {
+        if (RE.fileName.js.test(file)) {
+          files.js.push(file);
+        } else if (RE.fileName.css.test(file)) {
+          files.css.push(file);
+        }
+      });
+
+      let primaryCSSfile = files.css[0];
+
+      // --debug case
+      if (program.debug) {
+        const json = fs.readFileSync(path.resolve(path.join(outputPath, 'program.json')), {encoding: 'utf-8'});
+        const prog = JSON.parse(json);
+
+        _.each(prog.manifest, (item) => {
+          if (item.type === 'js' && item.url) {
+            files.js.push(item.path.replace(RE.path.app, '') + '?hash=' + item.hash);
+          } else if (item.type === 'css' && item.url) {
+            // for css file cases, do not append hash.
+            files.css.push(item.path.replace(RE.path.app, ''));
+
+            if (item.url.includes('meteor_css_resource=true')) {
+              primaryCSSfile = item.path.replace(RE.path.app, '');
+            }
+          }
         });
-    }
-}
+
+        print('[DEBUG] Files:', files, {primaryCSSfile});
+      }
+
+      // MAKE PATHS ABSOLUTE
+      if(_.isString(program.path)) {
+        // fix paths in the CSS file
+        if(!_.isEmpty(files.css)) {
+          _.each(files.css, (css, i) =>  {
+            var cssFile = fs.readFileSync(path.join(outputPath, css), { encoding: 'utf8' });
+            cssFile = cssFile.replace(/url\(\'\//g, `url('${program.path}`).replace(/url\(\//g, `url(${program.path}`);
+            fs.unlinkSync(path.join(outputPath, css));
+            fs.writeFileSync(path.join(outputPath, css), cssFile, { encoding: 'utf8' });
+
+            files.css[i] = `${program.path}${css}`;
+          });
+        }
+
+        if(!_.isEmpty(files.js)) {
+          _.each(files.js, (jsFile, i) =>  {
+            files.js[i] = `${program.path}${jsFile}`;
+          });
+        }
+
+        if (primaryCSSfile) {
+          primaryCSSfile = `${program.path}${primaryCSSfile}`;
+        }
+      } else {
+        if(!_.isEmpty(files.css)) {
+          _.each(files.css, (cssFile, i) =>  {
+            files.css[i] = `/${cssFile}`;
+          });
+        }
+
+        if(!_.isEmpty(files.js)) {
+          _.each(files.js, (jsFile, i) =>  {
+            files.js[i] = `/${jsFile}`;
+          });
+        }
+
+        if (primaryCSSfile) {
+          primaryCSSfile = `/${primaryCSSfile}`;
+        }
+      }
+
+      // ADD CSS
+      var css = [];
+      _.each(files.css, (cssFile) => {
+        css.push(`<link rel="stylesheet" type="text/css" href="${cssFile}">`);
+      });
+      css = css.join('');
+
+      if (RE.styles.template.test(content)) {
+        content = content.replace(RE.styles.template, css);
+      } else if (RE.styles.tag.test(content)) {
+        content = content.replace(RE.styles.tag, css);
+      }
+
+      if (RE.styles.url.test(content) && primaryCSSfile) {
+        content = content.replace(RE.styles.url, primaryCSSfile);
+      }
+
+      // ADD the SCRIPT files
+      var scripts = ['__meteor_runtime_config__'];
+      _.each(files.js, (jsFile) => {
+        scripts.push(`<script type="text/javascript" src="${jsFile}"></script>`);
+      });
+      scripts = scripts.join('');
+
+      // add the meteor runtime config
+      const settings = {
+        'meteorRelease': starJson.meteorRelease,
+        'ROOT_URL_PATH_PREFIX': process.env.ROOT_URL_PATH_PREFIX || '',
+        meteorEnv: {
+          NODE_ENV: 'production'
+        },
+        autoupdate: { versions: {}},
+        // 'DDP_DEFAULT_CONNECTION_URL': program.url || '', // will reload infinite if Meteor.disconnect is not called
+        // 'appId': process.env.APP_ID || null,
+        // 'autoupdateVersion': null, // "ecf7fcc2e3d4696ea099fdd287dfa56068a692ec"
+        // 'autoupdateVersionRefreshable': null, // "c5600e68d4f2f5b920340f777e3bfc4297127d6e"
+        // 'autoupdateVersionCordova': null
+      };
+
+      // on url = "default", we dont set the ROOT_URL, so Meteor chooses the app serving url for its DDP connection
+      if (program.url !== 'default') {
+        settings.ROOT_URL = program.url || '';
+      }
+
+      if (settingsJson.public) {
+        settings.PUBLIC_SETTINGS = settingsJson.public;
+      }
+
+      scripts = scripts.replace('__meteor_runtime_config__', `<script type="text/javascript">__meteor_runtime_config__ = JSON.parse(decodeURIComponent("${encodeURIComponent(JSON.stringify(settings))}"));</script>`);
+
+      // add Meteor.disconnect() when no server is given
+      if (!program.url) {
+        scripts += '<script type="text/javascript">Meteor && Meteor.disconnect ? Meteor.disconnect() : void 0;</script>';
+      }
+
+      if (RE.scripts.template.test(content)) {
+        content = content.replace(RE.scripts.template, scripts);
+      } else if (RE.scripts.tag.test(content)) {
+        content = content.replace(RE.scripts.tag, scripts);
+      }
+
+      // write the index.html
+      return fs.writeFileAsync(path.join(outputPath, 'index.html'), content).then(() => {
+        if (!program.url) {
+          return fs.mkdirAsync(path.join(outputPath, 'sockjs'))
+            .then(() => fs.writeFileAsync(path.join(outputPath, 'sockjs/info'), '{"websocket": false}', { encoding: 'utf8' })).catch(() => {
+              print('sockjs/info not created or already exists');
+              return true;
+            });
+        }
+        return true;
+      });
+    });
+  },
+  cleanUp(program) {
+    return Q.try(function() {
+      // remove files
+      if (!program.usebuild) {
+        deleteFolderRecursive(path.join(buildPath, 'bundle'));
+      }
+
+      try {
+        fs.unlinkSync(path.join(outputPath, 'program.json'));
+      } catch (e){
+        if (program.debug) {
+          print('FYI: Didn\'t unlink program.json; doesn\'t exist.');
+        }
+      }
+
+      try{
+        fs.unlinkSync(path.join(outputPath, 'head.html'));
+      } catch (e){
+        if (program.debug) {
+          print('FYI: Didn\'t unlink head.html; doesn\'t exist.');
+        }
+      }
+
+      try{
+        fs.unlinkSync(path.join(outputPath, 'body.html'));
+      } catch (e){
+        if (program.debug) {
+          print('FYI: Didn\'t unlink body.html; doesn\'t exist.');
+        }
+      }
+    });
+  }
+};
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..f20fa7f
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,107 @@
+{
+  "name": "meteor-build-client",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "at-least-node": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg=="
+    },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
+    "buffered-spawn": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/buffered-spawn/-/buffered-spawn-3.3.2.tgz",
+      "integrity": "sha1-l7mEbE5EaqIzILSpTFIJ7dMtrLs=",
+      "requires": {
+        "cross-spawn": "^4.0.0"
+      }
+    },
+    "commander": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
+    },
+    "cross-spawn": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz",
+      "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=",
+      "requires": {
+        "lru-cache": "^4.0.1",
+        "which": "^1.2.9"
+      }
+    },
+    "fs-extra": {
+      "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+      "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+      "requires": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      }
+    },
+    "graceful-fs": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+      "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA="
+    },
+    "jsonfile": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+      "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+      "requires": {
+        "graceful-fs": "^4.1.6",
+        "universalify": "^1.0.0"
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.5",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz",
+      "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==",
+      "requires": {
+        "pseudomap": "^1.0.2",
+        "yallist": "^2.1.2"
+      }
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM="
+    },
+    "underscore": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.10.2.tgz",
+      "integrity": "sha512-N4P+Q/BuyuEKFJ43B9gYuOj4TQUHXX+j2FqguVOpjkssLUUrnJofCcBccJSCoeturDoZU6GorDTHSvUDlSQbTg=="
+    },
+    "universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="
+    },
+    "which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "requires": {
+        "isexe": "^2.0.0"
+      }
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI="
+    }
+  }
+}
diff --git a/package.js b/package.js
index 5eb936e..f626329 100644
--- a/package.js
+++ b/package.js
@@ -1,12 +1,11 @@
 Package.describe({
-    name: "frozeman:build-client",
-    summary: "Placeholder package for meteor-build-client (npm). Do not install!",
-    version: "0.4.3",
-    git: "https://github.com/frozeman/meteor-build-client"
+  name: 'frozeman:build-client',
+  summary: 'Placeholder package for meteor-build-client (npm). Do not install!',
+  version: '1.0.0',
+  git: 'https://github.com/frozeman/meteor-build-client'
 });
 
-
 Package.onUse(function (api) {
-    api.versionsFrom('1.2');
-    api.use('standard-minifiers');
+  api.versionsFrom('1.2');
+  api.use('standard-minifiers');
 });
diff --git a/package.json b/package.json
index 16927d5..0a2b56a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor-build-client",
-  "version": "0.4.3",
+  "version": "1.0.0",
   "description": "A bundles the client part of a Meteor app.",
   "author": "Fabian Vogelsteller <fabian@frozeman.de>",
   "contributors": [
@@ -32,8 +32,8 @@
   "dependencies": {
     "bluebird": "^3.4.6",
     "buffered-spawn": "^3.3.2",
-    "commander": "^2.8.1",
-    "simple-spinner": "0.0.3",
+    "commander": "^5.1.0",
+    "fs-extra": "^9.0.1",
     "underscore": "^1.8.3"
   },
   "devDependencies": {}
diff --git a/queue.js b/queue.js
deleted file mode 100644
index 8b73c95..0000000
--- a/queue.js
+++ /dev/null
@@ -1,55 +0,0 @@
-// FIFO
-module.exports = function() {
-  var self = this;
-  var invokations = [];
-  var paused = true;
-  var maxLength = 0;
-  
-  self.progress = function(count, total) {
-    // console.log(count + ' of ' + total);
-  };
-
-  self.reset = function() {
-    paused = true;
-    invokations = [];
-  };
-
-  self.add = function(f) {
-    if (paused) {
-      if (typeof f !== 'function') {
-        throw new Error('queue requires function');
-      }
-      invokations.push(f);
-    }
-  };
-
-  self.next = function(text) {
-    if (text) {
-      self.reset();
-      console.log(' ' + text.red);
-    }
-    
-    if (!paused) {
-
-
-      if (invokations.length) {
-        var f = invokations.shift();
-        // Update the progress
-        self.progress(invokations.length, maxLength);
-        setTimeout(function() {
-          // Run function
-          f(self.next);
-        }, 0);
-      }
-
-    }
-  };
-
-  self.run = function() {
-    paused = false;
-    maxLength = invokations.length;
-    // Update the progress
-    self.progress(invokations.length, maxLength);
-    self.next();
-  };
-};
\ No newline at end of file