diff --git a/jrnl/__init__.py b/jrnl/__init__.py
index 8a71ba2f..794da406 100644
--- a/jrnl/__init__.py
+++ b/jrnl/__init__.py
@@ -12,7 +12,3 @@ __version__ = '2.0.0-rc1'
 __author__ = 'Manuel Ebert'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright 2013 - 2014 Manuel Ebert'
-
-from . import Journal
-from . import cli
-from .cli import run
diff --git a/setup.py b/setup.py
index ae2890f3..584c842c 100644
--- a/setup.py
+++ b/setup.py
@@ -95,7 +95,7 @@ setup(
     long_description=__doc__,
     entry_points={
         'console_scripts': [
-            'jrnl = jrnl:run',
+            'jrnl = jrnl.cli:run',
         ],
     },
     classifiers=[