Moving RefApp concept management into OCL

@raff There are still some mapping errors like before but for different ones this time. See below