diff --git a/Package Managers (v2).alfredworkflow b/Package Managers v1_24.alfredworkflow
similarity index 98%
rename from Package Managers (v2).alfredworkflow
rename to Package Managers v1_24.alfredworkflow
index 603194d..a10c29b 100644
Binary files a/Package Managers (v2).alfredworkflow and b/Package Managers v1_24.alfredworkflow differ
diff --git a/Package Managers.alfredworkflow b/Package Managers.alfredworkflow
index a10c29b..603194d 100644
Binary files a/Package Managers.alfredworkflow and b/Package Managers.alfredworkflow differ
diff --git a/README.md b/README.md
index c3f72c7..bdb625d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-Package Managers ([Download v1.42](https://raw.github.com/willfarrell/alfred-pkgman-workflow/master/Package%20Managers.alfredworkflow))
+Package Managers ([Download v2.0](https://raw.github.com/willfarrell/alfred-pkgman-workflow/master/Package%20Managers.alfredworkflow))
 ======================================
 
-Package Repo Search
+Package Repo Search 
 
-Quick package/plugin/component (repo) lookup of for your favourite package managers. Currently supports *Alcatraz* to *Yeoman Generators*. 
+Quick package/plugin/component (repo) lookup of for your favourite package managers. Currently supports *Alcatraz* to *Yeoman Generators*.
 
 ## Commands
 `pkgman cleardb`: Clear local database cache files
@@ -42,72 +42,28 @@ Workflows can break from time to time due to changes by the provider of the repo
 
 All repos have caching enabled to speed up common queries. These caches are refreshed after 14 days and may take longer then expected to return results during update. You can force a cache refresh by running `pkgman cachedb` to re-download the databases (applies to `alcatraz`, `grunt`, `cocoa`). Alternatively you can run `pkgman cleardb` to remove all stored cache, but this isn't recommended. Clearing your cache is recommended after an update if the package manager you use had a bug previously.
 
-**js, css, html:** `bower {query}`
+The Python Package Index is very slow due to a lack on API and pagination. A min query length has been put in place to help speed this up. You can change it in the script, `$min_query_length = 3`. Perhaps someone with a python background can improve this.
 
 ![alt text][bower]
-
-**node.js:** `npm {query}`
-
 ![alt text][npm]
-
-**Yeoman Generators:** `yo {query}`
-
 ![alt text][yo]
-
-**node.js task runner:** `grunt {query}`
-
 ![alt text][grunt]
-
-**node.js task runner Gulp:** `gulp {query}`
-
 ![alt text][gulp]
-
-**XCode:** `alcatraz {query}`, `cocoa {query}`
-
-CocoaPods can be upgraded to CocoaDocs by changing `$apple_docs` to true in the script.
-
+![alt text][gulp]
 ![alt text][alcatraz]
 ![alt text][cocoa]
-
-**PHP:** `composer {query}`, `pear {query}`
-
 ![alt text][composer]
 ![alt text][pear]
-
-**Python:** `pypi {query}`
-
-The Python Package Index is very slow due to a lack on API and pagaination. A min query length has been put in place to help speed this up. You can change it in the script, `$min_query_length = 3`. Perhaps someone with a python background can improve this.
-
 ![alt text][pypi]
-
-**Ruby:** `gems {query}`
-
 ![alt text][gems]
-
-**Java** `maven {query}`
-
 ![alt text][maven]
-
-**Mac OS X:** `brew {query}` (aka *homebrew*)
-
 ![alt text][brew]
-
-**Linux:** `rpm {query}`
-
 ![alt text][rpm]
-
-**Linux containers:** `docker {query}`
-
 ![alt text][docker]
 
-**Chef Cookbooks:** `chef {query}`
-
-![Screenshot of a search of Chef Supermarket][chef]
-
 [alcatraz]: ./screenshots/alcatraz.png "Sample alcatraz result"
 [bower]: ./screenshots/bower.png "Sample bower result"
 [brew]: ./screenshots/brew.png "Sample brew result"
-[chef]: ./screenshots/chef.png "Sample chef result"
 [cocoa]: ./screenshots/cocoa.png "Sample cocoa result"
 [composer]: ./screenshots/composer.png "Sample composer result"
 [docker]: ./screenshots/docker.png "Sample docker result"
diff --git a/current-version.json b/current-version.json
index eea4419..7eb0c2d 100644
--- a/current-version.json
+++ b/current-version.json
@@ -1,5 +1,5 @@
 {
-	"version": 1.42,
+	"version": 2.0,
 	"download_url": "https://raw.github.com/willfarrell/alfred-pkgman-workflow/master/Package%20Managers.alfredworkflow",
 	"description": "Package Repo Search"
 }
diff --git a/src/icon-cache/alcatraz.png b/icon-cache/alcatraz.png
similarity index 100%
rename from src/icon-cache/alcatraz.png
rename to icon-cache/alcatraz.png
diff --git a/src/icon-cache/apt-get.png b/icon-cache/apt-get.png
similarity index 100%
rename from src/icon-cache/apt-get.png
rename to icon-cache/apt-get.png
diff --git a/src/icon-cache/bower.png b/icon-cache/bower.png
similarity index 100%
rename from src/icon-cache/bower.png
rename to icon-cache/bower.png
diff --git a/src/icon-cache/brew.png b/icon-cache/brew.png
similarity index 100%
rename from src/icon-cache/brew.png
rename to icon-cache/brew.png
diff --git a/src/icon-cache/chef.png b/icon-cache/chef.png
similarity index 100%
rename from src/icon-cache/chef.png
rename to icon-cache/chef.png
diff --git a/src/icon-cache/cocoa.png b/icon-cache/cocoa.png
similarity index 100%
rename from src/icon-cache/cocoa.png
rename to icon-cache/cocoa.png
diff --git a/src/icon-cache/composer.png b/icon-cache/composer.png
similarity index 100%
rename from src/icon-cache/composer.png
rename to icon-cache/composer.png
diff --git a/src/icon-cache/docker.png b/icon-cache/docker.png
similarity index 100%
rename from src/icon-cache/docker.png
rename to icon-cache/docker.png
diff --git a/src/icon-cache/gems.png b/icon-cache/gems.png
similarity index 100%
rename from src/icon-cache/gems.png
rename to icon-cache/gems.png
diff --git a/src/icon-cache/gradle.png b/icon-cache/gradle.png
similarity index 100%
rename from src/icon-cache/gradle.png
rename to icon-cache/gradle.png
diff --git a/src/icon-cache/grunt.png b/icon-cache/grunt.png
similarity index 100%
rename from src/icon-cache/grunt.png
rename to icon-cache/grunt.png
diff --git a/src/icon-cache/gulp.png b/icon-cache/gulp.png
similarity index 100%
rename from src/icon-cache/gulp.png
rename to icon-cache/gulp.png
diff --git a/src/icon-cache/icon.png b/icon-cache/icon.png
similarity index 100%
rename from src/icon-cache/icon.png
rename to icon-cache/icon.png
diff --git a/src/icon-cache/maven.png b/icon-cache/maven.png
similarity index 100%
rename from src/icon-cache/maven.png
rename to icon-cache/maven.png
diff --git a/src/icon-cache/npm.png b/icon-cache/npm.png
similarity index 100%
rename from src/icon-cache/npm.png
rename to icon-cache/npm.png
diff --git a/src/icon-cache/pear.png b/icon-cache/pear.png
similarity index 100%
rename from src/icon-cache/pear.png
rename to icon-cache/pear.png
diff --git a/src/icon-cache/puppet.png b/icon-cache/puppet.png
similarity index 100%
rename from src/icon-cache/puppet.png
rename to icon-cache/puppet.png
diff --git a/src/icon-cache/pypi.png b/icon-cache/pypi.png
similarity index 100%
rename from src/icon-cache/pypi.png
rename to icon-cache/pypi.png
diff --git a/src/icon-cache/raspbian.png b/icon-cache/raspbian.png
similarity index 100%
rename from src/icon-cache/raspbian.png
rename to icon-cache/raspbian.png
diff --git a/src/icon-cache/rpm.png b/icon-cache/rpm.png
similarity index 100%
rename from src/icon-cache/rpm.png
rename to icon-cache/rpm.png
diff --git a/src/icon-cache/terminal.png b/icon-cache/terminal.png
similarity index 100%
rename from src/icon-cache/terminal.png
rename to icon-cache/terminal.png
diff --git a/src/icon-cache/xcode.png b/icon-cache/xcode.png
similarity index 100%
rename from src/icon-cache/xcode.png
rename to icon-cache/xcode.png
diff --git a/src/icon-cache/yo.png b/icon-cache/yo.png
similarity index 100%
rename from src/icon-cache/yo.png
rename to icon-cache/yo.png
diff --git a/src/icon-src/alcatraz.old.png b/icon-src/alcatraz.old.png
similarity index 100%
rename from src/icon-src/alcatraz.old.png
rename to icon-src/alcatraz.old.png
diff --git a/src/icon-src/alcatraz.png b/icon-src/alcatraz.png
similarity index 100%
rename from src/icon-src/alcatraz.png
rename to icon-src/alcatraz.png
diff --git a/src/icon-src/apt-get.png b/icon-src/apt-get.png
similarity index 100%
rename from src/icon-src/apt-get.png
rename to icon-src/apt-get.png
diff --git a/src/icon-src/bower.png b/icon-src/bower.png
similarity index 100%
rename from src/icon-src/bower.png
rename to icon-src/bower.png
diff --git a/src/icon-src/brew.png b/icon-src/brew.png
similarity index 100%
rename from src/icon-src/brew.png
rename to icon-src/brew.png
diff --git a/src/icon-src/chef.png b/icon-src/chef.png
similarity index 100%
rename from src/icon-src/chef.png
rename to icon-src/chef.png
diff --git a/src/icon-src/cocoa.png b/icon-src/cocoa.png
similarity index 100%
rename from src/icon-src/cocoa.png
rename to icon-src/cocoa.png
diff --git a/src/icon-src/composer.png b/icon-src/composer.png
similarity index 100%
rename from src/icon-src/composer.png
rename to icon-src/composer.png
diff --git a/src/icon-src/docker.png b/icon-src/docker.png
similarity index 100%
rename from src/icon-src/docker.png
rename to icon-src/docker.png
diff --git a/src/icon-src/gems.png b/icon-src/gems.png
similarity index 100%
rename from src/icon-src/gems.png
rename to icon-src/gems.png
diff --git a/src/icon-src/gradle.png b/icon-src/gradle.png
similarity index 100%
rename from src/icon-src/gradle.png
rename to icon-src/gradle.png
diff --git a/src/icon-src/grunt.png b/icon-src/grunt.png
similarity index 100%
rename from src/icon-src/grunt.png
rename to icon-src/grunt.png
diff --git a/src/icon-src/gulp.png b/icon-src/gulp.png
similarity index 100%
rename from src/icon-src/gulp.png
rename to icon-src/gulp.png
diff --git a/src/icon-src/maven.png b/icon-src/maven.png
similarity index 100%
rename from src/icon-src/maven.png
rename to icon-src/maven.png
diff --git a/src/icon-src/npm.png b/icon-src/npm.png
similarity index 100%
rename from src/icon-src/npm.png
rename to icon-src/npm.png
diff --git a/src/icon-src/pear.png b/icon-src/pear.png
similarity index 100%
rename from src/icon-src/pear.png
rename to icon-src/pear.png
diff --git a/src/icon-src/puppet.png b/icon-src/puppet.png
similarity index 100%
rename from src/icon-src/puppet.png
rename to icon-src/puppet.png
diff --git a/src/icon-src/pypi.png b/icon-src/pypi.png
similarity index 100%
rename from src/icon-src/pypi.png
rename to icon-src/pypi.png
diff --git a/src/icon-src/raspbian.png b/icon-src/raspbian.png
similarity index 100%
rename from src/icon-src/raspbian.png
rename to icon-src/raspbian.png
diff --git a/src/icon-src/rpm.png b/icon-src/rpm.png
similarity index 100%
rename from src/icon-src/rpm.png
rename to icon-src/rpm.png
diff --git a/src/icon-src/terminal.png b/icon-src/terminal.png
similarity index 100%
rename from src/icon-src/terminal.png
rename to icon-src/terminal.png
diff --git a/src/icon-src/twitter.png b/icon-src/twitter.png
similarity index 100%
rename from src/icon-src/twitter.png
rename to icon-src/twitter.png
diff --git a/src/icon-src/xcode.png b/icon-src/xcode.png
similarity index 100%
rename from src/icon-src/xcode.png
rename to icon-src/xcode.png
diff --git a/src/icon-src/yo.png b/icon-src/yo.png
similarity index 100%
rename from src/icon-src/yo.png
rename to icon-src/yo.png
diff --git a/src/icon.png b/icon.png
similarity index 100%
rename from src/icon.png
rename to icon.png
diff --git a/icon.psd b/icon.psd
new file mode 100644
index 0000000..ca03279
Binary files /dev/null and b/icon.psd differ
diff --git a/src/v1/_template_.v1.php b/v1/_template_.v1.php
similarity index 100%
rename from src/v1/_template_.v1.php
rename to v1/_template_.v1.php
diff --git a/src/v1/alcatraz.v1.php b/v1/alcatraz.v1.php
similarity index 100%
rename from src/v1/alcatraz.v1.php
rename to v1/alcatraz.v1.php
diff --git a/src/v1/apt-get.v1.php b/v1/apt-get.v1.php
similarity index 100%
rename from src/v1/apt-get.v1.php
rename to v1/apt-get.v1.php
diff --git a/src/v1/bower.v1.php b/v1/bower.v1.php
similarity index 100%
rename from src/v1/bower.v1.php
rename to v1/bower.v1.php
diff --git a/src/v1/brew.v1.php b/v1/brew.v1.php
similarity index 100%
rename from src/v1/brew.v1.php
rename to v1/brew.v1.php
diff --git a/src/v1/chef.v1.php b/v1/chef.v1.php
similarity index 100%
rename from src/v1/chef.v1.php
rename to v1/chef.v1.php
diff --git a/src/v1/cocoa.v1.php b/v1/cocoa.v1.php
similarity index 100%
rename from src/v1/cocoa.v1.php
rename to v1/cocoa.v1.php
diff --git a/src/v1/composer.v1.php b/v1/composer.v1.php
similarity index 100%
rename from src/v1/composer.v1.php
rename to v1/composer.v1.php
diff --git a/src/v1/docker.v1.php b/v1/docker.v1.php
similarity index 100%
rename from src/v1/docker.v1.php
rename to v1/docker.v1.php
diff --git a/src/v1/gems.v1.php b/v1/gems.v1.php
similarity index 100%
rename from src/v1/gems.v1.php
rename to v1/gems.v1.php
diff --git a/src/v1/gradle.v1.php b/v1/gradle.v1.php
similarity index 100%
rename from src/v1/gradle.v1.php
rename to v1/gradle.v1.php
diff --git a/src/v1/grunt.v1.php b/v1/grunt.v1.php
similarity index 100%
rename from src/v1/grunt.v1.php
rename to v1/grunt.v1.php
diff --git a/src/v1/gulp.v1.php b/v1/gulp.v1.php
similarity index 100%
rename from src/v1/gulp.v1.php
rename to v1/gulp.v1.php
diff --git a/src/v1/maven.v1.php b/v1/maven.v1.php
similarity index 100%
rename from src/v1/maven.v1.php
rename to v1/maven.v1.php
diff --git a/src/v1/npm.v1.php b/v1/npm.v1.php
similarity index 100%
rename from src/v1/npm.v1.php
rename to v1/npm.v1.php
diff --git a/src/v1/pear.v1.php b/v1/pear.v1.php
similarity index 100%
rename from src/v1/pear.v1.php
rename to v1/pear.v1.php
diff --git a/src/v1/puppet.v1.php b/v1/puppet.v1.php
similarity index 100%
rename from src/v1/puppet.v1.php
rename to v1/puppet.v1.php
diff --git a/src/v1/pypi.v1.broken.php b/v1/pypi.v1.broken.php
similarity index 100%
rename from src/v1/pypi.v1.broken.php
rename to v1/pypi.v1.broken.php
diff --git a/src/v1/pypi.v1.php b/v1/pypi.v1.php
similarity index 100%
rename from src/v1/pypi.v1.php
rename to v1/pypi.v1.php
diff --git a/src/v1/rpm.v1.php b/v1/rpm.v1.php
similarity index 100%
rename from src/v1/rpm.v1.php
rename to v1/rpm.v1.php
diff --git a/src/v1/yo.v1.php b/v1/yo.v1.php
similarity index 100%
rename from src/v1/yo.v1.php
rename to v1/yo.v1.php
diff --git a/src/.tmp b/v2/.tmp
similarity index 100%
rename from src/.tmp
rename to v2/.tmp
diff --git a/src/_template_.php b/v2/_template_.php
similarity index 100%
rename from src/_template_.php
rename to v2/_template_.php
diff --git a/src/alcatraz.php b/v2/alcatraz.php
similarity index 100%
rename from src/alcatraz.php
rename to v2/alcatraz.php
diff --git a/src/apt-get.php b/v2/apt-get.php
similarity index 100%
rename from src/apt-get.php
rename to v2/apt-get.php
diff --git a/src/bower.php b/v2/bower.php
similarity index 100%
rename from src/bower.php
rename to v2/bower.php
diff --git a/src/brew.php b/v2/brew.php
similarity index 100%
rename from src/brew.php
rename to v2/brew.php
diff --git a/src/cache.php b/v2/cache.php
similarity index 100%
rename from src/cache.php
rename to v2/cache.php
diff --git a/src/chef.php b/v2/chef.php
similarity index 100%
rename from src/chef.php
rename to v2/chef.php
diff --git a/src/clear.php b/v2/clear.php
similarity index 100%
rename from src/clear.php
rename to v2/clear.php
diff --git a/src/cocoa.php b/v2/cocoa.php
similarity index 100%
rename from src/cocoa.php
rename to v2/cocoa.php
diff --git a/src/composer.php b/v2/composer.php
similarity index 100%
rename from src/composer.php
rename to v2/composer.php
diff --git a/src/docker.php b/v2/docker.php
similarity index 100%
rename from src/docker.php
rename to v2/docker.php
diff --git a/src/gems.php b/v2/gems.php
similarity index 100%
rename from src/gems.php
rename to v2/gems.php
diff --git a/src/gradle.php b/v2/gradle.php
similarity index 100%
rename from src/gradle.php
rename to v2/gradle.php
diff --git a/src/grunt.php b/v2/grunt.php
similarity index 100%
rename from src/grunt.php
rename to v2/grunt.php
diff --git a/src/gulp.php b/v2/gulp.php
similarity index 100%
rename from src/gulp.php
rename to v2/gulp.php
diff --git a/src/maven.php b/v2/maven.php
similarity index 100%
rename from src/maven.php
rename to v2/maven.php
diff --git a/src/npm.php b/v2/npm.php
similarity index 100%
rename from src/npm.php
rename to v2/npm.php
diff --git a/src/pear.php b/v2/pear.php
similarity index 100%
rename from src/pear.php
rename to v2/pear.php
diff --git a/src/puppet.php b/v2/puppet.php
similarity index 100%
rename from src/puppet.php
rename to v2/puppet.php
diff --git a/src/pypi.php b/v2/pypi.php
similarity index 100%
rename from src/pypi.php
rename to v2/pypi.php
diff --git a/src/raspbian.php b/v2/raspbian.php
similarity index 100%
rename from src/raspbian.php
rename to v2/raspbian.php
diff --git a/src/rpm.php b/v2/rpm.php
similarity index 100%
rename from src/rpm.php
rename to v2/rpm.php
diff --git a/src/update.php b/v2/update.php
similarity index 100%
rename from src/update.php
rename to v2/update.php
diff --git a/src/workflows.php b/v2/workflows.php
similarity index 100%
rename from src/workflows.php
rename to v2/workflows.php
diff --git a/src/yo.php b/v2/yo.php
similarity index 100%
rename from src/yo.php
rename to v2/yo.php