Reorganised TODO.md