Name and package refactoring. Part 1