diff --git a/xos/core/xoslib/xos-builder/.bowerrc b/xos/core/xoslib/xos-builder/.bowerrc
index 0de0220..e491038 100644
--- a/xos/core/xoslib/xos-builder/.bowerrc
+++ b/xos/core/xoslib/xos-builder/.bowerrc
@@ -1,3 +1,3 @@
 {
-  "directory": "src/js/vendor/"
+  "directory": "src/vendor/"
 }
\ No newline at end of file
diff --git a/xos/core/xoslib/xos-builder/.gitignore b/xos/core/xoslib/xos-builder/.gitignore
index dea17dd..0d7b211 100644
--- a/xos/core/xoslib/xos-builder/.gitignore
+++ b/xos/core/xoslib/xos-builder/.gitignore
@@ -1,2 +1,2 @@
 dist/
-src/js/vendor
\ No newline at end of file
+src/vendor
\ No newline at end of file
diff --git a/xos/core/xoslib/xos-builder/gulp/build.js b/xos/core/xoslib/xos-builder/gulp/build.js
index b001266..e9691ff 100644
--- a/xos/core/xoslib/xos-builder/gulp/build.js
+++ b/xos/core/xoslib/xos-builder/gulp/build.js
@@ -18,6 +18,7 @@
 var del = require('del');
 var wiredep = require('wiredep');
 var babel = require('gulp-babel');
+var angularFilesort = require('gulp-angular-filesort');
 
 var TEMPLATE_HEADER = '/*This code is autogenerated from the templates files */ angular.module("<%= module %>"<%= standalone %>).run(["$templateCache", function($templateCache) {';
 
@@ -29,11 +30,11 @@
 
   gulp.task('scripts', function() {
     return gulp.src([
-        'src/xosContentProvider.js',
-        'src/templates.js'
+        options.scripts + '**/*.js'
       ])
       .pipe(babel())
       .pipe(ngmin())
+      .pipe(angularFilesort())
       .pipe(concat('xosContentProvider.js'))
       .pipe(uglify())
       .pipe(gulp.dest('dist'));
@@ -46,7 +47,7 @@
         root: '../../static/templates/contentProvider/',
         templateHeader: TEMPLATE_HEADER
       }))
-      .pipe(gulp.dest("src"));
+      .pipe(gulp.dest(options.scripts));
   });
 
   gulp.task('copyJs', function(){
diff --git a/xos/core/xoslib/xos-builder/gulp/server.js b/xos/core/xoslib/xos-builder/gulp/server.js
new file mode 100644
index 0000000..aeaa887
--- /dev/null
+++ b/xos/core/xoslib/xos-builder/gulp/server.js
@@ -0,0 +1,21 @@
+'use strict';
+
+var gulp = require('gulp');
+var browserSync = require('browser-sync').create();
+var inject = require('gulp-inject');
+
+module.exports = function(options){
+  gulp.task('browser', function() {
+    browserSync.init({
+      server: {
+          baseDir: "./src"
+      }
+    });
+  });
+
+  gulp.task('inject', function(){
+    return gulp.src('./src/index.html')
+      .pipe(inject(gulp.src('./src/js/**/*.js', {read: false})))
+      .pipe(gulp.dest('./src'));
+  });
+}
\ No newline at end of file
diff --git a/xos/core/xoslib/xos-builder/gulpfile.js b/xos/core/xoslib/xos-builder/gulpfile.js
index 7b84baf..85d20ee 100644
--- a/xos/core/xoslib/xos-builder/gulpfile.js
+++ b/xos/core/xoslib/xos-builder/gulpfile.js
@@ -3,7 +3,10 @@
 var gulp = require('gulp');
 var wrench = require('wrench');
 
-var options = {};
+var options = {
+  scripts: 'src/js/',
+  dist: 'dist/'
+};
 
 wrench.readdirSyncRecursive('./gulp')
 .map(function(file) {
diff --git a/xos/core/xoslib/xos-builder/package.json b/xos/core/xoslib/xos-builder/package.json
index 1348663..15189e3 100644
--- a/xos/core/xoslib/xos-builder/package.json
+++ b/xos/core/xoslib/xos-builder/package.json
@@ -15,11 +15,14 @@
   "license": "ISC",
   "dependencies": {},
   "devDependencies": {
+    "browser-sync": "^2.9.11",
     "del": "^2.0.2",
     "gulp": "^3.9.0",
+    "gulp-angular-filesort": "^1.1.1",
     "gulp-angular-templatecache": "^1.8.0",
     "gulp-babel": "^5.3.0",
     "gulp-concat": "^2.6.0",
+    "gulp-inject": "^3.0.0",
     "gulp-minify-html": "^1.0.4",
     "gulp-ngmin": "^0.3.0",
     "gulp-uglify": "^1.4.2",
diff --git a/xos/core/xoslib/xos-builder/src/index.html b/xos/core/xoslib/xos-builder/src/index.html
new file mode 100644
index 0000000..887ed04
--- /dev/null
+++ b/xos/core/xoslib/xos-builder/src/index.html
@@ -0,0 +1,6 @@
+<div ng-app="xos.contentProviderApp">
+  <ng-view></ng-view>
+</div>
+
+<!-- inject:js -->
+<!-- endinject -->
diff --git a/xos/core/xoslib/xos-builder/src/templates.js b/xos/core/xoslib/xos-builder/src/js/templates.js
similarity index 100%
rename from xos/core/xoslib/xos-builder/src/templates.js
rename to xos/core/xoslib/xos-builder/src/js/templates.js
diff --git a/xos/core/xoslib/xos-builder/src/xosContentProvider.js b/xos/core/xoslib/xos-builder/src/js/xosContentProvider.js
similarity index 100%
rename from xos/core/xoslib/xos-builder/src/xosContentProvider.js
rename to xos/core/xoslib/xos-builder/src/js/xosContentProvider.js