Merge pull request #429 from karyon/fixes

Fixes
initial cleanup and refactoring for the importer overhaul
restructure the importer. no new functionality yet.