First restructuring to oclenv and oclptxhandler separation