re-organize strucure of org-unit-domain-objects and -builders.