Moved some definitions around in the Data_model module.
(Getting ready to parametrize the module.)