package name refactoring