[WIP] Codegen errors

- [x] Remove duplication of interfaces
- [x] Fix fatal errors
@Ocramius then the only pro could be that it is easier to read? which it isnt IMO.. :-)