Refactoring package class names