#6

Class generator created and reordered files.