redone structure

a LOT of moving around to make it easyer to import/export