Reorganized files in generator.