refactor and homogeneise internal ocm
work on OCM docs