Refactored location to own namespace