Fix readme
Rearrange things