Reorganize
Fix README.md