Moved OCP functions to Ocp source and header