Consolidate extension helper classes to CMS tree