diff --git a/.github/workflows/validate_esphome.yml b/.github/workflows/validate_esphome.yml
index 007de45..6a6d1ae 100644
--- a/.github/workflows/validate_esphome.yml
+++ b/.github/workflows/validate_esphome.yml
@@ -6,12 +6,12 @@ on:
   push:
     paths:
       - "nspanel_esphome*.yaml"
-      - "advanced/esphome/nspanel_esphome*.yaml"
+      - "esphome/nspanel_esphome*.yaml"
       - ".test/*.yaml"
   pull_request:
     paths:
       - "nspanel_esphome*.yaml"
-      - "advanced/esphome/nspanel_esphome*.yaml"
+      - "esphome/nspanel_esphome*.yaml"
       - ".test/*.yaml"
   workflow_dispatch:
 
@@ -30,20 +30,26 @@ jobs:
           fetch-depth: '0'
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
-      - name: Validate nspanel_esphome_basic.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_basic.yaml
-      - name: Validate nspanel_esphome_addon_upload_tft.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
-      - name: Validate nspanel_esphome_advanced.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_advanced.yaml
-      - name: Validate nspanel_esphome_addon_climate_base.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_heat.yaml
       - name: Validate nspanel_esphome_addon_climate_dual.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_dual.yaml
+      - name: Validate nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_upload_tft.yaml
+      - name: Validate nspanel_esphome_advanced.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_advanced.yaml
+      - name: Validate nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_base.yaml
+      - name: Validate nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_cool.yaml
+      - name: Validate nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_heat.yaml
+      - name: Validate nspanel_esphome_addon_climate_dual.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_dual.yaml
 
   build_core:
     name: Core
diff --git a/.github/workflows/validate_esphome_beta.yml b/.github/workflows/validate_esphome_beta.yml
index 794b49e..e700f52 100644
--- a/.github/workflows/validate_esphome_beta.yml
+++ b/.github/workflows/validate_esphome_beta.yml
@@ -20,20 +20,26 @@ jobs:
           fetch-depth: '0'
       - name: Validate nspanel_esphome.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome.yaml
-      - name: Validate nspanel_esphome_basic.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_basic.yaml
-      - name: Validate nspanel_esphome_addon_upload_tft.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_upload_tft.yaml
-      - name: Validate nspanel_esphome_advanced.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_advanced.yaml
-      - name: Validate nspanel_esphome_addon_climate_base.yaml
-        run: yamllint -c "./.rules/yamllint.yml" advanced/esphome/nspanel_esphome_addon_climate_base.yaml
+      - name: Validate nspanel_esphome_core.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_core.yaml
       - name: Validate nspanel_esphome_addon_climate_cool.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_cool.yaml
       - name: Validate nspanel_esphome_addon_climate_heat.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_heat.yaml
       - name: Validate nspanel_esphome_addon_climate_dual.yaml
         run: yamllint -c "./.rules/yamllint.yml" nspanel_esphome_addon_climate_dual.yaml
+      - name: Validate nspanel_esphome_addon_upload_tft.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_upload_tft.yaml
+      - name: Validate nspanel_esphome_advanced.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_advanced.yaml
+      - name: Validate nspanel_esphome_addon_climate_base.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_base.yaml
+      - name: Validate nspanel_esphome_addon_climate_cool.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_cool.yaml
+      - name: Validate nspanel_esphome_addon_climate_heat.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_heat.yaml
+      - name: Validate nspanel_esphome_addon_climate_dual.yaml
+        run: yamllint -c "./.rules/yamllint.yml" esphome/nspanel_esphome_addon_climate_dual.yaml
 
   build_core:
     name: Core