refactoring (packages, class names, etc.)