refactoring, fixed confuse in "location" package