Add enums, IMesh etc
Cleanup