Big restructuration of NodeCM, renamed Comma for the occasion