diff --git a/src/app/zap_cluster_list.json b/src/app/zap_cluster_list.json
index 9d0a3dfc082ac7..3ae1902bb9f227 100644
--- a/src/app/zap_cluster_list.json
+++ b/src/app/zap_cluster_list.json
@@ -1,7 +1,95 @@
 {
+    "ClientDirectories": {
+        "ACCESS_CONTROL_CLUSTER": [],
+        "ACCOUNT_LOGIN_CLUSTER": [],
+        "ACTIONS_CLUSTER": [],
+        "ADMINISTRATOR_COMMISSIONING_CLUSTER": [],
+        "ALARM_CLUSTER": [],
+        "APPLICATION_BASIC_CLUSTER": [],
+        "APPLICATION_LAUNCHER_CLUSTER": [],
+        "AUDIO_OUTPUT_CLUSTER": [],
+        "BALLAST_CONFIGURATION_CLUSTER": [],
+        "BARRIER_CONTROL_CLUSTER": [],
+        "BASIC_INFORMATION_CLUSTER": [],
+        "BINARY_INPUT_BASIC_CLUSTER": [],
+        "BINDING_CLUSTER": [],
+        "BOOLEAN_STATE_CLUSTER": [],
+        "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
+        "CHANNEL_CLUSTER": [],
+        "CLIENT_MONITORING_CLUSTER": [],
+        "COLOR_CONTROL_CLUSTER": [],
+        "COMMISSIONING_CLUSTER": [],
+        "CONTENT_LAUNCHER_CLUSTER": [],
+        "DESCRIPTOR_CLUSTER": [],
+        "DEVICE_TEMP_CLUSTER": [],
+        "DIAGNOSTIC_LOGS_CLUSTER": [],
+        "DOOR_LOCK_CLUSTER": [],
+        "ELECTRICAL_MEASUREMENT_CLUSTER": [],
+        "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "FAN_CONTROL_CLUSTER": [],
+        "FAULT_INJECTION_CLUSTER": [],
+        "FIXED_LABEL_CLUSTER": [],
+        "FLOW_MEASUREMENT_CLUSTER": [],
+        "GENERAL_COMMISSIONING_CLUSTER": [],
+        "GENERAL_DIAGNOSTICS_CLUSTER": [],
+        "GROUP_KEY_MANAGEMENT_CLUSTER": [],
+        "GROUPS_CLUSTER": [],
+        "IAS_ZONE_CLUSTER": [],
+        "IDENTIFY_CLUSTER": [],
+        "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
+        "KEYPAD_INPUT_CLUSTER": [],
+        "LEVEL_CONTROL_CLUSTER": [],
+        "LOCALIZATION_CONFIGURATION_CLUSTER": [],
+        "LOW_POWER_CLUSTER": [],
+        "MEDIA_INPUT_CLUSTER": [],
+        "MEDIA_PLAYBACK_CLUSTER": [],
+        "MODE_SELECT_CLUSTER": [],
+        "NETWORK_COMMISSIONING_CLUSTER": [],
+        "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
+        "ON_OFF_CLUSTER": [],
+        "ON_OFF_SWITCH_CONFIGURATION_CLUSTER": [],
+        "OPERATIONAL_CREDENTIALS_CLUSTER": [],
+        "OTA_BOOTLOAD_CLUSTER": [],
+        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
+        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
+        "POLL_CONTROL_CLUSTER": [],
+        "POWER_CONFIG_CLUSTER": [],
+        "POWER_PROFILE_CLUSTER": [],
+        "POWER_SOURCE_CLUSTER": [],
+        "POWER_SOURCE_CONFIGURATION_CLUSTER": [],
+        "PRESSURE_MEASUREMENT_CLUSTER": [],
+        "PROXY_CONFIGURATION_CLUSTER": [],
+        "PROXY_DISCOVERY_CLUSTER": [],
+        "PROXY_VALID_CLUSTER": [],
+        "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
+            "pump-configuration-and-control-client"
+        ],
+        "PWM_CLUSTER": [],
+        "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
+        "SCENES_CLUSTER": [],
+        "SOFTWARE_DIAGNOSTICS_CLUSTER": [],
+        "SWITCH_CLUSTER": [],
+        "TARGET_NAVIGATOR_CLUSTER": [],
+        "TEMPERATURE_MEASUREMENT_CLUSTER": [],
+        "THERMOSTAT_CLUSTER": ["thermostat-client"],
+        "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
+        "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "TIME_CLUSTER": [],
+        "TIME_FORMAT_LOCALIZATION_CLUSTER": [],
+        "TIME_SYNCHRONIZATION_CLUSTER": [],
+        "TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
+        "UNIT_LOCALIZATION_CLUSTER": [],
+        "UNIT_TESTING_CLUSTER": [],
+        "USER_LABEL_CLUSTER": [],
+        "WAKE_ON_LAN_CLUSTER": [],
+        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
+        "WINDOW_COVERING_CLUSTER": [],
+        "ZLL_COMMISSIONING_CLUSTER": []
+    },
     "ServerDirectories": {
         "ACCESS_CONTROL_CLUSTER": ["access-control-server"],
         "ACCOUNT_LOGIN_CLUSTER": ["account-login-server"],
+        "ACTIONS_CLUSTER": [],
         "ADMINISTRATOR_COMMISSIONING_CLUSTER": [
             "administrator-commissioning-server"
         ],
@@ -15,7 +103,6 @@
         "BINARY_INPUT_BASIC_CLUSTER": [],
         "BINDING_CLUSTER": ["bindings"],
         "BOOLEAN_STATE_CLUSTER": [],
-        "ACTIONS_CLUSTER": [],
         "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [
             "bridged-device-basic-information-server"
         ],
