Reorganized a bit
moved some files around
changed around some stuff
Merge pull request #1 from rchipman/ws-1

hi mom