Refactor for a single control module (cdo) by creating similarly named classes