Folder change and little bit of a tidy up.
Merge branch 'master' of https://github.com/FailMelon/Gear