diff --git a/.coveragerc b/.coveragerc
index faf8b89d801..80b6305881c 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -281,7 +281,8 @@ omit =
     homeassistant/components/*/opentherm_gw.py
 
     homeassistant/components/openuv/__init__.py
-    homeassistant/components/*/openuv.py
+    homeassistant/components/openuv/binary_sensor.py
+    homeassistant/components/openuv/sensor.py
 
     homeassistant/components/plum_lightpad.py
     homeassistant/components/*/plum_lightpad.py
diff --git a/CODEOWNERS b/CODEOWNERS
index 25c1cb84567..cfb83919b9c 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -218,7 +218,6 @@ homeassistant/components/*/ness_alarm.py @nickw444
 
 # O
 homeassistant/components/openuv/* @bachya
-homeassistant/components/*/openuv.py @bachya
 
 # P
 homeassistant/components/point/* @fredrike
diff --git a/homeassistant/components/binary_sensor/openuv.py b/homeassistant/components/openuv/binary_sensor.py
similarity index 100%
rename from homeassistant/components/binary_sensor/openuv.py
rename to homeassistant/components/openuv/binary_sensor.py
diff --git a/homeassistant/components/sensor/openuv.py b/homeassistant/components/openuv/sensor.py
similarity index 100%
rename from homeassistant/components/sensor/openuv.py
rename to homeassistant/components/openuv/sensor.py