Restructure the TODO list.