diff --git a/.test/esphome_advanced.yaml b/.test/esphome_advanced.yaml
index 4a889b9..5988896 100644
--- a/.test/esphome_advanced.yaml
+++ b/.test/esphome_advanced.yaml
@@ -7,5 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   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
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../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 b43fc7d..97d61ad 100644
--- a/.test/esphome_advanced_climate_cool_esp_idf.yaml
+++ b/.test/esphome_advanced_climate_cool_esp_idf.yaml
@@ -7,8 +7,8 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   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
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../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 1db1f56..da70745 100644
--- a/.test/esphome_advanced_climate_cool_esp_idf5.yaml
+++ b/.test/esphome_advanced_climate_cool_esp_idf5.yaml
@@ -7,8 +7,8 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   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
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../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 776e1e2..e01fa20 100644
--- a/.test/esphome_advanced_climate_heat.yaml
+++ b/.test/esphome_advanced_climate_heat.yaml
@@ -7,5 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   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
+  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
diff --git a/.test/esphome_advanced_climate_heat_customizations.yaml b/.test/esphome_advanced_climate_heat_customizations.yaml
index 3f4ae8e..4d8bb8e 100644
--- a/.test/esphome_advanced_climate_heat_customizations.yaml
+++ b/.test/esphome_advanced_climate_heat_customizations.yaml
@@ -8,8 +8,8 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   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
+  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cold: !include ../nspanel_esphome_addon_climate_cold.yaml
 
 ##### Customizations from Wiki #####
 api:
diff --git a/.test/esphome_climate_cool.yaml b/.test/esphome_climate_cool.yaml
index 0c9a354..dc6ca1c 100644
--- a/.test/esphome_climate_cool.yaml
+++ b/.test/esphome_climate_cool.yaml
@@ -7,5 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   #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
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
diff --git a/.test/esphome_climate_heat.yaml b/.test/esphome_climate_heat.yaml
index 8920018..3224ad5 100644
--- a/.test/esphome_climate_heat.yaml
+++ b/.test/esphome_climate_heat.yaml
@@ -7,5 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   #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
+  addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
diff --git a/.test/esphome_core.yaml b/.test/esphome_core.yaml
index 9010332..b10ca84 100644
--- a/.test/esphome_core.yaml
+++ b/.test/esphome_core.yaml
@@ -7,5 +7,5 @@ substitutions:
 packages:
   core_package: !include ../nspanel_esphome.yaml # Core package
   #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
+  #addon_climate_heat: !include ../nspanel_esphome_addon_climate_heat.yaml
+  #addon_climate_cool: !include ../nspanel_esphome_addon_climate_cool.yaml
diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml
index 5ea2b65..67cf386 100644
--- a/nspanel_esphome.yaml
+++ b/nspanel_esphome.yaml
@@ -1,3 +1,3 @@
 packages:
-  core_package: !include ./advanced/esphome/nspanel_esphome_core.yaml
-  upload_tft_package: !include ./advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
+  core_package: !include advanced/esphome/nspanel_esphome_core.yaml
+  upload_tft_package: !include advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
diff --git a/advanced/esphome/nspanel_esphome_addon_climate_cool.yaml b/nspanel_esphome_addon_climate_cool.yaml
similarity index 94%
rename from advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
rename to nspanel_esphome_addon_climate_cool.yaml
index f887e45..0b88392 100644
--- a/advanced/esphome/nspanel_esphome_addon_climate_cool.yaml
+++ b/nspanel_esphome_addon_climate_cool.yaml
@@ -34,4 +34,4 @@ climate:
         default_target_temperature_high: 21 ${temp_units}
 
 packages:
-  core_package: !include nspanel_esphome_addon_climate_base.yaml
+  climate_base_package: !include advanced/esphome/nspanel_esphome_addon_climate_base.yaml
diff --git a/advanced/esphome/nspanel_esphome_addon_climate_heat.yaml b/nspanel_esphome_addon_climate_heat.yaml
similarity index 94%
rename from advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
rename to nspanel_esphome_addon_climate_heat.yaml
index eab575d..388b67c 100644
--- a/advanced/esphome/nspanel_esphome_addon_climate_heat.yaml
+++ b/nspanel_esphome_addon_climate_heat.yaml
@@ -34,4 +34,4 @@ climate:
         default_target_temperature_low: 21 ${temp_units}
 
 packages:
-  core_package: !include nspanel_esphome_addon_climate_base.yaml
+  climate_base_package: !include advanced/esphome/nspanel_esphome_addon_climate_base.yaml