diff --git a/app/app.js b/app/app.js
index 57dbb4072..b483df41a 100644
--- a/app/app.js
+++ b/app/app.js
@@ -1,6 +1,6 @@
 'use strict';
 
-angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings'])
+angular.module('dockerui', ['ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder'])
     .config(['$routeProvider', function ($routeProvider) {
         $routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
         $routeProvider.when('/containers/', {templateUrl: 'app/components/containers/containers.html', controller: 'ContainersController'});
diff --git a/partials/builder.html b/app/components/builder/builder.html
similarity index 100%
rename from partials/builder.html
rename to app/components/builder/builder.html
diff --git a/app/components/builder/builderController.js b/app/components/builder/builderController.js
new file mode 100644
index 000000000..7af32e1e7
--- /dev/null
+++ b/app/components/builder/builderController.js
@@ -0,0 +1,5 @@
+angular.module('builder', [])
+.controller('BuilderController', ['$scope', 'Dockerfile', 'Messages',
+function($scope, Dockerfile, Messages) {
+    $scope.template = 'partials/builder.html';
+}]);
diff --git a/app/controllers.js b/app/controllers.js
index 67d8853d3..df0fc5157 100644
--- a/app/controllers.js
+++ b/app/controllers.js
@@ -47,10 +47,6 @@ function getChart(id) {
     return new Chart(ctx);
 }
 
-function BuilderController($scope, Dockerfile, Messages) {
-    $scope.template = 'partials/builder.html';
-}
-
 function failedRequestHandler(e, Messages) {
     Messages.send({class: 'text-error', data: e.data});
 }
diff --git a/index.html b/index.html
index f8bc9eddc..3b71065ad 100644
--- a/index.html
+++ b/index.html
@@ -47,6 +47,7 @@
     <script src="app/components/images/imagesController.js"></script>
     <script src="app/components/sidebar/sidebarController.js"></script>
     <script src="app/components/settings/settingsController.js"></script>
+    <script src="app/components/builder/builderController.js"></script>
     <script src="app/viewmodel.js"></script>
 
     <!-- Fav and touch icons -->