diff --git a/.coveragerc b/.coveragerc
index f062501bd35..568dfd79386 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -424,8 +424,13 @@ omit =
     homeassistant/components/*/zabbix.py
 
     homeassistant/components/zha/__init__.py
+    homeassistant/components/zha/binary_sensor.py
     homeassistant/components/zha/const.py
     homeassistant/components/zha/event.py
+    homeassistant/components/zha/fan.py
+    homeassistant/components/zha/light.py
+    homeassistant/components/zha/sensor.py
+    homeassistant/components/zha/switch.py
     homeassistant/components/zha/api.py
     homeassistant/components/zha/entities/*
     homeassistant/components/zha/helpers.py
diff --git a/homeassistant/components/binary_sensor/zha.py b/homeassistant/components/zha/binary_sensor.py
similarity index 100%
rename from homeassistant/components/binary_sensor/zha.py
rename to homeassistant/components/zha/binary_sensor.py
diff --git a/homeassistant/components/zha/const.py b/homeassistant/components/zha/const.py
index 29295e35060..ebcf020a9b8 100644
--- a/homeassistant/components/zha/const.py
+++ b/homeassistant/components/zha/const.py
@@ -102,7 +102,7 @@ def populate_data():
     """
     from zigpy import zcl, quirks
     from zigpy.profiles import PROFILES, zha, zll
-    from homeassistant.components.sensor import zha as sensor_zha
+    from .sensor import RelativeHumiditySensor
 
     if zha.PROFILE_ID not in DEVICE_CLASS:
         DEVICE_CLASS[zha.PROFILE_ID] = {}
@@ -162,7 +162,7 @@ def populate_data():
     # A map of device/cluster to component/sub-component
     CUSTOM_CLUSTER_MAPPINGS.update({
         (quirks.smartthings.SmartthingsTemperatureHumiditySensor, 64581):
-            ('sensor', sensor_zha.RelativeHumiditySensor)
+            ('sensor', RelativeHumiditySensor)
     })
 
     # A map of hass components to all Zigbee clusters it could use
diff --git a/homeassistant/components/fan/zha.py b/homeassistant/components/zha/fan.py
similarity index 100%
rename from homeassistant/components/fan/zha.py
rename to homeassistant/components/zha/fan.py
diff --git a/homeassistant/components/light/zha.py b/homeassistant/components/zha/light.py
similarity index 100%
rename from homeassistant/components/light/zha.py
rename to homeassistant/components/zha/light.py
diff --git a/homeassistant/components/sensor/zha.py b/homeassistant/components/zha/sensor.py
similarity index 100%
rename from homeassistant/components/sensor/zha.py
rename to homeassistant/components/zha/sensor.py
diff --git a/homeassistant/components/switch/zha.py b/homeassistant/components/zha/switch.py
similarity index 100%
rename from homeassistant/components/switch/zha.py
rename to homeassistant/components/zha/switch.py