More structure, fixed some links.