Package renaming and refactoring