more file structure fixes and import fixes
Merge pull request #2 from jacobwagner/master

more file structure fixes and import fixes