diff --git a/tasks/README.md b/tasks/README.md
index 40b5dcc47..9dc33c717 100644
--- a/tasks/README.md
+++ b/tasks/README.md
@@ -1,7 +1,17 @@
+## Tasks
+
+* Watch - Compile only changed files from source
+* Build - Build all files from source
+* Version - Output version number
+* Install - Run Installer to Set-up Paths
+
 ## How to use
 
 These tasks can be imported into your own gulpfile allowing you to avoid using Semantic's build tools
 
 ```javascript
-gulp.task('watch ui', 'Watch Semantic UI', require('path/to/semantic/tasks/watch'));
+var
+  watch = require('path/to/semantic/tasks/watch')
+;
+gulp.task('watch ui', 'Watch Semantic UI', watch));
 ```
\ No newline at end of file
diff --git a/tasks/build.js b/tasks/build.js
index 655ddbe0a..196c21dcb 100644
--- a/tasks/build.js
+++ b/tasks/build.js
@@ -42,10 +42,9 @@ var
   settings     = tasks.settings
 ;
 
-// add internal tasks
+// add internal tasks (concat release)
 require('./collections/internal')(gulp);
 
-
 module.exports = function(callback) {
 
   var
diff --git a/tasks/collections/check-install.js b/tasks/check-install.js
similarity index 100%
rename from tasks/collections/check-install.js
rename to tasks/check-install.js
diff --git a/tasks/admin/config/oauth.example.js b/tasks/config/admin/oauth.example.js
similarity index 100%
rename from tasks/admin/config/oauth.example.js
rename to tasks/config/admin/oauth.example.js
diff --git a/tasks/admin/config/release.js b/tasks/config/admin/release.js
similarity index 100%
rename from tasks/admin/config/release.js
rename to tasks/config/admin/release.js
diff --git a/tasks/admin/templates/README.md b/tasks/config/admin/templates/README.md
similarity index 100%
rename from tasks/admin/templates/README.md
rename to tasks/config/admin/templates/README.md
diff --git a/tasks/admin/templates/bower.json b/tasks/config/admin/templates/bower.json
similarity index 100%
rename from tasks/admin/templates/bower.json
rename to tasks/config/admin/templates/bower.json
diff --git a/tasks/admin/templates/composer.json b/tasks/config/admin/templates/composer.json
similarity index 100%
rename from tasks/admin/templates/composer.json
rename to tasks/config/admin/templates/composer.json
diff --git a/tasks/admin/templates/package-component.js b/tasks/config/admin/templates/package-component.js
similarity index 100%
rename from tasks/admin/templates/package-component.js
rename to tasks/config/admin/templates/package-component.js
diff --git a/tasks/admin/templates/package.js b/tasks/config/admin/templates/package.js
similarity index 100%
rename from tasks/admin/templates/package.js
rename to tasks/config/admin/templates/package.js
diff --git a/tasks/admin/templates/package.json b/tasks/config/admin/templates/package.json
similarity index 100%
rename from tasks/admin/templates/package.json
rename to tasks/config/admin/templates/package.json
diff --git a/tasks/config/project/tasks.js b/tasks/config/project/tasks.js
index 97e61cfc4..5792183b5 100644
--- a/tasks/config/project/tasks.js
+++ b/tasks/config/project/tasks.js
@@ -3,6 +3,7 @@ var
   release = require('./release')
 ;
 
+
 module.exports = {
 
   banner : release.banner,
@@ -21,7 +22,6 @@ module.exports = {
     concatenatedJS             : 'semantic.js',
     concatenatedMinifiedCSS    : 'semantic.min.css',
     concatenatedMinifiedJS     : 'semantic.min.js',
-
     concatenatedRTLCSS         : 'semantic.rtl.css',
     concatenatedMinifiedRTLCSS : 'semantic.rtl.min.css'
   },
diff --git a/tasks/collections/install.js b/tasks/install.js
similarity index 100%
rename from tasks/collections/install.js
rename to tasks/install.js
diff --git a/tasks/collections/build-rtl.js b/tasks/rtl/build.js
similarity index 100%
rename from tasks/collections/build-rtl.js
rename to tasks/rtl/build.js
diff --git a/tasks/collections/watch-rtl.js b/tasks/rtl/watch.js
similarity index 100%
rename from tasks/collections/watch-rtl.js
rename to tasks/rtl/watch.js
diff --git a/tasks/collections/serve-docs.js b/tasks/serve-docs.js
similarity index 100%
rename from tasks/collections/serve-docs.js
rename to tasks/serve-docs.js