Refactoring class names and packages