Remove non-README stuff from master
Rearrange README.md