Added a new table of contents and more structured format