diff --git a/.gitignore b/.gitignore
index b38db2f..88edb62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
 node_modules/
-build/
+lib/
diff --git a/Gruntfile.js b/Gruntfile.js
index de37c5b..08e8c67 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,18 +5,21 @@ module.exports = function (grunt) {
   require('./jit-grunt')(grunt);
 
   grunt.initConfig({
+
     jscs: {
       options: {
         config: '.jscsrc'
       },
-      all: ['*.js', '{lib,test}/**/*.js']
+      all: ['*.js', '{src,test}/**/*.js']
     },
+
     jshint: {
       options: {
         jshintrc: true
       },
-      all: ['*.js', '{lib,test}/**/*.js']
+      all: ['*.js', '{src,test}/**/*.js']
     },
+
     mochaTest: {
       options: {
         reporter: 'spec',
diff --git a/package.json b/package.json
index 24c0e08..93bd176 100644
--- a/package.json
+++ b/package.json
@@ -25,11 +25,14 @@
     "url": "git://github.com/shootaroo/jit-grunt.git"
   },
   "scripts": {
-    "test": "grunt",
+    "build": "babel src --out-dir lib --source-maps-inline",
+    "watch": "babel src --out-dir lib --source-maps-inline --watch",
+    "test": "npm run build && grunt",
     "precommit": "npm test",
     "prepush": "npm test"
   },
   "devDependencies": {
+    "babel": "^5.0.0",
     "espower-babel": "^1.4.1",
     "grunt": "~0.4.0",
     "grunt-contrib-jshint": "~0.11.0",
diff --git a/lib/jit-grunt.js b/src/jit-grunt.js
similarity index 100%
rename from lib/jit-grunt.js
rename to src/jit-grunt.js