Location restructure
Merge pull request #31 from TommyIsGod/master

Location restructure