Moving the generated classes out into their own files.
More moving and renaming of generated classes.