Reorg and updates README.md