diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 7a9869b..5eb9313 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -1,9 +1,6 @@
 module.exports = (grunt) ->
 
-  require('load-grunt-tasks')(grunt)
-  grunt.initConfig(require("load-grunt-config") grunt,
-    configPath: "tasks/options"
-  )
+  grunt.initConfig require("load-grunt-config")(grunt)
 
   grunt.task.registerTask 'test', ['buildtest', 'karma']
   grunt.task.registerTask 'local', ['builddist', 'clean:local', 'concat:test', 'recess:bootstrap', 'connect']
diff --git a/grunt/clean.coffee b/grunt/clean.coffee
new file mode 100644
index 0000000..e18e741
--- /dev/null
+++ b/grunt/clean.coffee
@@ -0,0 +1,19 @@
+module.exports =
+  build: [
+    'build'
+    'tests/build'
+    'coverage'
+  ]
+  local: [
+    'build/app.js'
+    'build/deps.js'
+    'build/dsmcode.js'
+    'build/tmpl.js'
+  ]
+  ci: [
+    'build/app.js'
+    'build/deps.js'
+    'build/dsmcode.js'
+    'build/localdata.js'
+    'build/tmpl.js'
+  ]
diff --git a/grunt/coffee.coffee b/grunt/coffee.coffee
new file mode 100644
index 0000000..caf1ca5
--- /dev/null
+++ b/grunt/coffee.coffee
@@ -0,0 +1,14 @@
+module.exports =
+  options:
+    bare: true
+  compile:
+    files:
+      'build/app.js': [
+        'src/*.coffee',
+        'src/**/*.coffee'
+      ],
+      'build/localdata.js': 'local/fixture_data.coffee',
+      'tests/build/tests.js': [
+         'tests/helper.coffee',
+         'tests/*tests.coffee'
+      ]
diff --git a/grunt/coffeelint.coffee b/grunt/coffeelint.coffee
new file mode 100644
index 0000000..19d698d
--- /dev/null
+++ b/grunt/coffeelint.coffee
@@ -0,0 +1,2 @@
+module.exports =
+  app: ["src/*.coffee"]
diff --git a/grunt/concat.coffee b/grunt/concat.coffee
new file mode 100644
index 0000000..240255b
--- /dev/null
+++ b/grunt/concat.coffee
@@ -0,0 +1,20 @@
+module.exports =
+  deps:
+    src: [
+      'bower_components/jquery/jquery.min.js'
+      'bower_components/handlebars/handlebars.js'
+      'bower_components/ember/ember.js'
+      'bower_components/ember-data-shim/ember-data.js'
+      'bower_components/bootstrap/js/bootstrap-collapse.js'
+      'bower_components/bootstrap/js/bootstrap-dropdown.js'
+    ]
+    dest: 'build/deps.js'
+  dsmcode:
+    src: [
+      'build/app.js'
+      'build/tmpl.js'
+    ]
+    dest: 'build/dsmcode.js'
+  test:
+    src: ['bower_components/jquery-mockjax/jquery.mockjax.js']
+    dest: 'build/test_deps.js'
diff --git a/grunt/connect.coffee b/grunt/connect.coffee
new file mode 100644
index 0000000..749f8d5
--- /dev/null
+++ b/grunt/connect.coffee
@@ -0,0 +1,6 @@
+module.exports =
+  server:
+    options:
+      port: 9000
+      base: '.'
+      keepalive: true
diff --git a/grunt/coveralls.coffee b/grunt/coveralls.coffee
new file mode 100644
index 0000000..dc4d8b8
--- /dev/null
+++ b/grunt/coveralls.coffee
@@ -0,0 +1,3 @@
+module.exports =
+  options:
+    coverage_dir: 'coverage'
diff --git a/grunt/emberhandlebars.coffee b/grunt/emberhandlebars.coffee
new file mode 100644
index 0000000..e0cc0fa
--- /dev/null
+++ b/grunt/emberhandlebars.coffee
@@ -0,0 +1,8 @@
+module.exports =
+  compile:
+    options:
+      templateName: (sourceFile) ->
+        newSource = sourceFile.replace 'src/templates/', ''
+        newSource.replace '.handlebars', ''
+    files: ['src/templates/*.handlebars']
+    dest: 'build/tmpl.js'
diff --git a/grunt/karma.coffee b/grunt/karma.coffee
new file mode 100644
index 0000000..c6e226f
--- /dev/null
+++ b/grunt/karma.coffee
@@ -0,0 +1,30 @@
+module.exports =
+  unit:
+    options:
+      basePath: '.'
+      frameworks: ['qunit']
+      files: [
+        "build/deps*"
+        "build/dsmcode*"
+        "build/test_deps*"
+        "tests/build/*.js"
+      ]
+      port: 9876
+      runnerPort: 9100
+      colors: true
+      browsers: ['PhantomJS']
+      captureTimeout: 60000
+      singleRun: true
+      autoWatch: false
+      reporters: ['coverage', 'progress']
+      preprocessors:
+        "build/dsmcode*.js": "coverage"
+      coverageReporter:
+        type: "lcov"
+        dir: 'coverage/'
+      plugins: [
+          'karma-coverage'
+          'karma-qunit'
+          'karma-chrome-launcher'
+          'karma-phantomjs-launcher'
+      ]
diff --git a/grunt/recess.coffee b/grunt/recess.coffee
new file mode 100644
index 0000000..3834ef1
--- /dev/null
+++ b/grunt/recess.coffee
@@ -0,0 +1,9 @@
+module.exports =
+  options:
+    compile: true
+  bootstrap:
+    src: [
+      'bower_components/bootstrap/less/bootstrap.less'
+      'bower_components/bootstrap/less/responsive.less'
+    ]
+    dest: 'build/css/bootstrap-responsive.min.css'
diff --git a/grunt/uglify.coffee b/grunt/uglify.coffee
new file mode 100644
index 0000000..6aca585
--- /dev/null
+++ b/grunt/uglify.coffee
@@ -0,0 +1,7 @@
+module.exports =
+  app:
+    src: ['build/dsmcode.js']
+    dest: 'build/dsmcode.min.js'
+  deps:
+    src: ['build/deps.js']
+    dest: 'build/deps.min.js'
diff --git a/package.json b/package.json
index c01a92b..b8d3150 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
     "version": "1.0.0",
     "dependencies": {
         "coffee-script": "*",
-        "bower": "~1.2.3",
+        "bower": "~1.2.7",
         "grunt-cli": "*",
         "grunt-recess": "*",
         "grunt-contrib-connect": "*",
@@ -11,8 +11,7 @@
         "grunt-contrib-coffee": "*",
         "grunt-contrib-uglify": "*",
         "grunt-contrib-clean": "*",
-        "grunt-ember-template-compiler": "1.0.6",
-        "load-grunt-tasks": "*",
+        "grunt-ember-template-compiler": "1.1.2",
         "load-grunt-config": "*"
     },
     "devDependencies": {
diff --git a/tasks/options/clean.js b/tasks/options/clean.js
deleted file mode 100644
index c02c619..0000000
--- a/tasks/options/clean.js
+++ /dev/null
@@ -1,20 +0,0 @@
-module.exports = {
-    build: [
-        'build',
-        'tests/build',
-        'coverage'
-    ],
-    local: [
-        'build/app.js',
-        'build/deps.js',
-        'build/dsmcode.js',
-        'build/tmpl.js'
-    ],
-    ci: [
-        'build/app.js',
-        'build/deps.js',
-        'build/dsmcode.js',
-        'build/localdata.js',
-        'build/tmpl.js'
-    ]
-};
diff --git a/tasks/options/coffee.js b/tasks/options/coffee.js
deleted file mode 100644
index 63dd746..0000000
--- a/tasks/options/coffee.js
+++ /dev/null
@@ -1,18 +0,0 @@
-module.exports = {
-    options: {
-        bare: true
-    },
-    compile: {
-        files: {
-            'build/app.js': [
-              'src/*.coffee',
-              'src/**/*.coffee'
-            ],
-            'build/localdata.js': 'local/fixture_data.coffee',
-            'tests/build/tests.js': [
-               'tests/helper.coffee',
-               'tests/*tests.coffee'
-            ]
-        }
-    }
-};
diff --git a/tasks/options/coffeelint.js b/tasks/options/coffeelint.js
deleted file mode 100644
index 408b085..0000000
--- a/tasks/options/coffeelint.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-    app: ["src/*.coffee"]
-};
diff --git a/tasks/options/concat.js b/tasks/options/concat.js
deleted file mode 100644
index 19acc5b..0000000
--- a/tasks/options/concat.js
+++ /dev/null
@@ -1,26 +0,0 @@
-module.exports = {
-    deps: {
-        src: [
-            'bower_components/jquery/jquery.min.js',
-            'bower_components/handlebars/handlebars.js',
-            'bower_components/ember/ember.js',
-            'bower_components/ember-data-shim/ember-data.js',
-            'bower_components/bootstrap/js/bootstrap-collapse.js',
-            'bower_components/bootstrap/js/bootstrap-dropdown.js'
-        ],
-        dest: 'build/deps.js'
-    },
-    dsmcode: {
-        src: [
-            'build/app.js',
-            'build/tmpl.js'
-        ],
-        dest: 'build/dsmcode.js'
-    },
-    test: {
-        src: [
-            'bower_components/jquery-mockjax/jquery.mockjax.js'
-        ],
-        dest: 'build/test_deps.js'
-    }
-};
diff --git a/tasks/options/connect.js b/tasks/options/connect.js
deleted file mode 100644
index dba21f7..0000000
--- a/tasks/options/connect.js
+++ /dev/null
@@ -1,9 +0,0 @@
-module.exports = {
-    server: {
-        options: {
-            port: 9000,
-            base: '.',
-            keepalive: true
-        }
-    }
-};
diff --git a/tasks/options/coveralls.js b/tasks/options/coveralls.js
deleted file mode 100644
index 132876f..0000000
--- a/tasks/options/coveralls.js
+++ /dev/null
@@ -1,5 +0,0 @@
-module.exports = {
-    options: {
-        coverage_dir: 'coverage'
-    }
-};
diff --git a/tasks/options/emberhandlebars.js b/tasks/options/emberhandlebars.js
deleted file mode 100644
index fc5b65d..0000000
--- a/tasks/options/emberhandlebars.js
+++ /dev/null
@@ -1,14 +0,0 @@
-module.exports = {
-    compile: {
-        options: {
-            templateName: function(sourceFile){
-                var newSource = sourceFile.replace('src/templates/', '');
-                return newSource.replace('.handlebars', '');
-            }
-        },
-        files: [
-            'src/templates/*.handlebars'
-        ],
-        dest: 'build/tmpl.js'
-    }
-};
diff --git a/tasks/options/karma.js b/tasks/options/karma.js
deleted file mode 100644
index b2d7f48..0000000
--- a/tasks/options/karma.js
+++ /dev/null
@@ -1,35 +0,0 @@
-module.exports = {
-    unit: {
-        options: {
-            basePath: '.',
-            frameworks: ['qunit'],
-            files: [
-                "build/deps*",
-                "build/dsmcode*",
-                "build/test_deps*",
-                "tests/build/*.js"
-            ],
-            port: 9876,
-            runnerPort: 9100,
-            colors: true,
-            browsers: ['PhantomJS'],
-            captureTimeout: 60000,
-            singleRun: true,
-            autoWatch: false,
-            reporters: ['coverage', 'progress'],
-            preprocessors: {
-                "build/dsmcode*.js": "coverage"
-            },
-            coverageReporter: {
-                type: "lcov",
-                dir: 'coverage/'
-            },
-            plugins: [
-                'karma-coverage',
-                'karma-qunit',
-                'karma-chrome-launcher',
-                'karma-phantomjs-launcher'
-            ]
-        }
-    }
-};
diff --git a/tasks/options/recess.js b/tasks/options/recess.js
deleted file mode 100644
index c954b29..0000000
--- a/tasks/options/recess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-module.exports = {
-    options: {
-        compile: true
-    },
-    bootstrap: {
-        src: [
-            'bower_components/bootstrap/less/bootstrap.less',
-            'bower_components/bootstrap/less/responsive.less'
-        ],
-        dest: 'build/css/bootstrap-responsive.min.css'
-    }
-};
diff --git a/tasks/options/uglify.js b/tasks/options/uglify.js
deleted file mode 100644
index bc0a379..0000000
--- a/tasks/options/uglify.js
+++ /dev/null
@@ -1,10 +0,0 @@
-module.exports = {
-    app: {
-        src: ['build/dsmcode.js'],
-        dest: 'build/dsmcode.min.js'
-    },
-    deps: {
-        src: ['build/deps.js'],
-        dest: 'build/deps.min.js'
-    }
-};