Update README organization and syntax
Merge after resolving conflicts
Fix README and mark done items as done