Refactors in bundles packages.
Merge branch 'master' of github.com:cloudbotio/spidey