Reorganization of content, updating README.md