@@ -32,8 +119,8 @@
         "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [
             "ethernet-network-diagnostics-server"
         ],
-        "FAULT_INJECTION_CLUSTER": ["fault-injection-server"],
         "FAN_CONTROL_CLUSTER": ["fan-control-server"],
+        "FAULT_INJECTION_CLUSTER": ["fault-injection-server"],
         "FIXED_LABEL_CLUSTER": ["fixed-label-server"],
         "FLOW_MEASUREMENT_CLUSTER": [],
         "GENERAL_COMMISSIONING_CLUSTER": ["general-commissioning-server"],
@@ -60,13 +147,13 @@
         "OTA_BOOTLOAD_CLUSTER": [],
         "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": ["ota-provider"],
         "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": ["ota-requestor"],
+        "POLL_CONTROL_CLUSTER": [],
+        "POWER_CONFIG_CLUSTER": [],
+        "POWER_PROFILE_CLUSTER": [],
         "POWER_SOURCE_CLUSTER": ["power-source-server"],
         "POWER_SOURCE_CONFIGURATION_CLUSTER": [
             "power-source-configuration-server"
         ],
-        "POLL_CONTROL_CLUSTER": [],
-        "POWER_CONFIG_CLUSTER": [],
-        "POWER_PROFILE_CLUSTER": [],
         "PRESSURE_MEASUREMENT_CLUSTER": [],
         "PROXY_CONFIGURATION_CLUSTER": [],
         "PROXY_DISCOVERY_CLUSTER": [],
@@ -81,7 +168,6 @@
         "SWITCH_CLUSTER": ["switch-server"],
         "TARGET_NAVIGATOR_CLUSTER": ["target-navigator-server"],
         "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-        "UNIT_TESTING_CLUSTER": ["test-cluster-server"],
         "THERMOSTAT_CLUSTER": ["thermostat-server"],
         "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [
             "thermostat-user-interface-configuration-server"
@@ -93,97 +179,11 @@
         "TIME_FORMAT_LOCALIZATION_CLUSTER": ["time-format-localization-server"],
         "TIME_SYNCHRONIZATION_CLUSTER": [],
         "UNIT_LOCALIZATION_CLUSTER": [],
+        "UNIT_TESTING_CLUSTER": ["test-cluster-server"],
         "USER_LABEL_CLUSTER": ["user-label-server"],
         "WAKE_ON_LAN_CLUSTER": ["wake-on-lan-server"],
         "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": ["wifi-network-diagnostics-server"],
         "WINDOW_COVERING_CLUSTER": ["window-covering-server"],
         "ZLL_COMMISSIONING_CLUSTER": []
