Shorten the names of the generate files (& related changes).

Also place generated files in their own directory.  Changed the naming
of two manually created files to be consistent with the other ones in
the directory (namely that "Test" is a suffix, not a prefix).

Change-Id: I268ddd590627e7f07b73d9b9961accf9d5d60354