Moved out all locations to a new file