DAT-2182 Store character module data in props, move module upwards