CMake cleanups
comply to the new location of the ORK msg wrappers