diff --git a/setup.py b/setup.py
index 853bb692..a4b6162e 100755
--- a/setup.py
+++ b/setup.py
@@ -53,7 +53,7 @@ setup(
     packages=['tqdm'] + ['tqdm.' + i for i in find_packages('tqdm')],
     provides=['tqdm'],
     extras_require=extras_require,
-    entry_points={'console_scripts': ['tqdm=tqdm._main:main'], },
+    entry_points={'console_scripts': ['tqdm=tqdm.cli:main'], },
     package_data={'tqdm': ['CONTRIBUTING.md', 'LICENCE', 'examples/*.py',
                            'tqdm.1', 'requirements-dev.txt']},
     python_requires='>=2.6, !=3.0.*, !=3.1.*',
diff --git a/tqdm/_main.py b/tqdm/_main.py
index b4f472cd..ec5cd7a0 100644
--- a/tqdm/_main.py
+++ b/tqdm/_main.py
@@ -1,7 +1,7 @@
-from .main import *  # NOQA
-from .main import __all__  # NOQA
+from .cli import *  # NOQA
+from .cli import __all__  # NOQA
 from .std import TqdmDeprecationWarning
 from warnings import warn
 warn("This function will be removed in tqdm==5.0.0\n"
-     "Please use `tqdm.main.*` instead of `tqdm._main.*`",
+     "Please use `tqdm.cli.*` instead of `tqdm._main.*`",
      TqdmDeprecationWarning)
diff --git a/tqdm/_version.py b/tqdm/_version.py
index 8d57ecca..7cdb170f 100644
--- a/tqdm/_version.py
+++ b/tqdm/_version.py
@@ -5,7 +5,7 @@ from io import open as io_open
 __all__ = ["__version__"]
 
 # major, minor, patch, -extra
-version_info = 4, 36, 0
+version_info = 4, 36, 1
 
 # Nice string for the version
 __version__ = '.'.join(map(str, version_info))