diff --git a/.coveragerc b/.coveragerc
index 04d8f0203be..e6a1c752f87 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -168,8 +168,7 @@ omit =
     homeassistant/components/hlk_sw16.py
     homeassistant/components/*/hlk_sw16.py
 
-    homeassistant/components/homekit_controller/__init__.py
-    homeassistant/components/*/homekit_controller.py
+    homeassistant/components/homekit_controller/*
 
     homeassistant/components/homematic/__init__.py
     homeassistant/components/*/homematic.py
diff --git a/homeassistant/components/alarm_control_panel/homekit_controller.py b/homeassistant/components/homekit_controller/alarm_control_panel.py
similarity index 100%
rename from homeassistant/components/alarm_control_panel/homekit_controller.py
rename to homeassistant/components/homekit_controller/alarm_control_panel.py
diff --git a/homeassistant/components/climate/homekit_controller.py b/homeassistant/components/homekit_controller/climate.py
similarity index 100%
rename from homeassistant/components/climate/homekit_controller.py
rename to homeassistant/components/homekit_controller/climate.py
diff --git a/homeassistant/components/cover/homekit_controller.py b/homeassistant/components/homekit_controller/cover.py
similarity index 100%
rename from homeassistant/components/cover/homekit_controller.py
rename to homeassistant/components/homekit_controller/cover.py
diff --git a/homeassistant/components/light/homekit_controller.py b/homeassistant/components/homekit_controller/light.py
similarity index 100%
rename from homeassistant/components/light/homekit_controller.py
rename to homeassistant/components/homekit_controller/light.py
diff --git a/homeassistant/components/lock/homekit_controller.py b/homeassistant/components/homekit_controller/lock.py
similarity index 100%
rename from homeassistant/components/lock/homekit_controller.py
rename to homeassistant/components/homekit_controller/lock.py
diff --git a/homeassistant/components/switch/homekit_controller.py b/homeassistant/components/homekit_controller/switch.py
similarity index 100%
rename from homeassistant/components/switch/homekit_controller.py
rename to homeassistant/components/homekit_controller/switch.py