Refactoring packages names