diff --git a/jedi/__init__.py b/jedi/__init__.py
index 4763d6c4..9a41f275 100644
--- a/jedi/__init__.py
+++ b/jedi/__init__.py
@@ -36,6 +36,6 @@ good text editor, while still having very good IDE features for Python.
 
 __version__ = 0, 7, 1, 'alpha1'
 
-from .api import Script, Interpreter, NotFoundError, set_debug_function
-from .api import preload_module, defined_names
-from . import settings
+from jedi.api import Script, Interpreter, NotFoundError, set_debug_function
+from jedi.api import preload_module, defined_names
+from jedi import settings
diff --git a/jedi/debug.py b/jedi/debug.py
index d4ab9106..42edd3ce 100644
--- a/jedi/debug.py
+++ b/jedi/debug.py
@@ -1,4 +1,4 @@
-from _compatibility import u, encoding, is_py3k
+from jedi._compatibility import u, encoding, is_py3k
 import inspect
 import time
 
diff --git a/jedi/interpret.py b/jedi/interpret.py
index 2a7bc85d..1e17c05f 100644
--- a/jedi/interpret.py
+++ b/jedi/interpret.py
@@ -3,9 +3,9 @@ Module to handle interpreted Python objects.
 """
 
 import itertools
-import tokenize
 
 from jedi.parser import representation as pr
+from jedi.parser import tokenizer as tokenize
 from jedi.parser import token
 
 
diff --git a/jedi/parser/representation.py b/jedi/parser/representation.py
index c0e931f6..ca796187 100644
--- a/jedi/parser/representation.py
+++ b/jedi/parser/representation.py
@@ -37,13 +37,13 @@ from __future__ import with_statement
 
 import os
 import re
-import tokenizer as tokenize
 from inspect import cleandoc
 from ast import literal_eval
 
 from jedi._compatibility import next, Python3Method, encoding, unicode, is_py3k
 from jedi import common
 from jedi import debug
+from jedi.parser import tokenizer as tokenize
 
 
 class Base(object):