Refactoring Import