Improve the readme
cleanup naming, better organization