Refactoring: class moved to another package