Updating ToDo, capturing modules restructuring concept.