name and packages refactoring