Reorganize table of contents, add tools to appendix.