Reorganized layout to be in a single location.
Merge branch 'master' of https://github.com/jurassicplayer/Weeaboository