Moved enums to the correct source tree

Increased the flexibility of the generator