Import refactoring