Refactoring packages and classes