diff --git a/content/js/index.js b/content/js/index.js
index a07b4e31..ed61d781 100644
--- a/content/js/index.js
+++ b/content/js/index.js
@@ -1 +1,4 @@
-import '../../core/js/index';
+// Client JS
+// This file just to test output, you can put your own scripts here. Scripts loaded here will be transpiled using Babel to bundle-client.js
+
+import data from './modules/data.js';
diff --git a/content/js/modules/data.js b/content/js/modules/data.js
new file mode 100644
index 00000000..fe6fb89b
--- /dev/null
+++ b/content/js/modules/data.js
@@ -0,0 +1,3 @@
+export default  [
+  { name: 'John Doe' }
+]
diff --git a/content/templates/_layouts/master.pug b/content/templates/_layouts/master.pug
index 81d7c3d7..dd9387b5 100644
--- a/content/templates/_layouts/master.pug
+++ b/content/templates/_layouts/master.pug
@@ -45,7 +45,8 @@ html(dir="ltr" lang="en" class=htmlClass ? htmlClass : '')
 
 
         = "\n"
-        script(src='/js/bundle.js')
+        script(src='/js/bundle-prototype.js')
+        script(src='/js/bundle-client.js')
 
         block footerScripts
             // Nothing yet
diff --git a/core/paths.js b/core/paths.js
index df1c52aa..02aca1ad 100644
--- a/core/paths.js
+++ b/core/paths.js
@@ -54,6 +54,10 @@ module.exports = {
   },
   core: {
     path: corePath,
+    js: {
+      entryFile: path.join(corePath, 'js/index.js'),
+      allFiles: path.join(corePath, 'js/**/*.js')
+    },
     scss: {
       all: path.join(corePath, 'scss/**/*.scss'),
       prototype: path.join(corePath, 'scss/prototype.scss')
diff --git a/core/tasks/bundle.js b/core/tasks/bundle.js
index e45241c1..726be209 100644
--- a/core/tasks/bundle.js
+++ b/core/tasks/bundle.js
@@ -5,14 +5,23 @@ const babelify = require('babelify');
 
 const paths = require('../paths');
 
-module.exports = function () {
-  return gulp.src(paths.content.js.entryFile)
-    .pipe(bro({
-      debug: true,
-      transform: [
-        babelify.configure({ presets: ['@babel/preset-env'] }),
-      ]
-    }))
-    .pipe(rename('bundle.js'))
-    .pipe(gulp.dest(paths.compiled.js))
+let babelConfig = {
+  transform: [
+    babelify.configure({ presets: ['@babel/preset-env'] }),
+  ]
+}
+
+module.exports = {
+  clientBundle() {
+    return gulp.src(paths.content.js.entryFile)
+      .pipe(bro(babelConfig))
+      .pipe(rename('bundle-client.js'))
+      .pipe(gulp.dest(paths.compiled.js))
+  },
+  prototypeBundle() {
+    return gulp.src(paths.core.js.entryFile)
+      .pipe(bro(babelConfig))
+      .pipe(rename('bundle-prototype.js'))
+      .pipe(gulp.dest(paths.compiled.js))
+  }
 };
diff --git a/core/tasks/watch.js b/core/tasks/watch.js
index 4827a5b2..fc2a20b7 100644
--- a/core/tasks/watch.js
+++ b/core/tasks/watch.js
@@ -12,5 +12,7 @@ module.exports = function () {
   gulp.watch(paths.content.assets.resources, gulp.series('copy:resources'));
   gulp.watch(paths.content.iconFont.sourceFiles, gulp.series('icon-font'));
   gulp.watch(paths.content.icons.sourceFiles, browserSync.reload());
-  gulp.watch(paths.content.js.allFiles, gulp.series('bundle'));
+  gulp.watch(paths.content.js.allFiles, gulp.series('bundle:clientBundle'));
+  gulp.watch(paths.core.js.allFiles, gulp.series('bundle:prototypeBundle'));
+
 };
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 4278ebf7..a8e0b801 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -22,7 +22,8 @@ gulp.task('copy:favicon', copy.favicon);
 gulp.task('copy:resources', copy.resources);
 gulp.task('copy:scripts', copy.scripts);
 gulp.task('copy:compiledToDist', copy.compiledToDist);
-gulp.task('bundle', bundle);
+gulp.task('bundle:clientBundle', bundle.clientBundle);
+gulp.task('bundle:prototypeBundle', bundle.prototypeBundle);
 gulp.task('icon-font', iconFont);
 
 gulp.task('templates:compile:content', templates.compile.content);
@@ -36,7 +37,7 @@ gulp.task('templates:compile', config.styleguide ?
 
 gulp.task('watch', watch);
 gulp.task('copy', gulp.parallel('copy:images', 'copy:fonts', 'copy:resources', 'copy:scripts', 'copy:favicon'));
-gulp.task('compile-all', gulp.parallel('templates:clean','icon-font', 'bundle', 'sass', 'copy'));
+gulp.task('compile-all', gulp.parallel('templates:clean','icon-font', 'bundle:clientBundle', 'bundle:prototypeBundle', 'sass', 'copy'));
 
 gulp.task('build', gulp.series('compile-all', 'templates:compile', 'copy:compiledToDist'), function (done) {
   console.log('------------\n');