Reordered the table of contents to make it look more logical