refactor package locations