Package and class name refactoring. Part 2.