Refactored location module's packages.