Move team settings into organization settings