diff --git a/letsencrypt/scripts/main.py b/letsencrypt/client/cli.py
similarity index 99%
rename from letsencrypt/scripts/main.py
rename to letsencrypt/client/cli.py
index e421e7ac2..47bd9189a 100644
--- a/letsencrypt/scripts/main.py
+++ b/letsencrypt/client/cli.py
@@ -1,4 +1,4 @@
-"""Let's Encrypt Client."""
+"""Let's Encrypt CLI."""
 # TODO: Sanity check all input.  Be sure to avoid shell code etc...
 import argparse
 import collections
diff --git a/letsencrypt/scripts/__init__.py b/letsencrypt/scripts/__init__.py
deleted file mode 100644
index 3860534ca..000000000
--- a/letsencrypt/scripts/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-"""Let's Encrypt scripts."""
diff --git a/setup.py b/setup.py
index 413345125..2f9e85526 100644
--- a/setup.py
+++ b/setup.py
@@ -104,7 +104,6 @@ setup(
         'letsencrypt.client.plugins.standalone.tests',
         'letsencrypt.client.tests',
         'letsencrypt.client.tests.display',
-        'letsencrypt.scripts',
     ],
 
     install_requires=install_requires,
@@ -119,7 +118,7 @@ setup(
 
     entry_points={
         'console_scripts': [
-            'letsencrypt = letsencrypt.scripts.main:main',
+            'letsencrypt = letsencrypt.client.cli:main',
             'jws = letsencrypt.acme.jose.jws:CLI.run',
         ],
         'letsencrypt.plugins': [