Adding table of contents, reworking structure