Revert "Refactored locations. Initial commit before merging into master."

This reverts commit b535bf35cdb53fb68f3669b701444dc865285645.