Update README & rearrange