Moved organizational structure interfaces to giaf contracts