merge AbstractBasicOrgUnit with AbstractExtendedOrgUnit to AbstractOrgUnit (and corresponding builder).