New classes, different names, deleted classes must be listed as .class in Generator.java!!!

Avoid anonymous classes, also switches over enum values due to implicit anonymous classes.