Refactor location import into class structure