rearrange and update readme