Thesis structure rewriting + next formatting