diff --git a/jedi/__init__.py b/jedi/__init__.py
index 73516c6f..4763d6c4 100644
--- a/jedi/__init__.py
+++ b/jedi/__init__.py
@@ -36,14 +36,6 @@ good text editor, while still having very good IDE features for Python.
 
 __version__ = 0, 7, 1, 'alpha1'
 
-import sys
-
-# python imports are hell sometimes. Especially the combination of relative
-# imports and circular imports... Just avoid it:
-sys.path.insert(0, __path__[0])
-
 from .api import Script, Interpreter, NotFoundError, set_debug_function
 from .api import preload_module, defined_names
 from . import settings
-
-sys.path.pop(0)
diff --git a/jedi/common.py b/jedi/common.py
index 929c8497..48592585 100644
--- a/jedi/common.py
+++ b/jedi/common.py
@@ -2,8 +2,8 @@
 import sys
 import contextlib
 import functools
-import tokenizer as tokenize
 
+from jedi.parser import tokenizer as tokenize
 from jedi._compatibility import next, reraise
 from jedi import settings
 
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 0a126423..bdee12fd 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -79,10 +79,10 @@ from jedi import cache
 from jedi.parser import representation as pr
 from jedi import debug
 from jedi.evaluate import representation as er
+from jedi.evaluate import builtin
+from jedi.evaluate import imports
 import recursion
 import docstrings
-import builtin
-import imports
 import dynamic
 
 
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index afb63f56..2cb08c53 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -20,10 +20,10 @@ from jedi import cache
 from jedi import helpers
 from jedi import debug
 from jedi import common
+from jedi.evaluate import imports
+from jedi.evaluate import builtin
 import recursion
 import docstrings
-import imports
-import builtin
 import dynamic
 
 
diff --git a/jedi/parser/__init__.py b/jedi/parser/__init__.py
index 3e6c7f9c..93b6ecd0 100644
--- a/jedi/parser/__init__.py
+++ b/jedi/parser/__init__.py
@@ -17,7 +17,6 @@ complexity of the ``Parser`` (there's another parser sitting inside
 """
 from __future__ import with_statement
 
-import tokenizer as tokenize
 import keyword
 
 from jedi._compatibility import next, StringIO
@@ -25,6 +24,7 @@ from jedi import debug
 from jedi import common
 from jedi.parser import representation as pr
 from jedi.parser import token as token_pr
+from jedi.parser import tokenizer as tokenize
 
 
 class Parser(object):
diff --git a/jedi/tokenizer.py b/jedi/parser/tokenizer.py
similarity index 100%
rename from jedi/tokenizer.py
rename to jedi/parser/tokenizer.py