diff --git a/script/catmux_create_session b/catmux/catmux_create_session.py
old mode 100755
new mode 100644
similarity index 98%
rename from script/catmux_create_session
rename to catmux/catmux_create_session.py
index 6fed047..4e0960e
--- a/script/catmux_create_session
+++ b/catmux/catmux_create_session.py
@@ -24,7 +24,6 @@
 # SOFTWARE.
 # -- END LICENSE BLOCK ------------------------------------------------
 
-from __future__ import print_function
 import os
 import logging
 import subprocess
@@ -136,7 +135,3 @@ def main():
     session_config.run()
     if not args.detach:
         safe_call(["tmux", "-L", args.server_name, "attach", "-t", args.session_name])
-
-
-if __name__ == "__main__":
-    main()
diff --git a/setup.py b/setup.py
index 509ffac..2e0c209 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,9 @@
     long_description_content_type="text/markdown",
     url="https://github.com/fmauch/catmux",
     packages=setuptools.find_packages(),
-    scripts=["script/catmux_create_session"],
+    entry_points={
+        'console_scripts': ['catmux_create_session=catmux.catmux_create_session:main']
+    },
     classifiers=[
         "Programming Language :: Python :: 3",
         "License :: OSI Approved :: MIT License",