Update and Clean up

All other links should probably also include the .xml in the name.