Changed some links based on things that have been reorganized.