diff --git a/config/packages/rachio.yaml b/config/packages/rachio.yaml
index 73305c8a..0fb5d76e 100755
--- a/config/packages/rachio.yaml
+++ b/config/packages/rachio.yaml
@@ -14,3 +14,9 @@ homeassistant:
 #-------------------------------------------
 rachio:
   api_key: !secret rachio_api
+
+binary_sensor:
+  - platform: rachio
+
+switch:
+  - platform: rachio
diff --git a/config/switch/rachio.yaml.disabled b/config/switch/rachio.yaml.disabled
deleted file mode 100755
index ccd7cf0c..00000000
--- a/config/switch/rachio.yaml.disabled
+++ /dev/null
@@ -1,6 +0,0 @@
-######################################################################
-##  [Rachio Sprinkler system](http://amzn.to/2eoPKBW) - Smart Sprinkler controller
-######################################################################
-
-- platform: rachio
-  access_token: !secret rachio_api