Import project refactoring
Merge pull request #119 from jlewin/ImportRefactor

Import project refactoring