restructure

Changed the structure to be more traditional/brain sense making