Reorganized the TODO list, no functional changes.