Restructured organization list for more organizations