op.h split into op.h and sys_op.h
Merge branch 'op_conversion'
Integration of op.h changes