diff --git a/.coveragerc b/.coveragerc
index bab0eb8703e..e0b1e009f2f 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -122,7 +122,12 @@ omit =
     homeassistant/components/*/ecovacs.py
 
     homeassistant/components/esphome/__init__.py
-    homeassistant/components/*/esphome.py
+    homeassistant/components/esphome/binary_sensor.py
+    homeassistant/components/esphome/cover.py
+    homeassistant/components/esphome/fan.py
+    homeassistant/components/esphome/light.py
+    homeassistant/components/esphome/sensor.py
+    homeassistant/components/esphome/switch.py
 
     homeassistant/components/eufy.py
     homeassistant/components/*/eufy.py
diff --git a/CODEOWNERS b/CODEOWNERS
index 018fbed67f0..ee8c7892070 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -185,7 +185,6 @@ homeassistant/components/edp_redy.py @abmantis
 homeassistant/components/eight_sleep.py @mezz64
 homeassistant/components/*/eight_sleep.py @mezz64
 homeassistant/components/esphome/*.py @OttoWinter
-homeassistant/components/*/esphome.py @OttoWinter
 
 # H
 homeassistant/components/hive.py @Rendili @KJonline
diff --git a/homeassistant/components/binary_sensor/esphome.py b/homeassistant/components/esphome/binary_sensor.py
similarity index 100%
rename from homeassistant/components/binary_sensor/esphome.py
rename to homeassistant/components/esphome/binary_sensor.py
diff --git a/homeassistant/components/cover/esphome.py b/homeassistant/components/esphome/cover.py
similarity index 100%
rename from homeassistant/components/cover/esphome.py
rename to homeassistant/components/esphome/cover.py
diff --git a/homeassistant/components/fan/esphome.py b/homeassistant/components/esphome/fan.py
similarity index 100%
rename from homeassistant/components/fan/esphome.py
rename to homeassistant/components/esphome/fan.py
diff --git a/homeassistant/components/light/esphome.py b/homeassistant/components/esphome/light.py
similarity index 100%
rename from homeassistant/components/light/esphome.py
rename to homeassistant/components/esphome/light.py
diff --git a/homeassistant/components/sensor/esphome.py b/homeassistant/components/esphome/sensor.py
similarity index 100%
rename from homeassistant/components/sensor/esphome.py
rename to homeassistant/components/esphome/sensor.py
diff --git a/homeassistant/components/switch/esphome.py b/homeassistant/components/esphome/switch.py
similarity index 100%
rename from homeassistant/components/switch/esphome.py
rename to homeassistant/components/esphome/switch.py