diff --git a/homeassistant/scripts/__init__.py b/homeassistant/scripts/__init__.py
index 87771045b66..c1de77070dd 100644
--- a/homeassistant/scripts/__init__.py
+++ b/homeassistant/scripts/__init__.py
@@ -5,8 +5,15 @@ import os
 
 def run(args: str) -> int:
     """Run a script."""
-    scripts = [fil[:-3] for fil in os.listdir(os.path.dirname(__file__))
-               if fil.endswith('.py') and fil != '__init__.py']
+    scripts = []
+    path = os.path.dirname(__file__)
+    for fil in os.listdir(path):
+        if fil == '__pycache__':
+            continue
+        elif os.path.isdir(os.path.join(path, fil)):
+            scripts.append(fil)
+        elif fil != '__init__.py' and fil.endswith('.py'):
+            scripts.append(fil[:-3])
 
     if not args:
         print('Please specify a script to run.')
diff --git a/homeassistant/scripts/macos.py b/homeassistant/scripts/macos/__init__.py
similarity index 94%
rename from homeassistant/scripts/macos.py
rename to homeassistant/scripts/macos/__init__.py
index e16d1f6c272..a37275e715f 100644
--- a/homeassistant/scripts/macos.py
+++ b/homeassistant/scripts/macos/__init__.py
@@ -11,8 +11,7 @@ def install_osx():
     with os.popen('whoami') as inp:
         user = inp.read().strip()
 
-    cwd = os.path.dirname(__file__)
-    template_path = os.path.join(cwd, 'startup', 'launchd.plist')
+    template_path = os.path.join(os.path.dirname(__file__), 'launchd.plist')
 
     with open(template_path, 'r', encoding='utf-8') as inp:
         plist = inp.read()
diff --git a/homeassistant/startup/launchd.plist b/homeassistant/scripts/macos/launchd.plist
similarity index 100%
rename from homeassistant/startup/launchd.plist
rename to homeassistant/scripts/macos/launchd.plist