Import project refactoring