Edit and re-organize README