Reorg

Reorganized everything so that machine specific stuff stays off the repo
and also made directories for everything.