Refactor Import code and add comments
Prepare for 1.0.0 release