-    },
-    "ClientDirectories": {
-        "ACCESS_CONTROL_CLUSTER": [],
-        "ACCOUNT_LOGIN_CLUSTER": [],
-        "ADMINISTRATOR_COMMISSIONING_CLUSTER": [],
-        "ALARM_CLUSTER": [],
-        "APPLICATION_BASIC_CLUSTER": [],
-        "APPLICATION_LAUNCHER_CLUSTER": [],
-        "AUDIO_OUTPUT_CLUSTER": [],
-        "BALLAST_CONFIGURATION_CLUSTER": [],
-        "BARRIER_CONTROL_CLUSTER": [],
-        "BASIC_INFORMATION_CLUSTER": [],
-        "BINARY_INPUT_BASIC_CLUSTER": [],
-        "BINDING_CLUSTER": [],
-        "BOOLEAN_STATE_CLUSTER": [],
-        "ACTIONS_CLUSTER": [],
-        "BRIDGED_DEVICE_BASIC_INFORMATION_CLUSTER": [],
-        "CHANNEL_CLUSTER": [],
-        "CLIENT_MONITORING_CLUSTER": [],
-        "COLOR_CONTROL_CLUSTER": [],
-        "COMMISSIONING_CLUSTER": [],
-        "CONTENT_LAUNCHER_CLUSTER": [],
-        "DESCRIPTOR_CLUSTER": [],
-        "DEVICE_TEMP_CLUSTER": [],
-        "DIAGNOSTIC_LOGS_CLUSTER": [],
-        "DOOR_LOCK_CLUSTER": [],
-        "ELECTRICAL_MEASUREMENT_CLUSTER": [],
-        "ETHERNET_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "FAULT_INJECTION_CLUSTER": [],
-        "FAN_CONTROL_CLUSTER": [],
-        "FIXED_LABEL_CLUSTER": [],
-        "FLOW_MEASUREMENT_CLUSTER": [],
-        "GENERAL_COMMISSIONING_CLUSTER": [],
-        "GENERAL_DIAGNOSTICS_CLUSTER": [],
-        "GROUP_KEY_MANAGEMENT_CLUSTER": [],
-        "GROUPS_CLUSTER": [],
-        "IAS_ZONE_CLUSTER": [],
-        "IDENTIFY_CLUSTER": [],
-        "ILLUMINANCE_MEASUREMENT_CLUSTER": [],
-        "KEYPAD_INPUT_CLUSTER": [],
-        "LEVEL_CONTROL_CLUSTER": [],
-        "LOCALIZATION_CONFIGURATION_CLUSTER": [],
-        "LOW_POWER_CLUSTER": [],
-        "MEDIA_INPUT_CLUSTER": [],
-        "MEDIA_PLAYBACK_CLUSTER": [],
-        "MODE_SELECT_CLUSTER": [],
-        "NETWORK_COMMISSIONING_CLUSTER": [],
-        "OCCUPANCY_SENSING_CLUSTER": ["occupancy-sensor-server"],
-        "ON_OFF_CLUSTER": [],
-        "ON_OFF_SWITCH_CONFIGURATION_CLUSTER": [],
-        "OPERATIONAL_CREDENTIALS_CLUSTER": [],
-        "OTA_BOOTLOAD_CLUSTER": [],
-        "OTA_SOFTWARE_UPDATE_PROVIDER_CLUSTER": [],
-        "OTA_SOFTWARE_UPDATE_REQUESTOR_CLUSTER": [],
-        "POLL_CONTROL_CLUSTER": [],
-        "POWER_CONFIG_CLUSTER": [],
-        "POWER_PROFILE_CLUSTER": [],
-        "POWER_SOURCE_CLUSTER": [],
-        "POWER_SOURCE_CONFIGURATION_CLUSTER": [],
-        "PRESSURE_MEASUREMENT_CLUSTER": [],
-        "PROXY_CONFIGURATION_CLUSTER": [],
-        "PROXY_DISCOVERY_CLUSTER": [],
-        "PROXY_VALID_CLUSTER": [],
-        "PUMP_CONFIGURATION_AND_CONTROL_CLUSTER": [
-            "pump-configuration-and-control-client"
-        ],
-        "PWM_CLUSTER": [],
-        "RELATIVE_HUMIDITY_MEASUREMENT_CLUSTER": [],
-        "SCENES_CLUSTER": [],
-        "SOFTWARE_DIAGNOSTICS_CLUSTER": [],
-        "SWITCH_CLUSTER": [],
-        "TARGET_NAVIGATOR_CLUSTER": [],
-        "TEMPERATURE_MEASUREMENT_CLUSTER": [],
-        "UNIT_TESTING_CLUSTER": [],
-        "THERMOSTAT_CLUSTER": ["thermostat-client"],
-        "THERMOSTAT_USER_INTERFACE_CONFIGURATION_CLUSTER": [],
-        "THREAD_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "TIME_CLUSTER": [],
-        "TIME_FORMAT_LOCALIZATION_CLUSTER": [],
-        "TIME_SYNCHRONIZATION_CLUSTER": [],
-        "TRUSTED_ROOT_CERTIFICATES_CLUSTER": [],
-        "UNIT_LOCALIZATION_CLUSTER": [],
-        "USER_LABEL_CLUSTER": [],
-        "WAKE_ON_LAN_CLUSTER": [],
-        "WIFI_NETWORK_DIAGNOSTICS_CLUSTER": [],
-        "WINDOW_COVERING_CLUSTER": [],
-        "ZLL_COMMISSIONING_CLUSTER": []
     }
 }