OPARENT-Refactor CLM project block