Rename files in the Generator folder
Bug fixes and improvements