Refactor OCL functionality file arrangement (OCLFunctions was huge)