Restore glossary, extra credit pages
Move diagrams and update links to them