redone structure

a LOT of moving around to make it easyer to import/export
Merge pull request #18 from MadPC/1.4.6_redo

redone structure