reorganize TODO (again)