Update readme with roadmap
Rearrange todos