diff --git a/.coveragerc b/.coveragerc
index b55f9617d7a..faf8b89d801 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -337,7 +337,7 @@ omit =
     homeassistant/components/*/sense.py
 
     homeassistant/components/simplisafe/__init__.py
-    homeassistant/components/*/simplisafe.py
+    homeassistant/components/simplisafe/alarm_control_panel.py
 
     homeassistant/components/sisyphus.py
     homeassistant/components/*/sisyphus.py
diff --git a/CODEOWNERS b/CODEOWNERS
index c4ea9d3dabe..25c1cb84567 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -235,7 +235,6 @@ homeassistant/components/*/rfxtrx.py @danielhiversen
 
 # S
 homeassistant/components/simplisafe/* @bachya
-homeassistant/components/*/simplisafe.py @bachya
 
 # T
 homeassistant/components/tahoma.py @philklei
diff --git a/homeassistant/components/alarm_control_panel/simplisafe.py b/homeassistant/components/simplisafe/alarm_control_panel.py
similarity index 100%
rename from homeassistant/components/alarm_control_panel/simplisafe.py
rename to homeassistant/components/simplisafe/alarm_control_panel.py