Refactoring classes and packages names