Moving some files about and renaming things to be a little more consistent and cleaner.