refactoring packages names