Move things around
Merge pull request #3 from lloydmeta/feature/refactoring

Move things around