classes and packages names refactoring