Code reorganization.
Move datamodule specific code to a different unit