diff --git a/.gitignore b/.gitignore
index ca7edfb..96f5e12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 node_modules
-dist
+angular-radians.js
 .tmp
 .sass-cache
 app/components
diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index 1910d67..84f6624 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -5,29 +5,28 @@ module.exports = (grunt) ->
   grunt.initConfig
     pkg: grunt.file.readJSON 'package.json'
     meta:
-      src: 'src/'
-      test: 'test/'
-      target: 'dist/'
+      src: 'src'
+      test: 'test'
       banner: '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
         '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
         '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
         '* Copyright (c) <%= grunt.template.today("yyyy") %>' +
         ' <%= pkg.author.name %>;' +
         ' Licensed <%= _.pluck(pkg.licenses, "type").join(", ") %> */\n'
-    clean: target: src: ['<%= meta.target %>*js']
+    clean: target: src: ['<%= pkg.title %>.js']
     coffeelint:
       src:
-        files: src: ['<%= meta.src %>**/*.coffee']
+        files: src: ['<%= meta.src %>/**/*.coffee']
         options: max_line_length: level: 'warn'
       test:
-        files: src: ['<%= meta.src %>**/*.coffee']
+        files: src: ['<%= meta.src %>/**/*.coffee']
         options: max_line_length: level: 'warn'
       gruntfile:
         files: src: ['Gruntfile.coffee']
     coffee: src:
       files:
-        '<%= meta.target %>radians.js': [
-          '<%= meta.src %>**/*.coffee'
+        '<%= pkg.name %>.js': [
+          '<%= meta.src %>/**/*.coffee'
         ]
     karma:
       # unit: configFile: 'config/karma-unit.coffee'
@@ -40,15 +39,9 @@ module.exports = (grunt) ->
         configFile: 'config/karma-e2e.coffee'
         singleRun: true
         browsers: ['PhantomJS']
-    jshint: target: ['<%= meta.target %>**/*.js']
-
-  grunt.loadNpmTasks 'grunt-contrib-clean'
-  grunt.loadNpmTasks 'grunt-contrib-coffee'
-  grunt.loadNpmTasks 'grunt-coffeelint'
-  grunt.loadNpmTasks 'grunt-contrib-watch'
-  grunt.loadNpmTasks 'grunt-karma'
-  grunt.loadNpmTasks 'grunt-contrib-jshint'
+    jshint: target: ['<%= pkg.name %>.js']
 
+  require('matchdep').filterDev('grunt-*').forEach grunt.loadNpmTasks
 
   grunt.registerTask 'test', ['karma:e2e_ci']
   grunt.registerTask 'lint', ['coffeelint']
diff --git a/bower.json b/bower.json
index edc04af..9881b3e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,19 @@
 { "name": "radians"
 , "version": "0.0.0"
+, "main": "angular-radians.js"
+, "ignore":
+  [ ".*"
+  , "Gruntfile.coffee"
+  , "package.json"
+  , "components"
+  , "config"
+  , "examples"
+  , "node_modules"
+  , "src"
+  , "test"
+  ]
 , "dependencies":
-  { "angular": "~1.0.5"
+  { "angular": "~1.0.7"
   }
 , "devDependencies":
   { "angular-mocks": "~1.0.5"
diff --git a/package.json b/package.json
index ec451a7..a4760aa 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "angular-radians",
   "version": "0.0.0",
   "description": "angular extensions",
-  "main": "index.js",
+  "main": "angular-radians.js",
   "directories": {
     "test": "test"
   },
@@ -17,6 +17,7 @@
   "author": "Dmitri Akatov",
   "license": "BSD",
   "devDependencies": {
+    "matchdep": "~0.1.2",
     "grunt": "~0.4.1",
     "grunt-contrib-concat": "~0.3.0",
     "grunt-mocha-cli": "~1.0.6",