Outlined new classes for each module.