Reorder structure and add some more chapters