Improve organization, update README.md