prepare, restructure and cleanup
cleanup
update README.md