commit after reorganization todo-list