Regrouped data modules. Created logic module.