reorganizing TODO