diff --git a/.coveragerc b/.coveragerc
index e0b1e009f2f..b55f9617d7a 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -303,7 +303,9 @@ omit =
     homeassistant/components/*/raincloud.py
 
     homeassistant/components/rainmachine/__init__.py
-    homeassistant/components/*/rainmachine.py
+    homeassistant/components/rainmachine/binary_sensor.py
+    homeassistant/components/rainmachine/sensor.py
+    homeassistant/components/rainmachine/switch.py
 
     homeassistant/components/raspihats.py
     homeassistant/components/*/raspihats.py
diff --git a/CODEOWNERS b/CODEOWNERS
index ee8c7892070..c4ea9d3dabe 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -230,7 +230,6 @@ homeassistant/components/*/qwikswitch.py @kellerza
 
 # R
 homeassistant/components/rainmachine/* @bachya
-homeassistant/components/*/rainmachine.py @bachya
 homeassistant/components/*/random.py @fabaff
 homeassistant/components/*/rfxtrx.py @danielhiversen
 
diff --git a/homeassistant/components/binary_sensor/rainmachine.py b/homeassistant/components/rainmachine/binary_sensor.py
similarity index 100%
rename from homeassistant/components/binary_sensor/rainmachine.py
rename to homeassistant/components/rainmachine/binary_sensor.py
diff --git a/homeassistant/components/sensor/rainmachine.py b/homeassistant/components/rainmachine/sensor.py
similarity index 100%
rename from homeassistant/components/sensor/rainmachine.py
rename to homeassistant/components/rainmachine/sensor.py
diff --git a/homeassistant/components/switch/rainmachine.py b/homeassistant/components/rainmachine/switch.py
similarity index 100%
rename from homeassistant/components/switch/rainmachine.py
rename to homeassistant/components/rainmachine/switch.py