Change the package of Kotlin cluster lib to package matter.controller.cluster.clusters (#30945)

diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
index adec2e8..5e80ef1 100644
--- a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImInvokeCommand.kt
@@ -22,7 +22,7 @@
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.IdentifyCluster
+import matter.controller.cluster.clusters.IdentifyCluster
 
 class PairOnNetworkLongImInvokeCommand(
   controller: MatterController,
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
index 73aff84..ba4ae1a 100644
--- a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImReadCommand.kt
@@ -5,7 +5,7 @@
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.BasicInformationCluster
+import matter.controller.cluster.clusters.BasicInformationCluster
 
 class PairOnNetworkLongImReadCommand(controller: MatterController, credsIssue: CredentialsIssuer?) :
   PairingCommand(
diff --git a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
index bfe0173..f87d827 100644
--- a/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
+++ b/examples/kotlin-matter-controller/java/src/com/matter/controller/commands/pairing/PairOnNetworkLongImWriteCommand.kt
@@ -22,7 +22,7 @@
 import java.util.logging.Logger
 import kotlinx.coroutines.runBlocking
 import matter.controller.MatterController
-import matter.devicecontroller.cluster.clusters.BasicInformationCluster
+import matter.controller.cluster.clusters.BasicInformationCluster
 
 class PairOnNetworkLongImWriteCommand(
   controller: MatterController,
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
index 7d1b0d1..c980295 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterClusters.jinja
@@ -121,15 +121,27 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
 import java.time.Duration
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadRequest
+import matter.controller.ReadData
+import matter.controller.ReadFailure
+import matter.controller.ReadResponse
+import matter.controller.SubscribeRequest
+import matter.controller.SubscriptionState
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.AttributeWriteError
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
+import matter.controller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
index e5b40bb..7af63e3 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterEventStructs.jinja
@@ -7,7 +7,7 @@
     List<{{encode_value(source, encodable.without_list(), depth + 1)}}>
   {%- elif encodable.is_struct -%}
     {%- set struct = encodable.get_underlying_struct() -%}
-    matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}
+    matter.controller.cluster.structs.{{source.name}}Cluster{{struct.name}}
   {%- else -%}
     {{encodable.kotlin_type}}
   {%- endif -%}
@@ -63,7 +63,7 @@
       }
   {%- elif encodable.is_struct -%}
       {%- set struct = encodable.get_underlying_struct() -%}
-      matter.devicecontroller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
+      matter.controller.cluster.structs.{{source.name}}Cluster{{struct.name}}.fromTlv({{tag}}, tlvReader)
   {%- else -%}
       tlvReader.get{{encodable.kotlin_type}}({{tag}})
   {%- endif -%}
@@ -89,10 +89,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
index 9094155..d174b40 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterFiles_gni.jinja
@@ -6,7 +6,7 @@
 {%- set typeLookup = idl | createLookupContext(cluster) %}
 {%- for struct in cluster.structs | sort(attribute='name') %}
 {%- if not struct.tag %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/{{cluster.name}}Cluster{{struct.name}}.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/{{cluster.name}}Cluster{{struct.name}}.kt",
 {%- endif %}
 {%- endfor %}
 {%- endfor %}
@@ -17,7 +17,7 @@
 {%- set typeLookup = idl | createLookupContext(cluster) %}
 {%- for event in cluster.events | sort(attribute='name') %}
 {%- if event.fields %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/{{cluster.name}}Cluster{{event.name}}Event.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/{{cluster.name}}Cluster{{event.name}}Event.kt",
 {%- endif %}
 {%- endfor %}
 {%- endfor %}
@@ -26,6 +26,6 @@
 matter_clusters_sources = [
 {%- for cluster in clientClusters | sort(attribute='name') %}
 {%- set typeLookup = idl | createLookupContext(cluster) %}
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/{{cluster.name}}Cluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/{{cluster.name}}Cluster.kt",
 {%- endfor %}
 ]
\ No newline at end of file
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
index 8a8769c..be0e0b9 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/MatterStructs.jinja
@@ -89,10 +89,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
index 7f77078..680c865 100644
--- a/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
+++ b/scripts/py_matter_idl/matter_idl/generators/kotlin/__init__.py
@@ -542,7 +542,7 @@
             else:
                 return "Ljava/lang/Integer;"
         else:
-            return "Lchip/devicecontroller/ChipStructs${}Cluster{};".format(self.context.cluster.name, self.data_type.name)
+            return "Lchip/controller/ChipStructs${}Cluster{};".format(self.context.cluster.name, self.data_type.name)
 
 
 def GlobalEncodableValueFrom(typeName: str, context: TypeLookupContext) -> EncodableValue:
@@ -669,7 +669,7 @@
 
         self.internal_render_one_output(
             template_path="MatterFiles_gni.jinja",
-            output_file_name="java/matter/devicecontroller/cluster/files.gni",
+            output_file_name="java/matter/controller/cluster/files.gni",
             vars={
                 'idl': self.idl,
                 'clientClusters': clientClusters,
@@ -678,7 +678,7 @@
 
         # Generate a `.kt` file for each cluster.
         for cluster in clientClusters:
-            output_name = f"java/matter/devicecontroller/cluster/clusters/{cluster.name}Cluster.kt"
+            output_name = f"java/matter/controller/cluster/clusters/{cluster.name}Cluster.kt"
             self.internal_render_one_output(
                 template_path="MatterClusters.jinja",
                 output_file_name=output_name,
@@ -695,7 +695,7 @@
                 if struct.tag:
                     continue
 
-                output_name = "java/matter/devicecontroller/cluster/structs/{cluster_name}Cluster{struct_name}.kt"
+                output_name = "java/matter/controller/cluster/structs/{cluster_name}Cluster{struct_name}.kt"
                 self.internal_render_one_output(
                     template_path="MatterStructs.jinja",
                     output_file_name=output_name.format(
@@ -712,7 +712,7 @@
                 if not event.fields:
                     continue
 
-                output_name = "java/matter/devicecontroller/cluster/eventstructs/{cluster_name}Cluster{event_name}Event.kt"
+                output_name = "java/matter/controller/cluster/eventstructs/{cluster_name}Cluster{event_name}Event.kt"
                 self.internal_render_one_output(
                     template_path="MatterEventStructs.jinja",
                     output_file_name=output_name.format(
diff --git a/src/controller/java/BUILD.gn b/src/controller/java/BUILD.gn
index 114d82e..588535b 100644
--- a/src/controller/java/BUILD.gn
+++ b/src/controller/java/BUILD.gn
@@ -352,7 +352,7 @@
 
 kotlin_library("kotlin_matter_controller") {
   import(
-      "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni")
+      "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/files.gni")
 
   output_name = "KotlinMatterController.jar"
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
index 28d3f95..fc11bce 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt
index 3c2d77f..f011640 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt
index 176c270..95bd3e7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
index 2467100..a975d6d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt
index 8fe66e1..0044a16 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AirQualityCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/AirQualityCluster.kt
index 206b757..c9f7b32 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AirQualityCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationBasicCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationBasicCluster.kt
index 8a83da6..8971387 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationBasicCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationLauncherCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationLauncherCluster.kt
index 3393c6d..73314cd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationLauncherCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/AudioOutputCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/AudioOutputCluster.kt
index 7313b92..ab200b7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/AudioOutputCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BallastConfigurationCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BallastConfigurationCluster.kt
index 49eb761..439e459 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BallastConfigurationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BarrierControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BarrierControlCluster.kt
index e1376cd..e75a765 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BarrierControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BasicInformationCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BasicInformationCluster.kt
index 4090337..b7d485e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BasicInformationCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BinaryInputBasicCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BinaryInputBasicCluster.kt
index a5745f5..724313e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BinaryInputBasicCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BindingCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BindingCluster.kt
index bcfbfdf..0080e10 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BindingCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanSensorConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanSensorConfigurationCluster.kt
index 9894a45..bee6e84 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanSensorConfigurationCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateCluster.kt
index 4c53219..19e1e52 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
index 9f1e8dc..e80a25e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
index c85c8ef..d76d730 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
index 9d3e2e1..e52a35e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt
index fe007b6..d09b343 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ColorControlCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ColorControlCluster.kt
index 00ae08a..2491ef6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ColorControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentAppObserverCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentAppObserverCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentAppObserverCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ContentAppObserverCluster.kt
index 36945d6..a855e05 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentAppObserverCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentAppObserverCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt
index e68bffe..d238563 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt
index 54d7219..cc57022 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt
index 5d203e3..0e1bd29 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DescriptorCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DescriptorCluster.kt
index a80aa5d..51e88cc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DescriptorCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DeviceEnergyManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DeviceEnergyManagementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt
index 4e61a1b..3adff50 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DeviceEnergyManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt
index 4f86b9b..a40ae5c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherAlarmCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherAlarmCluster.kt
index c6296d3..5684b27 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherAlarmCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherModeCluster.kt
index 4f1e67c..8cda015 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt
index 21a67cf..e97463b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalEnergyMeasurementCluster.kt
similarity index 79%
copy from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
copy to src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalEnergyMeasurementCluster.kt
index 2869e97..b671269 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalEnergyMeasurementCluster.kt
@@ -15,27 +15,39 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
-class IlluminanceMeasurementCluster(
+class ElectricalEnergyMeasurementCluster(
   private val controller: MatterController,
   private val endpointId: UShort
 ) {
-  class MeasuredValueAttribute(val value: UShort?)
+  class AccuracyAttribute(val value: ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct)
 
-  class MinMeasuredValueAttribute(val value: UShort?)
+  class CumulativeEnergyImportedAttribute(
+    val value: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct?
+  )
 
-  class MaxMeasuredValueAttribute(val value: UShort?)
+  class CumulativeEnergyExportedAttribute(
+    val value: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct?
+  )
 
-  class LightSensorTypeAttribute(val value: UByte?)
+  class PeriodicEnergyImportedAttribute(
+    val value: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct?
+  )
+
+  class PeriodicEnergyExportedAttribute(
+    val value: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct?
+  )
 
   class GeneratedCommandListAttribute(val value: List<UInt>)
 
@@ -45,7 +57,7 @@
 
   class AttributeListAttribute(val value: List<UInt>)
 
-  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
+  suspend fun readAccuracyAttribute(): AccuracyAttribute {
     val ATTRIBUTE_ID: UInt = 0u
 
     val attributePath =
@@ -67,22 +79,17 @@
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Measuredvalue attribute not found in response" }
+    requireNotNull(attributeData) { "Accuracy attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort? =
-      if (!tlvReader.isNull()) {
-        tlvReader.getUShort(AnonymousTag)
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
+    val decodedValue: ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct =
+      ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.fromTlv(AnonymousTag, tlvReader)
 
-    return MeasuredValueAttribute(decodedValue)
+    return AccuracyAttribute(decodedValue)
   }
 
-  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
+  suspend fun readCumulativeEnergyImportedAttribute(): CumulativeEnergyImportedAttribute {
     val ATTRIBUTE_ID: UInt = 1u
 
     val attributePath =
@@ -104,22 +111,26 @@
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Minmeasuredvalue attribute not found in response" }
+    requireNotNull(attributeData) { "Cumulativeenergyimported attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort? =
+    val decodedValue: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct? =
       if (!tlvReader.isNull()) {
-        tlvReader.getUShort(AnonymousTag)
+        if (tlvReader.isNextTag(AnonymousTag)) {
+          ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.fromTlv(AnonymousTag, tlvReader)
+        } else {
+          null
+        }
       } else {
         tlvReader.getNull(AnonymousTag)
         null
       }
 
-    return MinMeasuredValueAttribute(decodedValue)
+    return CumulativeEnergyImportedAttribute(decodedValue)
   }
 
-  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
+  suspend fun readCumulativeEnergyExportedAttribute(): CumulativeEnergyExportedAttribute {
     val ATTRIBUTE_ID: UInt = 2u
 
     val attributePath =
@@ -141,22 +152,26 @@
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Maxmeasuredvalue attribute not found in response" }
+    requireNotNull(attributeData) { "Cumulativeenergyexported attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort? =
+    val decodedValue: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct? =
       if (!tlvReader.isNull()) {
-        tlvReader.getUShort(AnonymousTag)
+        if (tlvReader.isNextTag(AnonymousTag)) {
+          ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.fromTlv(AnonymousTag, tlvReader)
+        } else {
+          null
+        }
       } else {
         tlvReader.getNull(AnonymousTag)
         null
       }
 
-    return MaxMeasuredValueAttribute(decodedValue)
+    return CumulativeEnergyExportedAttribute(decodedValue)
   }
 
-  suspend fun readToleranceAttribute(): UShort? {
+  suspend fun readPeriodicEnergyImportedAttribute(): PeriodicEnergyImportedAttribute {
     val ATTRIBUTE_ID: UInt = 3u
 
     val attributePath =
@@ -178,21 +193,26 @@
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Tolerance attribute not found in response" }
+    requireNotNull(attributeData) { "Periodicenergyimported attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUShort(AnonymousTag)
+    val decodedValue: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct? =
+      if (!tlvReader.isNull()) {
+        if (tlvReader.isNextTag(AnonymousTag)) {
+          ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.fromTlv(AnonymousTag, tlvReader)
+        } else {
+          null
+        }
       } else {
+        tlvReader.getNull(AnonymousTag)
         null
       }
 
-    return decodedValue
+    return PeriodicEnergyImportedAttribute(decodedValue)
   }
 
-  suspend fun readLightSensorTypeAttribute(): LightSensorTypeAttribute {
+  suspend fun readPeriodicEnergyExportedAttribute(): PeriodicEnergyExportedAttribute {
     val ATTRIBUTE_ID: UInt = 4u
 
     val attributePath =
@@ -214,14 +234,14 @@
         it.path.attributeId == ATTRIBUTE_ID
       }
 
-    requireNotNull(attributeData) { "Lightsensortype attribute not found in response" }
+    requireNotNull(attributeData) { "Periodicenergyexported attribute not found in response" }
 
     // Decode the TLV data into the appropriate type
     val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
+    val decodedValue: ElectricalEnergyMeasurementClusterEnergyMeasurementStruct? =
       if (!tlvReader.isNull()) {
         if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getUByte(AnonymousTag)
+          ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.fromTlv(AnonymousTag, tlvReader)
         } else {
           null
         }
@@ -230,7 +250,7 @@
         null
       }
 
-    return LightSensorTypeAttribute(decodedValue)
+    return PeriodicEnergyExportedAttribute(decodedValue)
   }
 
   suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
@@ -448,7 +468,7 @@
   }
 
   companion object {
-    private val logger = Logger.getLogger(IlluminanceMeasurementCluster::class.java.name)
-    const val CLUSTER_ID: UInt = 1024u
+    private val logger = Logger.getLogger(ElectricalEnergyMeasurementCluster::class.java.name)
+    const val CLUSTER_ID: UInt = 145u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalMeasurementCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalMeasurementCluster.kt
index d9f1b64..cff2c16 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalMeasurementCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/EnergyEvseCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/EnergyEvseCluster.kt
index 4372be5..231bed8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/EnergyEvseCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
index 782a2df..fcbff87 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/FanControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/FanControlCluster.kt
index 094a5f3..a2be5a8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/FanControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/FaultInjectionCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/FaultInjectionCluster.kt
index dd4a912..e765024 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/FaultInjectionCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/FixedLabelCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/FixedLabelCluster.kt
index 7b889f0..6d6c809 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/FixedLabelCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/FlowMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/FlowMeasurementCluster.kt
index cfc1ec2..0f9c139 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/FlowMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
index c946b2d..ddcc4de 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt
index 5d7d418..ea455c6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt
index 4b77e41..247fd54 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
index a934a8e..00e4159 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt
index c6be619..a1c38ca 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/HepaFilterMonitoringCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/HepaFilterMonitoringCluster.kt
index 2d0a540..330aba9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/HepaFilterMonitoringCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt
index 62504f6..029dd19 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/IdentifyCluster.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/IdentifyCluster.kt
index 6eb2103..2cffe72 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/IdentifyCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/IlluminanceMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/IlluminanceMeasurementCluster.kt
index 2869e97..df1c954 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/IlluminanceMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/KeypadInputCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/KeypadInputCluster.kt
index cf9544f..dc18411 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/KeypadInputCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryDryerControlsCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryDryerControlsCluster.kt
index 6c4cf76..e840eaa 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryDryerControlsCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherControlsCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherControlsCluster.kt
index bf09091..9540e0b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherControlsCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherModeCluster.kt
index ed958b8..4c32d50 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LevelControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LevelControlCluster.kt
index 987db48..8718ed7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LevelControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LocalizationConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LocalizationConfigurationCluster.kt
index bc6fd04..25259a5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LocalizationConfigurationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/LowPowerCluster.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/LowPowerCluster.kt
index cd6de47..4cd658b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/LowPowerCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaInputCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/MediaInputCluster.kt
index 70ee279..9294f20 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaInputCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt
index b42bc7d..2185773 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenControlCluster.kt
index 8361702..606bc9d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenControlCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenModeCluster.kt
index a3a4c0a..77196e0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenModeCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ModeSelectCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ModeSelectCluster.kt
index 9503b01..6231d0f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ModeSelectCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt
index acbbbba..be084cc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
index 1bd7241..715be51 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OccupancySensingCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OccupancySensingCluster.kt
index a3fce8d..8696b43 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OccupancySensingCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffCluster.kt
index ffdb73b..ff372b5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
index 0d72cea..ce7a5fc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffSwitchConfigurationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt
index 37a33e1..9cf448a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalStateCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalStateCluster.kt
index 6c13c4a..1fa39c3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalStateCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
index 80e13cc..42062ad 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
index 8bed29c..66000d0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenCavityOperationalStateCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OvenCavityOperationalStateCluster.kt
index 72b0a38..5860562 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenCavityOperationalStateCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OvenModeCluster.kt
index 607e6f6..d9984fe 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
index f7c57df..2cc23fa 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
index 39a9d02..a0fb883 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
@@ -15,17 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
-class Pm25ConcentrationMeasurementCluster(
+class Pm10ConcentrationMeasurementCluster(
   private val controller: MatterController,
   private val endpointId: UShort
 ) {
@@ -683,7 +685,7 @@
   }
 
   companion object {
-    private val logger = Logger.getLogger(Pm25ConcentrationMeasurementCluster::class.java.name)
-    const val CLUSTER_ID: UInt = 1066u
+    private val logger = Logger.getLogger(Pm10ConcentrationMeasurementCluster::class.java.name)
+    const val CLUSTER_ID: UInt = 1069u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
index 81a0ecb..6ce088f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
similarity index 98%
copy from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
copy to src/controller/java/generated/java/matter/controller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
index 39a9d02..a09517a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceCluster.kt
index a58fddc..f701ae9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceConfigurationCluster.kt
index deb3bdc..efd82e8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceConfigurationCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PressureMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/PressureMeasurementCluster.kt
index 170bf7d..4d4ec17 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PressureMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyConfigurationCluster.kt
index b105f9a..fbabea9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyConfigurationCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyDiscoveryCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyDiscoveryCluster.kt
index 5848e54..e5f72cc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyDiscoveryCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyValidCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyValidCluster.kt
index 4087785..26764e3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyValidCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PulseWidthModulationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/PulseWidthModulationCluster.kt
index 3536085..822765f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PulseWidthModulationCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/PumpConfigurationAndControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/PumpConfigurationAndControlCluster.kt
index 3666a39..7d6d629 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/PumpConfigurationAndControlCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
similarity index 98%
copy from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
copy to src/controller/java/generated/java/matter/controller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
index f7c57df..adbb2c5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
@@ -15,17 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
-class OzoneConcentrationMeasurementCluster(
+class RadonConcentrationMeasurementCluster(
   private val controller: MatterController,
   private val endpointId: UShort
 ) {
@@ -683,7 +685,7 @@
   }
 
   companion object {
-    private val logger = Logger.getLogger(OzoneConcentrationMeasurementCluster::class.java.name)
-    const val CLUSTER_ID: UInt = 1045u
+    private val logger = Logger.getLogger(RadonConcentrationMeasurementCluster::class.java.name)
+    const val CLUSTER_ID: UInt = 1071u
   }
 }
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAlarmCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAlarmCluster.kt
index 0f494ac..5a524b7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAlarmCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
index d0600fe..ae1b353 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
index 46d56b1..ac269f3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RelativeHumidityMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcCleanModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RvcCleanModeCluster.kt
index b2a0fab..e0aec7f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcCleanModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcOperationalStateCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RvcOperationalStateCluster.kt
index 4db4157..fd6bdf8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcOperationalStateCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcRunModeCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/RvcRunModeCluster.kt
index 5c8faae..a8007f6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcRunModeCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/SampleMeiCluster.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/SampleMeiCluster.kt
index dac1195..3b8c729 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/SampleMeiCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesCluster.kt
index 9ee914f..e5c8a38 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
index 76d2a73..5d0bbf0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/SoftwareDiagnosticsCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/SoftwareDiagnosticsCluster.kt
index ca8344f..7726983 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/SoftwareDiagnosticsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/SwitchCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/SwitchCluster.kt
index 39fd1cf..d3d4c67 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/SwitchCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TargetNavigatorCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TargetNavigatorCluster.kt
index 77d8a69..b528993 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TargetNavigatorCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureControlCluster.kt
index 1c83c27..f6663fe 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureControlCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureMeasurementCluster.kt
index 56b30a7..4bf9afe 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
index 1c31b1b..4ab15f6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
index 1b43203..a535c79 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
index 41e863d..0e75d15 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeFormatLocalizationCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TimeFormatLocalizationCluster.kt
index a17c515..a94ae87 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeFormatLocalizationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt
index 6cd9a03..8ad5b45 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimerCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TimerCluster.kt
index 83198c6..9a200d2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TimerCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
index 87720ed..e5b5378 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitLocalizationCluster.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/UnitLocalizationCluster.kt
index 4dfcba6..75cd20f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitLocalizationCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitTestingCluster.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/UnitTestingCluster.kt
index c0ba1fd..c0bd70e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitTestingCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/UserLabelCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/UserLabelCluster.kt
index 8d633a8..808ccdf 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/UserLabelCluster.kt
@@ -15,14 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/ValveConfigurationAndControlCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/ValveConfigurationAndControlCluster.kt
index e4f6af0..f0062ad 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/ValveConfigurationAndControlCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/WakeOnLanCluster.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/WakeOnLanCluster.kt
index eb8631b..982b3d6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/WakeOnLanCluster.kt
@@ -15,13 +15,15 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
index 0b5be89..79619f4 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt
@@ -15,15 +15,19 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt b/src/controller/java/generated/java/matter/controller/cluster/clusters/WindowCoveringCluster.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
rename to src/controller/java/generated/java/matter/controller/cluster/clusters/WindowCoveringCluster.kt
index c7c7b62..f521fa0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/clusters/WindowCoveringCluster.kt
@@ -15,15 +15,22 @@
  *    limitations under the License.
  */
 
-package matter.devicecontroller.cluster.clusters
+package matter.controller.cluster.clusters
 
 import java.time.Duration
 import java.util.logging.Level
 import java.util.logging.Logger
-import matter.controller.*
+import matter.controller.InvokeRequest
+import matter.controller.InvokeResponse
+import matter.controller.MatterController
+import matter.controller.ReadData
+import matter.controller.ReadRequest
+import matter.controller.WriteRequest
+import matter.controller.WriteRequests
+import matter.controller.WriteResponse
+import matter.controller.cluster.structs.*
 import matter.controller.model.AttributePath
 import matter.controller.model.CommandPath
-import matter.devicecontroller.cluster.structs.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
similarity index 90%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
index ae83ff0..bd0e618 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -26,8 +26,7 @@
   val adminNodeID: ULong?,
   val adminPasscodeID: UShort?,
   val changeType: UByte,
-  val latestValue:
-    matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
+  val latestValue: matter.controller.cluster.structs.AccessControlClusterAccessControlEntryStruct?,
   val fabricIndex: UByte
 ) {
   override fun toString(): String = buildString {
@@ -93,8 +92,10 @@
       val changeType = tlvReader.getUByte(ContextSpecificTag(TAG_CHANGE_TYPE))
       val latestValue =
         if (!tlvReader.isNull()) {
-          matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlEntryStruct
-            .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
+          matter.controller.cluster.structs.AccessControlClusterAccessControlEntryStruct.fromTlv(
+            ContextSpecificTag(TAG_LATEST_VALUE),
+            tlvReader
+          )
         } else {
           tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
           null
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
similarity index 92%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
index 1a7a6ad..aa38ea4 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -27,7 +27,7 @@
   val adminPasscodeID: UShort?,
   val changeType: UByte,
   val latestValue:
-    matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
+    matter.controller.cluster.structs.AccessControlClusterAccessControlExtensionStruct?,
   val fabricIndex: UByte
 ) {
   override fun toString(): String = buildString {
@@ -93,7 +93,7 @@
       val changeType = tlvReader.getUByte(ContextSpecificTag(TAG_CHANGE_TYPE))
       val latestValue =
         if (!tlvReader.isNull()) {
-          matter.devicecontroller.cluster.structs.AccessControlClusterAccessControlExtensionStruct
+          matter.controller.cluster.structs.AccessControlClusterAccessControlExtensionStruct
             .fromTlv(ContextSpecificTag(TAG_LATEST_VALUE), tlvReader)
         } else {
           tlvReader.getNull(ContextSpecificTag(TAG_LATEST_VALUE))
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt
index 332ef0a..81e55ba 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
index 0c9b1d4..c1c26f5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
index 48f10a0..25fdc84 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
index 527ca9e..ea0e7e1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
index 117e3e4..a6924b8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
index cbcb04d..fff1d76 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
index f5e2a67..3918c2c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
index b3ac5fa..82db9ec 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
index f153ed3..2bdca2f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
index 2df7a45..e812711 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
similarity index 90%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
index 5ed08f5..21b147d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -31,23 +31,23 @@
   val control: UShort,
   val temperatureControl:
     Optional<
-      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterTemperatureControlStruct
+      matter.controller.cluster.structs.DemandResponseLoadControlClusterTemperatureControlStruct
     >?,
   val averageLoadControl:
     Optional<
-      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterAverageLoadControlStruct
+      matter.controller.cluster.structs.DemandResponseLoadControlClusterAverageLoadControlStruct
     >?,
   val dutyCycleControl:
     Optional<
-      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterDutyCycleControlStruct
+      matter.controller.cluster.structs.DemandResponseLoadControlClusterDutyCycleControlStruct
     >?,
   val powerSavingsControl:
     Optional<
-      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterPowerSavingsControlStruct
+      matter.controller.cluster.structs.DemandResponseLoadControlClusterPowerSavingsControlStruct
     >?,
   val heatingSourceControl:
     Optional<
-      matter.devicecontroller.cluster.structs.DemandResponseLoadControlClusterHeatingSourceControlStruct
+      matter.controller.cluster.structs.DemandResponseLoadControlClusterHeatingSourceControlStruct
     >?
 ) {
   override fun toString(): String = buildString {
@@ -153,7 +153,7 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_TEMPERATURE_CONTROL))) {
             Optional.of(
-              matter.devicecontroller.cluster.structs
+              matter.controller.cluster.structs
                 .DemandResponseLoadControlClusterTemperatureControlStruct
                 .fromTlv(ContextSpecificTag(TAG_TEMPERATURE_CONTROL), tlvReader)
             )
@@ -168,7 +168,7 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL))) {
             Optional.of(
-              matter.devicecontroller.cluster.structs
+              matter.controller.cluster.structs
                 .DemandResponseLoadControlClusterAverageLoadControlStruct
                 .fromTlv(ContextSpecificTag(TAG_AVERAGE_LOAD_CONTROL), tlvReader)
             )
@@ -183,7 +183,7 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL))) {
             Optional.of(
-              matter.devicecontroller.cluster.structs
+              matter.controller.cluster.structs
                 .DemandResponseLoadControlClusterDutyCycleControlStruct
                 .fromTlv(ContextSpecificTag(TAG_DUTY_CYCLE_CONTROL), tlvReader)
             )
@@ -198,7 +198,7 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL))) {
             Optional.of(
-              matter.devicecontroller.cluster.structs
+              matter.controller.cluster.structs
                 .DemandResponseLoadControlClusterPowerSavingsControlStruct
                 .fromTlv(ContextSpecificTag(TAG_POWER_SAVINGS_CONTROL), tlvReader)
             )
@@ -213,7 +213,7 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL))) {
             Optional.of(
-              matter.devicecontroller.cluster.structs
+              matter.controller.cluster.structs
                 .DemandResponseLoadControlClusterHeatingSourceControlStruct
                 .fromTlv(ContextSpecificTag(TAG_HEATING_SOURCE_CONTROL), tlvReader)
             )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt
index 62c61f4..10bda0f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
index 37ee871..d6a5d92 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
index 47cea2e..233130a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
index 000d434..92d04f6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
similarity index 92%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
index e5c5c43..0834fde 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
@@ -32,7 +32,7 @@
   val fabricIndex: UByte?,
   val sourceNode: ULong?,
   val credentials:
-    Optional<List<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct>>?
+    Optional<List<matter.controller.cluster.structs.DoorLockClusterCredentialStruct>>?
 ) {
   override fun toString(): String = buildString {
     append("DoorLockClusterLockOperationErrorEvent {\n")
@@ -122,11 +122,11 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_CREDENTIALS))) {
             Optional.of(
-              buildList<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct> {
+              buildList<matter.controller.cluster.structs.DoorLockClusterCredentialStruct> {
                 tlvReader.enterArray(ContextSpecificTag(TAG_CREDENTIALS))
                 while (!tlvReader.isEndOfContainer()) {
                   this.add(
-                    matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
+                    matter.controller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
                       AnonymousTag,
                       tlvReader
                     )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
similarity index 92%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
index 1f61241..c063f08 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
@@ -31,7 +31,7 @@
   val fabricIndex: UByte?,
   val sourceNode: ULong?,
   val credentials:
-    Optional<List<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct>>?
+    Optional<List<matter.controller.cluster.structs.DoorLockClusterCredentialStruct>>?
 ) {
   override fun toString(): String = buildString {
     append("DoorLockClusterLockOperationEvent {\n")
@@ -117,11 +117,11 @@
         if (!tlvReader.isNull()) {
           if (tlvReader.isNextTag(ContextSpecificTag(TAG_CREDENTIALS))) {
             Optional.of(
-              buildList<matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct> {
+              buildList<matter.controller.cluster.structs.DoorLockClusterCredentialStruct> {
                 tlvReader.enterArray(ContextSpecificTag(TAG_CREDENTIALS))
                 while (!tlvReader.isEndOfContainer()) {
                   this.add(
-                    matter.devicecontroller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
+                    matter.controller.cluster.structs.DoorLockClusterCredentialStruct.fromTlv(
                       AnonymousTag,
                       tlvReader
                     )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
index f47ba13..3d3cd63 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt
similarity index 87%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt
index e103a1f..2533881 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -26,11 +26,11 @@
 class ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent(
   val energyImported:
     Optional<
-      matter.devicecontroller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
+      matter.controller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
     >,
   val energyExported:
     Optional<
-      matter.devicecontroller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
+      matter.controller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
     >
 ) {
   override fun toString(): String = buildString {
@@ -67,7 +67,7 @@
       val energyImported =
         if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENERGY_IMPORTED))) {
           Optional.of(
-            matter.devicecontroller.cluster.structs
+            matter.controller.cluster.structs
               .ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
               .fromTlv(ContextSpecificTag(TAG_ENERGY_IMPORTED), tlvReader)
           )
@@ -77,7 +77,7 @@
       val energyExported =
         if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENERGY_EXPORTED))) {
           Optional.of(
-            matter.devicecontroller.cluster.structs
+            matter.controller.cluster.structs
               .ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
               .fromTlv(ContextSpecificTag(TAG_ENERGY_EXPORTED), tlvReader)
           )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt
similarity index 87%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt
index c28176f..17194fb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -26,11 +26,11 @@
 class ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent(
   val energyImported:
     Optional<
-      matter.devicecontroller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
+      matter.controller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
     >,
   val energyExported:
     Optional<
-      matter.devicecontroller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
+      matter.controller.cluster.structs.ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
     >
 ) {
   override fun toString(): String = buildString {
@@ -67,7 +67,7 @@
       val energyImported =
         if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENERGY_IMPORTED))) {
           Optional.of(
-            matter.devicecontroller.cluster.structs
+            matter.controller.cluster.structs
               .ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
               .fromTlv(ContextSpecificTag(TAG_ENERGY_IMPORTED), tlvReader)
           )
@@ -77,7 +77,7 @@
       val energyExported =
         if (tlvReader.isNextTag(ContextSpecificTag(TAG_ENERGY_EXPORTED))) {
           Optional.of(
-            matter.devicecontroller.cluster.structs
+            matter.controller.cluster.structs
               .ElectricalEnergyMeasurementClusterEnergyMeasurementStruct
               .fromTlv(ContextSpecificTag(TAG_ENERGY_EXPORTED), tlvReader)
           )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
index d335743..a0770e7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
index 92cf65e..673441a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
index ae7aeb6..0cd20e3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
index 1bb4fdc..093f687 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
index e45f410..03e5ca8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
similarity index 93%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
index 65558ca..cf0fe50 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
index 32a8a06..8d13675 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
index 47f191b..5b7e6cd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
index c792a2c..f256ddd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
index fa15b5c..0279498 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt
similarity index 92%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt
index ebef487..3326660 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -27,8 +27,7 @@
   val currentState: UByte,
   val startTime: ULong,
   val duration: ULong,
-  val sampledPosition:
-    matter.devicecontroller.cluster.structs.MediaPlaybackClusterPlaybackPositionStruct,
+  val sampledPosition: matter.controller.cluster.structs.MediaPlaybackClusterPlaybackPositionStruct,
   val playbackSpeed: Float,
   val seekRangeEnd: ULong,
   val seekRangeStart: ULong,
@@ -85,7 +84,7 @@
       val startTime = tlvReader.getULong(ContextSpecificTag(TAG_START_TIME))
       val duration = tlvReader.getULong(ContextSpecificTag(TAG_DURATION))
       val sampledPosition =
-        matter.devicecontroller.cluster.structs.MediaPlaybackClusterPlaybackPositionStruct.fromTlv(
+        matter.controller.cluster.structs.MediaPlaybackClusterPlaybackPositionStruct.fromTlv(
           ContextSpecificTag(TAG_SAMPLED_POSITION),
           tlvReader
         )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
index 79c063e..4ae9066 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
similarity index 84%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
index 802e306..fc6e479 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt
@@ -14,16 +14,16 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
 class OperationalStateClusterOperationalErrorEvent(
-  val errorState: matter.devicecontroller.cluster.structs.OperationalStateClusterErrorStateStruct
+  val errorState: matter.controller.cluster.structs.OperationalStateClusterErrorStateStruct
 ) {
   override fun toString(): String = buildString {
     append("OperationalStateClusterOperationalErrorEvent {\n")
@@ -45,7 +45,7 @@
     fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): OperationalStateClusterOperationalErrorEvent {
       tlvReader.enterStructure(tlvTag)
       val errorState =
-        matter.devicecontroller.cluster.structs.OperationalStateClusterErrorStateStruct.fromTlv(
+        matter.controller.cluster.structs.OperationalStateClusterErrorStateStruct.fromTlv(
           ContextSpecificTag(TAG_ERROR_STATE),
           tlvReader
         )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
index a36f916..e3fbe9c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
index 218394c..52ff425 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
index f8b32d0..cd39219 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
index 88611aa..7220e0a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
similarity index 81%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
index fbc411a..bfaa8f7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
@@ -24,7 +24,7 @@
 
 class OvenCavityOperationalStateClusterOperationalErrorEvent(
   val errorState:
-    matter.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
+    matter.controller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
 ) {
   override fun toString(): String = buildString {
     append("OvenCavityOperationalStateClusterOperationalErrorEvent {\n")
@@ -49,8 +49,10 @@
     ): OvenCavityOperationalStateClusterOperationalErrorEvent {
       tlvReader.enterStructure(tlvTag)
       val errorState =
-        matter.devicecontroller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct
-          .fromTlv(ContextSpecificTag(TAG_ERROR_STATE), tlvReader)
+        matter.controller.cluster.structs.OvenCavityOperationalStateClusterErrorStateStruct.fromTlv(
+          ContextSpecificTag(TAG_ERROR_STATE),
+          tlvReader
+        )
 
       tlvReader.exitContainer()
 
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
index 64d9215..8e189c2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
index 4cf4584..7aa1a81 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
index 18dc33d..5dc6444 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
index 4dfb6b6..8bfdf23 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
index 7fa1bbd..eaafde5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
similarity index 84%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
index ff973d1..7a78710 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt
@@ -14,16 +14,16 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
 import matter.tlv.TlvWriter
 
 class RvcOperationalStateClusterOperationalErrorEvent(
-  val errorState: matter.devicecontroller.cluster.structs.RvcOperationalStateClusterErrorStateStruct
+  val errorState: matter.controller.cluster.structs.RvcOperationalStateClusterErrorStateStruct
 ) {
   override fun toString(): String = buildString {
     append("RvcOperationalStateClusterOperationalErrorEvent {\n")
@@ -48,7 +48,7 @@
     ): RvcOperationalStateClusterOperationalErrorEvent {
       tlvReader.enterStructure(tlvTag)
       val errorState =
-        matter.devicecontroller.cluster.structs.RvcOperationalStateClusterErrorStateStruct.fromTlv(
+        matter.controller.cluster.structs.RvcOperationalStateClusterErrorStateStruct.fromTlv(
           ContextSpecificTag(TAG_ERROR_STATE),
           tlvReader
         )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
index c6ec37c..52c7a19 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
index 99b4a72..80c6a86 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
index 50d269f..2a3f3f2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
index 18fed7c..3930c40 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
index 59ce0a0..934c42d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
index f7e1378..c7ac6b6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
index 630fd92..f7a74f7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
index b586d16..bacc49c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongPressEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
index 6b7ea99..cbd0166 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
index 79bbef0..4a82b49 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
index bced016..4bf6776 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
index 6c9c227..c08c0e6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
index 8c5ee4f..4aae22f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt
similarity index 83%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt
index bfe8475..0d56be6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
@@ -24,8 +24,7 @@
 import matter.tlv.TlvWriter
 
 class TargetNavigatorClusterTargetUpdatedEvent(
-  val targetList:
-    List<matter.devicecontroller.cluster.structs.TargetNavigatorClusterTargetInfoStruct>,
+  val targetList: List<matter.controller.cluster.structs.TargetNavigatorClusterTargetInfoStruct>,
   val currentTarget: UByte,
   val data: ByteArray
 ) {
@@ -59,12 +58,14 @@
     fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): TargetNavigatorClusterTargetUpdatedEvent {
       tlvReader.enterStructure(tlvTag)
       val targetList =
-        buildList<matter.devicecontroller.cluster.structs.TargetNavigatorClusterTargetInfoStruct> {
+        buildList<matter.controller.cluster.structs.TargetNavigatorClusterTargetInfoStruct> {
           tlvReader.enterArray(ContextSpecificTag(TAG_TARGET_LIST))
           while (!tlvReader.isEndOfContainer()) {
             this.add(
-              matter.devicecontroller.cluster.structs.TargetNavigatorClusterTargetInfoStruct
-                .fromTlv(AnonymousTag, tlvReader)
+              matter.controller.cluster.structs.TargetNavigatorClusterTargetInfoStruct.fromTlv(
+                AnonymousTag,
+                tlvReader
+              )
             )
           }
           tlvReader.exitContainer()
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
index 87fdaff..8acbb4b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
index de061b2..3bea74d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
index e20bc34..1f92e40 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
index 5520278..0ef9244 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
similarity index 85%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
index a9b8b24..b95fb1a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
@@ -27,8 +27,8 @@
   val arg1: UByte,
   val arg2: UByte,
   val arg3: Boolean,
-  val arg4: matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct,
-  val arg5: List<matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct>,
+  val arg4: matter.controller.cluster.structs.UnitTestingClusterSimpleStruct,
+  val arg5: List<matter.controller.cluster.structs.UnitTestingClusterSimpleStruct>,
   val arg6: List<UByte>
 ) {
   override fun toString(): String = buildString {
@@ -77,16 +77,16 @@
       val arg2 = tlvReader.getUByte(ContextSpecificTag(TAG_ARG2))
       val arg3 = tlvReader.getBoolean(ContextSpecificTag(TAG_ARG3))
       val arg4 =
-        matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
+        matter.controller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
           ContextSpecificTag(TAG_ARG4),
           tlvReader
         )
       val arg5 =
-        buildList<matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct> {
+        buildList<matter.controller.cluster.structs.UnitTestingClusterSimpleStruct> {
           tlvReader.enterArray(ContextSpecificTag(TAG_ARG5))
           while (!tlvReader.isEndOfContainer()) {
             this.add(
-              matter.devicecontroller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
+              matter.controller.cluster.structs.UnitTestingClusterSimpleStruct.fromTlv(
                 AnonymousTag,
                 tlvReader
               )
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
index bdf1b54..b0ac868 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
index 5ba4afd..6c207e6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
index d75afd2..4ff645d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
index cf0b6ad..6775774 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
index 0901045..af8d2c2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
rename to src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
index 518f3ec..a61a974 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.eventstructs
+package matter.controller.cluster.eventstructs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/controller/cluster/files.gni b/src/controller/java/generated/java/matter/controller/cluster/files.gni
new file mode 100644
index 0000000..75ff840
--- /dev/null
+++ b/src/controller/java/generated/java/matter/controller/cluster/files.gni
@@ -0,0 +1,312 @@
+import("//build_overrides/build.gni")
+import("//build_overrides/chip.gni")
+
+matter_structs_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BindingClusterTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelPagingStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterLineupInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterPageTokenStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCastStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCategoryStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterSeriesInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentControlClusterRatingNameStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterDimensionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/DoorLockClusterCredentialStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/FixedLabelClusterLabelStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MediaInputClusterInputInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeTagStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterAttributeValuePair.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterExtensionFieldSet.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterSceneInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStructList.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterSimpleStruct.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestFabricScoped.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestListStructOctet.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/structs/UserLabelClusterLabelStruct.kt",
+]
+
+matter_eventstructs_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongPressEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt",
+]
+
+matter_clusters_sources = [
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/AccessControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/AccountLoginCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ActionsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/AdministratorCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/AirQualityCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationBasicCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ApplicationLauncherCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/AudioOutputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BallastConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BarrierControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BasicInformationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BinaryInputBasicCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BindingCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanSensorConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BooleanStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ChannelCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ColorControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentAppObserverCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ContentLauncherCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DemandResponseLoadControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DescriptorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DeviceEnergyManagementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DiagnosticLogsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DishwasherModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/DoorLockCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalEnergyMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ElectricalMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/EnergyEvseCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/FanControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/FaultInjectionCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/FixedLabelCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/FlowMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/GeneralDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupKeyManagementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/GroupsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/HepaFilterMonitoringCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/IcdManagementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/IdentifyCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/IlluminanceMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/KeypadInputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryDryerControlsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherControlsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LaundryWasherModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LevelControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LocalizationConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/LowPowerCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaInputCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/MediaPlaybackCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/MicrowaveOvenModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ModeSelectCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/NetworkCommissioningCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OccupancySensingCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OnOffSwitchConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalCredentialsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OperationalStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenCavityOperationalStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OvenModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/PowerSourceConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/PressureMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyDiscoveryCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ProxyValidCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/PulseWidthModulationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/PumpConfigurationAndControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RadonConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RelativeHumidityMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcCleanModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcOperationalStateCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/RvcRunModeCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/SampleMeiCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ScenesCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/SmokeCoAlarmCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/SoftwareDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/SwitchCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TargetNavigatorCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TemperatureMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeFormatLocalizationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TimerCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TimeSynchronizationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitLocalizationCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/UnitTestingCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/UserLabelCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/ValveConfigurationAndControlCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/WakeOnLanCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt",
+  "${chip_root}/src/controller/java/generated/java/matter/controller/cluster/clusters/WindowCoveringCluster.kt",
+]
\ No newline at end of file
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
index 524ee0e..f177b65 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
index 92f871d..4427b4a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
index 24905a8..c0197f9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt
index 862ff33..7347668 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterActionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt
index 82648d5..94dda89 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ActionsClusterEndpointListStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
index d6b1ed9..afa7a17 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
index 90dae8f..2172fbb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
index 62fc820..9329e2a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
index 39fa26c..823ca30 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
index dbb7159..03f5926 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
index 57ffe93..a25807e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
index cbce32f..5658356 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/BindingClusterTargetStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/BindingClusterTargetStruct.kt
index 2f41f19..84be9b6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/BindingClusterTargetStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
index ef01f0a..94e9b13 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt
index 0b79ff3..cd2eacc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelInfoStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelInfoStruct.kt
index 4a31030..627dcdc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelInfoStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelPagingStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelPagingStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelPagingStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelPagingStruct.kt
index 8be6df8..3d19048 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelPagingStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterChannelPagingStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterLineupInfoStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterLineupInfoStruct.kt
index 5b1fd59..e8e25f3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterLineupInfoStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterPageTokenStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterPageTokenStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterPageTokenStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterPageTokenStruct.kt
index 9a589ad..e971295 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterPageTokenStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterPageTokenStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCastStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCastStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCastStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCastStruct.kt
index a5bc79e..45b0a22 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCastStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCastStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCategoryStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCategoryStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCategoryStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCategoryStruct.kt
index 9f0756a..6e89f24 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCategoryStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramCategoryStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt
similarity index 99%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt
index 0912c5c..f40e13d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterProgramStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterSeriesInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterSeriesInfoStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterSeriesInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterSeriesInfoStruct.kt
index 0052c32..9e3928a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterSeriesInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ChannelClusterSeriesInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentControlClusterRatingNameStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentControlClusterRatingNameStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentControlClusterRatingNameStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentControlClusterRatingNameStruct.kt
index af2a6a3..c47570f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentControlClusterRatingNameStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentControlClusterRatingNameStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
index e58a892..af51bec 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
index 7fc9456..4470b65 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
index edb9b9a..1fe0fc7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
index 657df17..f9c4eb2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterDimensionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt
index ac3c1e2..e0975b8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterParameterStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt
index 66cd44f..694f35f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
index 217d11a..e57d04e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt
index b7d3dae..74c3088 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
index 1e4fd9f..4473bd4 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
index 1e23b64..7e53d77 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
index fffee64..aeae202 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
index ba36b9d..e8f15e8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
index 609288f..1bad4e8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
index fd21d4d..d3aea56 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
index 363970d..485257e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
index 89d78db..635b254 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
index b7b1908..c8cc82e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
index 67a8e87..70a8355 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DescriptorClusterSemanticTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt
index a6beed8..4649721 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt
index d026679..c08ce3a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt
index 40b5fe9..6910c79 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt
index 717a274..c1822bb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt
index b0b1a5f..e11febd 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt
index d2a1ede..d3121dc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
index d35df12..3d61c5b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
index ef40848..584dc79 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DishwasherModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/DoorLockClusterCredentialStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/DoorLockClusterCredentialStruct.kt
index 5c04ebe..f66b57f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/DoorLockClusterCredentialStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt
index 7c0e06c..46dff94 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt
index f97a3db..65ed89e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt
index 9324ea4..b8f7a0f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
index a81f4c8..65c1b49 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/FixedLabelClusterLabelStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/FixedLabelClusterLabelStruct.kt
index 07a2315..b5181c4 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/FixedLabelClusterLabelStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
index e863805..aa7528a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
index 841585a..200b75d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
index cfa9eb7..9d01551 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
index 9646016..e5f8ecb 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
index d624fed..d68d053 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
index 8d3aeb5..99d8d0d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
index 2a7a56c..d3f81f7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
index 08988b2..e8392fa 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
index 1d8d1c8..a12e284 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaInputClusterInputInfoStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MediaInputClusterInputInfoStruct.kt
index 2960b70..2aaef4b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaInputClusterInputInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
index 3052f19..518da6b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt
index 2f00048..dfd99da 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackStruct.kt
index 347b99d..0571df7 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MediaPlaybackClusterTrackStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
index 481ae34..8af30d0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
index 49d0d49..ee00730 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
index 8cb331e..558980b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
index ba8e6df..fe6cdd3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
index 245061c..ebb7d9c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
index 5057fa3..93df116 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
index eeff78c..ffbb05f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
index 66de75d..89b9428 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
index ab86611..3a104b0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
index a482cb4..f1d7a22 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterErrorStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
index 897a6be..d08dc7a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
index 1fe882a..f9dd92c 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
index 256e91b..3ca1059 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
index 123785b..f66b7a0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeOptionStruct.kt
index de09bc2..ba8bad6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeTagStruct.kt
index debd205..4ba9d36 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/OvenModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
index 72d0b3b..8b9487a 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
index 3afee70..6b849cc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
index c86eb43..9354883 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
index 41c4276..cd01932 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
index 848b34b..9faf469 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
index b718ee9..a8e74c8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
index 17f618e..ce35ad9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
index e157632..6fa68a8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
index 903605a..f21d5ec 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
index 937a030..f4193b9 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
index 188c215..7ad6969 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/RvcRunModeClusterModeTagStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterAttributeValuePair.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterAttributeValuePair.kt
index df599d8..b64a49b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterAttributeValuePair.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterExtensionFieldSet.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterExtensionFieldSet.kt
index 88d6085..24f21fc 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterExtensionFieldSet.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterSceneInfoStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterSceneInfoStruct.kt
index 7d21ccd..a77c286 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ScenesClusterSceneInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
index c5f2429..b8f67a5 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
index 14c27a5..d1c115f 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt
index 5f93367..597fce1 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
index 001698e..c3fc752 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
index 7aa8d60..8babb9d 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
index 58a9599..21bfbb8 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
index 313ac3d..720cdd6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
index a3b6fd3..b74d29b 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
index 152f420..6681fb2 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
index 4dd5331..ac2e8ef 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
index 034d6d0..4e966f6 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
index 546255c..b308907 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStruct.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStruct.kt
index 0891c31..d1bb92e 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStructList.kt
similarity index 97%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStructList.kt
index b22100f..3e58a31 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNestedStructList.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
index 3507426..719fc44 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterSimpleStruct.kt
similarity index 96%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterSimpleStruct.kt
index aba051d..7266ca0 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterSimpleStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
similarity index 98%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
index 0fae66d..4e4b005 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestFabricScoped.kt
@@ -14,10 +14,10 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
 import java.util.Optional
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.AnonymousTag
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
similarity index 95%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
index 9e49970..9a7f7d3 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UnitTestingClusterTestListStructOctet.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt b/src/controller/java/generated/java/matter/controller/cluster/structs/UserLabelClusterLabelStruct.kt
similarity index 94%
rename from src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt
rename to src/controller/java/generated/java/matter/controller/cluster/structs/UserLabelClusterLabelStruct.kt
index ffc34fe..8840aec 100644
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt
+++ b/src/controller/java/generated/java/matter/controller/cluster/structs/UserLabelClusterLabelStruct.kt
@@ -14,9 +14,9 @@
  *    See the License for the specific language governing permissions and
  *    limitations under the License.
  */
-package matter.devicecontroller.cluster.structs
+package matter.controller.cluster.structs
 
-import matter.devicecontroller.cluster.*
+import matter.controller.cluster.*
 import matter.tlv.ContextSpecificTag
 import matter.tlv.Tag
 import matter.tlv.TlvReader
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
deleted file mode 100644
index ee41d1c..0000000
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package matter.devicecontroller.cluster.clusters
-
-import java.util.logging.Level
-import java.util.logging.Logger
-import matter.controller.*
-import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
-import matter.tlv.AnonymousTag
-import matter.tlv.TlvReader
-
-class Pm10ConcentrationMeasurementCluster(
-  private val controller: MatterController,
-  private val endpointId: UShort
-) {
-  class MeasuredValueAttribute(val value: Float?)
-
-  class MinMeasuredValueAttribute(val value: Float?)
-
-  class MaxMeasuredValueAttribute(val value: Float?)
-
-  class PeakMeasuredValueAttribute(val value: Float?)
-
-  class AverageMeasuredValueAttribute(val value: Float?)
-
-  class GeneratedCommandListAttribute(val value: List<UInt>)
-
-  class AcceptedCommandListAttribute(val value: List<UInt>)
-
-  class EventListAttribute(val value: List<UInt>)
-
-  class AttributeListAttribute(val value: List<UInt>)
-
-  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 0u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 1u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Minmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MinMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 2u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Maxmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MaxMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 3u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Peakmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return PeakMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readPeakMeasuredValueWindowAttribute(): UInt? {
-    val ATTRIBUTE_ID: UInt = 4u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Peakmeasuredvaluewindow attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUInt(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 5u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Averagemeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return AverageMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readAverageMeasuredValueWindowAttribute(): UInt? {
-    val ATTRIBUTE_ID: UInt = 6u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Averagemeasuredvaluewindow attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUInt(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readUncertaintyAttribute(): Float? {
-    val ATTRIBUTE_ID: UInt = 7u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Uncertainty attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getFloat(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readMeasurementUnitAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 8u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measurementunit attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readMeasurementMediumAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 9u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measurementmedium attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readLevelValueAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 10u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Levelvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
-    val ATTRIBUTE_ID: UInt = 65528u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Generatedcommandlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return GeneratedCommandListAttribute(decodedValue)
-  }
-
-  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
-    val ATTRIBUTE_ID: UInt = 65529u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Acceptedcommandlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return AcceptedCommandListAttribute(decodedValue)
-  }
-
-  suspend fun readEventListAttribute(): EventListAttribute {
-    val ATTRIBUTE_ID: UInt = 65530u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Eventlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return EventListAttribute(decodedValue)
-  }
-
-  suspend fun readAttributeListAttribute(): AttributeListAttribute {
-    val ATTRIBUTE_ID: UInt = 65531u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Attributelist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return AttributeListAttribute(decodedValue)
-  }
-
-  suspend fun readFeatureMapAttribute(): UInt {
-    val ATTRIBUTE_ID: UInt = 65532u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Featuremap attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt = tlvReader.getUInt(AnonymousTag)
-
-    return decodedValue
-  }
-
-  suspend fun readClusterRevisionAttribute(): UShort {
-    val ATTRIBUTE_ID: UInt = 65533u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Clusterrevision attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort = tlvReader.getUShort(AnonymousTag)
-
-    return decodedValue
-  }
-
-  companion object {
-    private val logger = Logger.getLogger(Pm10ConcentrationMeasurementCluster::class.java.name)
-    const val CLUSTER_ID: UInt = 1069u
-  }
-}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
deleted file mode 100644
index bc58791..0000000
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt
+++ /dev/null
@@ -1,689 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-
-package matter.devicecontroller.cluster.clusters
-
-import java.util.logging.Level
-import java.util.logging.Logger
-import matter.controller.*
-import matter.controller.model.AttributePath
-import matter.devicecontroller.cluster.structs.*
-import matter.tlv.AnonymousTag
-import matter.tlv.TlvReader
-
-class RadonConcentrationMeasurementCluster(
-  private val controller: MatterController,
-  private val endpointId: UShort
-) {
-  class MeasuredValueAttribute(val value: Float?)
-
-  class MinMeasuredValueAttribute(val value: Float?)
-
-  class MaxMeasuredValueAttribute(val value: Float?)
-
-  class PeakMeasuredValueAttribute(val value: Float?)
-
-  class AverageMeasuredValueAttribute(val value: Float?)
-
-  class GeneratedCommandListAttribute(val value: List<UInt>)
-
-  class AcceptedCommandListAttribute(val value: List<UInt>)
-
-  class EventListAttribute(val value: List<UInt>)
-
-  class AttributeListAttribute(val value: List<UInt>)
-
-  suspend fun readMeasuredValueAttribute(): MeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 0u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readMinMeasuredValueAttribute(): MinMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 1u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Minmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MinMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readMaxMeasuredValueAttribute(): MaxMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 2u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Maxmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return MaxMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readPeakMeasuredValueAttribute(): PeakMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 3u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Peakmeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return PeakMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readPeakMeasuredValueWindowAttribute(): UInt? {
-    val ATTRIBUTE_ID: UInt = 4u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Peakmeasuredvaluewindow attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUInt(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readAverageMeasuredValueAttribute(): AverageMeasuredValueAttribute {
-    val ATTRIBUTE_ID: UInt = 5u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Averagemeasuredvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (!tlvReader.isNull()) {
-        if (tlvReader.isNextTag(AnonymousTag)) {
-          tlvReader.getFloat(AnonymousTag)
-        } else {
-          null
-        }
-      } else {
-        tlvReader.getNull(AnonymousTag)
-        null
-      }
-
-    return AverageMeasuredValueAttribute(decodedValue)
-  }
-
-  suspend fun readAverageMeasuredValueWindowAttribute(): UInt? {
-    val ATTRIBUTE_ID: UInt = 6u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Averagemeasuredvaluewindow attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUInt(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readUncertaintyAttribute(): Float? {
-    val ATTRIBUTE_ID: UInt = 7u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Uncertainty attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: Float? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getFloat(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readMeasurementUnitAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 8u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measurementunit attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readMeasurementMediumAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 9u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Measurementmedium attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readLevelValueAttribute(): UByte? {
-    val ATTRIBUTE_ID: UInt = 10u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Levelvalue attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UByte? =
-      if (tlvReader.isNextTag(AnonymousTag)) {
-        tlvReader.getUByte(AnonymousTag)
-      } else {
-        null
-      }
-
-    return decodedValue
-  }
-
-  suspend fun readGeneratedCommandListAttribute(): GeneratedCommandListAttribute {
-    val ATTRIBUTE_ID: UInt = 65528u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Generatedcommandlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return GeneratedCommandListAttribute(decodedValue)
-  }
-
-  suspend fun readAcceptedCommandListAttribute(): AcceptedCommandListAttribute {
-    val ATTRIBUTE_ID: UInt = 65529u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Acceptedcommandlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return AcceptedCommandListAttribute(decodedValue)
-  }
-
-  suspend fun readEventListAttribute(): EventListAttribute {
-    val ATTRIBUTE_ID: UInt = 65530u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Eventlist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return EventListAttribute(decodedValue)
-  }
-
-  suspend fun readAttributeListAttribute(): AttributeListAttribute {
-    val ATTRIBUTE_ID: UInt = 65531u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Attributelist attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: List<UInt> =
-      buildList<UInt> {
-        tlvReader.enterArray(AnonymousTag)
-        while (!tlvReader.isEndOfContainer()) {
-          add(tlvReader.getUInt(AnonymousTag))
-        }
-        tlvReader.exitContainer()
-      }
-
-    return AttributeListAttribute(decodedValue)
-  }
-
-  suspend fun readFeatureMapAttribute(): UInt {
-    val ATTRIBUTE_ID: UInt = 65532u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Featuremap attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UInt = tlvReader.getUInt(AnonymousTag)
-
-    return decodedValue
-  }
-
-  suspend fun readClusterRevisionAttribute(): UShort {
-    val ATTRIBUTE_ID: UInt = 65533u
-
-    val attributePath =
-      AttributePath(endpointId = endpointId, clusterId = CLUSTER_ID, attributeId = ATTRIBUTE_ID)
-
-    val readRequest = ReadRequest(eventPaths = emptyList(), attributePaths = listOf(attributePath))
-
-    val response = controller.read(readRequest)
-
-    if (response.successes.isEmpty()) {
-      logger.log(Level.WARNING, "Read command failed")
-      throw IllegalStateException("Read command failed with failures: ${response.failures}")
-    }
-
-    logger.log(Level.FINE, "Read command succeeded")
-
-    val attributeData =
-      response.successes.filterIsInstance<ReadData.Attribute>().firstOrNull {
-        it.path.attributeId == ATTRIBUTE_ID
-      }
-
-    requireNotNull(attributeData) { "Clusterrevision attribute not found in response" }
-
-    // Decode the TLV data into the appropriate type
-    val tlvReader = TlvReader(attributeData.data)
-    val decodedValue: UShort = tlvReader.getUShort(AnonymousTag)
-
-    return decodedValue
-  }
-
-  companion object {
-    private val logger = Logger.getLogger(RadonConcentrationMeasurementCluster::class.java.name)
-    const val CLUSTER_ID: UInt = 1071u
-  }
-}
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni b/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
deleted file mode 100644
index d13dca8..0000000
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/files.gni
+++ /dev/null
@@ -1,312 +0,0 @@
-import("//build_overrides/build.gni")
-import("//build_overrides/chip.gni")
-
-matter_structs_sources = [
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlEntryStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlExtensionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AccessControlClusterAccessControlTargetStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterActionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActionsClusterEndpointListStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ActivatedCarbonFilterMonitoringClusterReplacementProductStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationBasicClusterApplicationStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationEPStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ApplicationLauncherClusterApplicationStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/AudioOutputClusterOutputInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterCapabilityMinimaStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BasicInformationClusterProductAppearanceStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BindingClusterTargetStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/BridgedDeviceBasicInformationClusterProductAppearanceStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterAdditionalInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterChannelPagingStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterLineupInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterPageTokenStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCastStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramCategoryStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterProgramStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ChannelClusterSeriesInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentControlClusterRatingNameStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterAdditionalInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterBrandingInformationStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterContentSearchStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterDimensionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterParameterStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterPlaybackPreferencesStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterStyleInformationStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ContentLauncherClusterTrackPreferenceStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterAverageLoadControlStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterDutyCycleControlStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterHeatingSourceControlStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlEventTransitionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterLoadControlProgramStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterPowerSavingsControlStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DemandResponseLoadControlClusterTemperatureControlStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterDeviceTypeStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DescriptorClusterSemanticTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterConstraintsStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterCostStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterForecastStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterPowerAdjustStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotAdjustmentStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DeviceEnergyManagementClusterSlotStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DishwasherModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/DoorLockClusterCredentialStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterEnergyMeasurementStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyRangeStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ElectricalEnergyMeasurementClusterMeasurementAccuracyStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/EnergyEvseClusterChargingTargetStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/FixedLabelClusterLabelStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralCommissioningClusterBasicCommissioningInfo.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GeneralDiagnosticsClusterNetworkInterface.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupInfoMapStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeyMapStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/GroupKeyManagementClusterGroupKeySetStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/HepaFilterMonitoringClusterReplacementProductStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/IcdManagementClusterMonitoringRegistrationStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/LaundryWasherModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaInputClusterInputInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterPlaybackPositionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackAttributesStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MediaPlaybackClusterTrackStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/MicrowaveOvenModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ModeSelectClusterSemanticTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterNetworkInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterThreadInterfaceScanResultStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/NetworkCommissioningClusterWiFiInterfaceScanResultStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterFabricDescriptorStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalCredentialsClusterNOCStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterErrorStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OperationalStateClusterOperationalStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OtaSoftwareUpdateRequestorClusterProviderLocation.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterErrorStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenCavityOperationalStateClusterOperationalStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/OvenModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatChargeFaultChangeType.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterBatFaultChangeType.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/PowerSourceClusterWiredFaultChangeType.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RefrigeratorAndTemperatureControlledCabinetModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcCleanModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterErrorStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcOperationalStateClusterOperationalStateStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeOptionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/RvcRunModeClusterModeTagStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterAttributeValuePair.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterExtensionFieldSet.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ScenesClusterSceneInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/SoftwareDiagnosticsClusterThreadMetricsStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TargetNavigatorClusterTargetInfoStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterWeeklyScheduleTransitionStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterNeighborTableStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterOperationalDatasetComponents.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterRouteTableStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThreadNetworkDiagnosticsClusterSecurityPolicy.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterDSTOffsetStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterFabricScopedTrustedTimeSourceStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTimeZoneStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/TimeSynchronizationClusterTrustedTimeSourceStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterDoubleNestedStructList.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNestedStructList.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterNullablesAndOptionalsStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterSimpleStruct.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestFabricScoped.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UnitTestingClusterTestListStructOctet.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/UserLabelClusterLabelStruct.kt",
-]
-
-matter_eventstructs_sources = [
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlEntryChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccessControlClusterAccessControlExtensionChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/AccountLoginClusterLoggedOutEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterActionFailedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ActionsClusterStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterLeaveEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterReachableChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BasicInformationClusterStartUpEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanSensorConfigurationClusterAlarmsStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BooleanStateClusterStateChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterReachableChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/BridgedDeviceBasicInformationClusterStartUpEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DemandResponseLoadControlClusterLoadControlEventStatusChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DeviceEnergyManagementClusterPowerAdjustEndEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DishwasherAlarmClusterNotifyEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorLockAlarmEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterDoorStateChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockOperationErrorEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/DoorLockClusterLockUserChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterCumulativeEnergyMeasuredEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ElectricalEnergyMeasurementClusterPeriodicEnergyMeasuredEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStartedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEnergyTransferStoppedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVConnectedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterEVNotDetectedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterFaultEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/EnergyEvseClusterRFIDEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterBootReasonEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterHardwareFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterNetworkFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/GeneralDiagnosticsClusterRadioFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/MediaPlaybackClusterStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationalErrorEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OperationalStateClusterOperationCompletionEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterDownloadErrorEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterStateTransitionEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OtaSoftwareUpdateRequestorClusterVersionAppliedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationalErrorEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/OvenCavityOperationalStateClusterOperationCompletionEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatChargeFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterBatFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/PowerSourceClusterWiredFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RefrigeratorAlarmClusterNotifyEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationalErrorEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/RvcOperationalStateClusterOperationCompletionEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterCOAlarmEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectCOAlarmEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterInterconnectSmokeAlarmEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterLowBatteryEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SmokeCoAlarmClusterSmokeAlarmEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SoftwareDiagnosticsClusterSoftwareFaultEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterInitialPressEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongPressEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterLongReleaseEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressCompleteEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterMultiPressOngoingEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterShortReleaseEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/SwitchClusterSwitchLatchedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TargetNavigatorClusterTargetUpdatedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterConnectionStatusEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ThreadNetworkDiagnosticsClusterNetworkFaultChangeEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterDSTStatusEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/TimeSynchronizationClusterTimeZoneStatusEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestEventEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/UnitTestingClusterTestFabricScopedEventEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveFaultEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/ValveConfigurationAndControlClusterValveStateChangedEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterAssociationFailureEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterConnectionStatusEvent.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/eventstructs/WiFiNetworkDiagnosticsClusterDisconnectionEvent.kt",
-]
-
-matter_clusters_sources = [
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccessControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AccountLoginCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActionsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ActivatedCarbonFilterMonitoringCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AdministratorCommissioningCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AirQualityCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationBasicCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ApplicationLauncherCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/AudioOutputCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BallastConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BarrierControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BasicInformationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BinaryInputBasicCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BindingCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanSensorConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BooleanStateCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/BridgedDeviceBasicInformationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonDioxideConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/CarbonMonoxideConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ChannelCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ColorControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentAppObserverCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ContentLauncherCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DemandResponseLoadControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DescriptorCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DeviceEnergyManagementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DiagnosticLogsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherAlarmCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DishwasherModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/DoorLockCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalEnergyMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ElectricalMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EnergyEvseCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/EthernetNetworkDiagnosticsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FanControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FaultInjectionCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FixedLabelCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FlowMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/FormaldehydeConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralCommissioningCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GeneralDiagnosticsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupKeyManagementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/GroupsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/HepaFilterMonitoringCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IcdManagementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IdentifyCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/IlluminanceMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/KeypadInputCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryDryerControlsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherControlsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LaundryWasherModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LevelControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LocalizationConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/LowPowerCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaInputCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MediaPlaybackCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/MicrowaveOvenModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ModeSelectCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NetworkCommissioningCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/NitrogenDioxideConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OccupancySensingCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OnOffSwitchConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalCredentialsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OperationalStateCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateProviderCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OtaSoftwareUpdateRequestorCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenCavityOperationalStateCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OvenModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/OzoneConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm10ConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm1ConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/Pm25ConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PowerSourceConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PressureMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyDiscoveryCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ProxyValidCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PulseWidthModulationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/PumpConfigurationAndControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RadonConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAlarmCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RefrigeratorAndTemperatureControlledCabinetModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RelativeHumidityMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcCleanModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcOperationalStateCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/RvcRunModeCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SampleMeiCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ScenesCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SmokeCoAlarmCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SoftwareDiagnosticsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/SwitchCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TargetNavigatorCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TemperatureMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThermostatUserInterfaceConfigurationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ThreadNetworkDiagnosticsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeFormatLocalizationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimerCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TimeSynchronizationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/TotalVolatileOrganicCompoundsConcentrationMeasurementCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitLocalizationCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UnitTestingCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/UserLabelCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/ValveConfigurationAndControlCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WakeOnLanCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WiFiNetworkDiagnosticsCluster.kt",
-  "${chip_root}/src/controller/java/generated/java/matter/devicecontroller/cluster/clusters/WindowCoveringCluster.kt",
-]
\ No newline at end of file
diff --git a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt b/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt
deleted file mode 100644
index ecd2bf0..0000000
--- a/src/controller/java/generated/java/matter/devicecontroller/cluster/structs/ThermostatClusterThermostatScheduleTransition.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- *
- *    Copyright (c) 2023 Project CHIP Authors
- *
- *    Licensed under the Apache License, Version 2.0 (the "License");
- *    you may not use this file except in compliance with the License.
- *    You may obtain a copy of the License at
- *
- *        http://www.apache.org/licenses/LICENSE-2.0
- *
- *    Unless required by applicable law or agreed to in writing, software
- *    distributed under the License is distributed on an "AS IS" BASIS,
- *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *    See the License for the specific language governing permissions and
- *    limitations under the License.
- */
-package matter.devicecontroller.cluster.structs
-
-import matter.devicecontroller.cluster.*
-import matter.tlv.ContextSpecificTag
-import matter.tlv.Tag
-import matter.tlv.TlvReader
-import matter.tlv.TlvWriter
-
-class ThermostatClusterThermostatScheduleTransition(
-  val transitionTime: UShort,
-  val heatSetpoint: Short?,
-  val coolSetpoint: Short?
-) {
-  override fun toString(): String = buildString {
-    append("ThermostatClusterThermostatScheduleTransition {\n")
-    append("\ttransitionTime : $transitionTime\n")
-    append("\theatSetpoint : $heatSetpoint\n")
-    append("\tcoolSetpoint : $coolSetpoint\n")
-    append("}\n")
-  }
-
-  fun toTlv(tlvTag: Tag, tlvWriter: TlvWriter) {
-    tlvWriter.apply {
-      startStructure(tlvTag)
-      put(ContextSpecificTag(TAG_TRANSITION_TIME), transitionTime)
-      if (heatSetpoint != null) {
-        put(ContextSpecificTag(TAG_HEAT_SETPOINT), heatSetpoint)
-      } else {
-        putNull(ContextSpecificTag(TAG_HEAT_SETPOINT))
-      }
-      if (coolSetpoint != null) {
-        put(ContextSpecificTag(TAG_COOL_SETPOINT), coolSetpoint)
-      } else {
-        putNull(ContextSpecificTag(TAG_COOL_SETPOINT))
-      }
-      endStructure()
-    }
-  }
-
-  companion object {
-    private const val TAG_TRANSITION_TIME = 0
-    private const val TAG_HEAT_SETPOINT = 1
-    private const val TAG_COOL_SETPOINT = 2
-
-    fun fromTlv(tlvTag: Tag, tlvReader: TlvReader): ThermostatClusterThermostatScheduleTransition {
-      tlvReader.enterStructure(tlvTag)
-      val transitionTime = tlvReader.getUShort(ContextSpecificTag(TAG_TRANSITION_TIME))
-      val heatSetpoint =
-        if (!tlvReader.isNull()) {
-          tlvReader.getShort(ContextSpecificTag(TAG_HEAT_SETPOINT))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_HEAT_SETPOINT))
-          null
-        }
-      val coolSetpoint =
-        if (!tlvReader.isNull()) {
-          tlvReader.getShort(ContextSpecificTag(TAG_COOL_SETPOINT))
-        } else {
-          tlvReader.getNull(ContextSpecificTag(TAG_COOL_SETPOINT))
-          null
-        }
-
-      tlvReader.exitContainer()
-
-      return ThermostatClusterThermostatScheduleTransition(
-        transitionTime,
-        heatSetpoint,
-        coolSetpoint
-      )
-    }
-  }
-}