Reorganized a bunch of stuff
Moved README.md to correct location