diff --git a/cachier/scripts/cli.py b/cachier/__main__.py
similarity index 100%
rename from cachier/scripts/cli.py
rename to cachier/__main__.py
diff --git a/cachier/scripts/__init__.py b/cachier/scripts/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/setup.py b/setup.py
index 13f92050..a1bbfc32 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
 """Setup file for the Cachier package."""
+from setuptools.config.expand import find_packages
 
 # This file is part of Cachier.
 # https://github.com/shaypal5/cachier
@@ -30,10 +31,10 @@
     author='Shay Palachy',
     author_email='shay.palachy@gmail.com',
     url='https://github.com/python-cachier/cachier',
-    packages=['cachier', 'cachier.scripts'],
+    packages=find_packages(exclude=['tests']),
     entry_points='''
         [console_scripts]
-        cachier=cachier.scripts.cli:cli
+        cachier=cachier.__naim__:cli
     ''',
     install_requires=[
         'watchdog', 'portalocker',