Reorder chapters, update story and Todos