Refactored Generic_Code class interface in codeexport
Merge trinity