Reorg and redesign

-reorg the files
-starting to style it out