TODO list reorganization