Package renaming refactor