diff --git a/.test/esphome_advanced.yaml b/.test/esphome_advanced.yaml
index c908250..4a889b9 100644
--- a/.test/esphome_advanced.yaml
+++ b/.test/esphome_advanced.yaml
@@ -6,6 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  advanced_package: !include ../nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
diff --git a/.test/esphome_advanced_climate_cool_esp_idf.yaml b/.test/esphome_advanced_climate_cool_esp_idf.yaml
index 23ab672..b43fc7d 100644
--- a/.test/esphome_advanced_climate_cool_esp_idf.yaml
+++ b/.test/esphome_advanced_climate_cool_esp_idf.yaml
@@ -6,9 +6,9 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  advanced_package: !include ../nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
 
 esp32:
   framework:
diff --git a/.test/esphome_advanced_climate_cool_esp_idf5.yaml b/.test/esphome_advanced_climate_cool_esp_idf5.yaml
index 1e99566..1db1f56 100644
--- a/.test/esphome_advanced_climate_cool_esp_idf5.yaml
+++ b/.test/esphome_advanced_climate_cool_esp_idf5.yaml
@@ -6,9 +6,9 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  advanced_package: !include ../nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
 
 esp32:
   framework:
diff --git a/.test/esphome_advanced_climate_heat.yaml b/.test/esphome_advanced_climate_heat.yaml
index 11d69e1..776e1e2 100644
--- a/.test/esphome_advanced_climate_heat.yaml
+++ b/.test/esphome_advanced_climate_heat.yaml
@@ -6,6 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  advanced_package: !include ../nspanel_esphome_advanced.yaml
-  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
+  advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../advanced/esphome/nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_climate_cool.yaml b/.test/esphome_climate_cool.yaml
index 128abac..0c9a354 100644
--- a/.test/esphome_climate_cool.yaml
+++ b/.test/esphome_climate_cool.yaml
@@ -6,6 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
diff --git a/.test/esphome_climate_heat.yaml b/.test/esphome_climate_heat.yaml
index c839972..8920018 100644
--- a/.test/esphome_climate_heat.yaml
+++ b/.test/esphome_climate_heat.yaml
@@ -6,6 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../nspanel_esphome_advanced.yaml
-  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
diff --git a/.test/esphome_core.yaml b/.test/esphome_core.yaml
index 7eecc37..9010332 100644
--- a/.test/esphome_core.yaml
+++ b/.test/esphome_core.yaml
@@ -6,6 +6,6 @@ substitutions:
 
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
-  #advanced_package: !include ../nspanel_esphome_advanced.yaml
-  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
-  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
+  #advanced_package: !include ../advanced/esphome/nspanel_esphome_advanced.yaml
+  #addon_climate_heat: !include ../advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../advanced/esphome/nspanel_esphome_addon_climate_cool.yaml