diff --git a/.bowerrc b/.bowerrc
deleted file mode 100644
index deceb62..0000000
--- a/.bowerrc
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"directory": "bower_components"
-}
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 75c0920..c346b13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-components/
+bower_components/
 node_modules/
diff --git a/.travis.yml b/.travis.yml
index f6bffd0..2bfd12c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,8 +8,8 @@ before_install:
 - npm install -g bower grunt-cli
 - npm install
 - bower install
-before_script: components/angular-ui-docs/.travis/before_script.sh
-after_success: components/angular-ui-docs/.travis/after_success.sh
+before_script: bower_components/angular-ui-docs/.travis/before_script.sh
+after_success: bower_components/angular-ui-docs/.travis/after_success.sh
 branches:
   only:
   - master
diff --git a/demo/demo.html b/demo/demo.html
index 1fe5987..6e89960 100644
--- a/demo/demo.html
+++ b/demo/demo.html
@@ -1,50 +1,5 @@
 
-<script>
-
-  $("#codemirror").hide();
-  requireCss("components/codemirror/lib/codemirror.css");
-  requireCss("components/codemirror/theme/rubyblue.css");
-  requirejs(
-      {
-        paths: {
-          'ui.codemirror': "build/ui-codemirror.min"
-        },
-        shim: {
-          'ui.codemirror': { deps: ['components/codemirror/lib/codemirror'] }
-        }
-      },
-      ['ui.codemirror'],
-      function () {
-
-        angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
-            .controller('CodemirrorCtrl', ['$scope', function ($scope) {
-              $scope.codeMirrorModel = "CodeMirror Hello World";
-            }])
-        ;
-        e$ = $("#codemirror");
-        e$.removeAttr("ng-non-bindable");
-
-        angular.bootstrap(e$[0], ['doc.ui-codeMirror']);
-        e$.show();
-        $("#codemirror-l").slideUp();
-
-
-      }
-  );
-</script>
-
-<!-- Le loading
-================================================== -->
-<div id="codemirror-l" class="loadingAnimation" >
-  <div class="bowl_ringG">
-    <div class="ball_holderG">
-      <div class="ballG">
-      </div>
-    </div>
-  </div>
-</div>
-
-<section id="codemirror" ng-non-bindable ng-controller="CodemirrorCtrl">
+<section id="codemirror" ng-app="doc.ui-codeMirror" ng-controller="CodemirrorCtrl">
   <div class="page-header">
     <h1>CodeMirror</h1>
   </div>
diff --git a/demo/demo.js b/demo/demo.js
new file mode 100644
index 0000000..fdb2127
--- /dev/null
+++ b/demo/demo.js
@@ -0,0 +1,5 @@
+
+angular.module('doc.ui-codeMirror', ['ui.codemirror', 'prettifyDirective' ])
+  .controller('CodemirrorCtrl', ['$scope', function ($scope) {
+    $scope.codeMirrorModel = "CodeMirror Hello World";
+  }])
\ No newline at end of file
diff --git a/gruntFile.js b/gruntFile.js
index 37f34f1..1a02d75 100644
--- a/gruntFile.js
+++ b/gruntFile.js
@@ -18,7 +18,8 @@ module.exports = function (grunt) {
 
   // Project configuration.
   grunt.initConfig({
-    dist : 'components/angular-ui-docs',
+    bower: 'bower_components',
+    dist : '<%= bower %>/angular-ui-docs',
     pkg: grunt.file.readJSON('package.json'),
     meta: {
       banner: ['/**',
@@ -30,7 +31,17 @@ module.exports = function (grunt) {
         ''].join('\n'),
       view : {
         humaName : "UI CodeMirror",
-        repoName : "ui-codemirror"
+        repoName : "ui-codemirror",
+        demoHTML : grunt.file.read("demo/demo.html"),
+        demoJS : grunt.file.read("demo/demo.js"),
+        css : [
+          '<%= bower %>/codemirror/lib/codemirror.css',
+          '<%= bower %>/codemirror/theme/rubyblue.css'
+        ],
+        js : [
+          '<%= bower %>/codemirror/lib/codemirror.js',
+          'build/ui-codemirror.min.js'
+        ]
       }
     },
     karma: {
@@ -63,10 +74,9 @@ module.exports = function (grunt) {
       main: {
         files: [
           {src: ['<%= meta.view.repoName %>.js'], dest: '<%= dist %>/build/<%= meta.view.repoName %>.js', filter: 'isFile'},
-          {src: ['demo/demo.html'], dest: '<%= dist %>/demos.html', filter: 'isFile'},
-          {src: ['components/codemirror/lib/codemirror.js'], dest: '<%= dist %>/components/codemirror/lib/codemirror.js', filter: 'isFile'},
-          {src: ['components/codemirror/lib/codemirror.css'], dest: '<%= dist %>/components/codemirror/lib/codemirror.css', filter: 'isFile'},
-          {src: ['components/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/components/codemirror/theme/rubyblue.css', filter: 'isFile'}
+          {src: ['<%= bower %>/codemirror/lib/codemirror.js'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.js', filter: 'isFile'},
+          {src: ['<%= bower %>/codemirror/lib/codemirror.css'], dest: '<%= dist %>/<%= bower %>/codemirror/lib/codemirror.css', filter: 'isFile'},
+          {src: ['<%= bower %>/codemirror/theme/rubyblue.css'], dest: '<%= dist %>/<%= bower %>/codemirror/theme/rubyblue.css', filter: 'isFile'}
         ]
       },
       template : {