Reorganized TODO lists