diff --git a/openai/commands/__init__.py b/openai/commands/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/bin/openai b/openai/commands/openai
similarity index 100%
rename from bin/openai
rename to openai/commands/openai
diff --git a/setup.py b/setup.py
index deeb740c98..ed03fc4a5f 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,11 @@
     ],
     extras_require={"dev": ["black~=21.6b0", "pytest==6.*"]},
     python_requires=">=3.7.1",
-    scripts=["bin/openai"],
+    entry_points={
+         'console_scripts': [
+             'openai=openai.commands.openai:main',
+         ],
+     },
     packages=find_packages(exclude=["tests", "tests.*"]),
     package_data={
         "openai": [