Refactoring package name