Improvements

Here you go - contains my improvements and a few others pulled from other forks I found.

Most destructive change is that all files we're moved from the bundle subfolder to the root (just makes life easier for cloning directly in to bundles folder as per convention)