split apart form normalisation and module classes