More work on restructuring data model and business objects.