Cleanup of modules: keep focus on CMS first
Replace config keys according to new kernel scheme