diff --git a/jedi/api.py b/jedi/api.py
index e14b0ac7..7d369f86 100644
--- a/jedi/api.py
+++ b/jedi/api.py
@@ -25,10 +25,10 @@ from jedi import cache
 from jedi import modules
 from jedi import interpret
 from jedi._compatibility import next, unicode, builtins
+from jedi import evaluate
+from jedi.evaluate import representation as er
 import keywords
-import evaluate
 import api_classes
-import evaluate_representation as er
 import dynamic
 import imports
 import builtin
diff --git a/jedi/api_classes.py b/jedi/api_classes.py
index ccbb576d..f2fb1a5c 100644
--- a/jedi/api_classes.py
+++ b/jedi/api_classes.py
@@ -13,12 +13,12 @@ from jedi import settings
 from jedi import common
 from jedi.parser import representation as pr
 from jedi import cache
+from jedi import evaluate
+from jedi import representation as er
 import keywords
 import recursion
 import dynamic
-import evaluate
 import imports
-import evaluate_representation as er
 
 
 def _clear_caches():
diff --git a/jedi/docstrings.py b/jedi/docstrings.py
index bbc3777b..4ae7c842 100644
--- a/jedi/docstrings.py
+++ b/jedi/docstrings.py
@@ -18,8 +18,8 @@ import re
 
 from jedi import cache
 from jedi.parser import Parser
-import evaluate
-import evaluate_representation as er
+from jedi import evaluate
+from jedi.evaluate import representation as er
 
 DOCSTRING_PARAM_PATTERNS = [
     r'\s*:type\s+%s:\s*([^\n]+)',  # Sphinx
diff --git a/jedi/evaluate.py b/jedi/evaluate/__init__.py
similarity index 99%
rename from jedi/evaluate.py
rename to jedi/evaluate/__init__.py
index a510f4c3..ae3d5036 100644
--- a/jedi/evaluate.py
+++ b/jedi/evaluate/__init__.py
@@ -78,7 +78,7 @@ from jedi import common
 from jedi import cache
 from jedi.parser import representation as pr
 from jedi import debug
-import evaluate_representation as er
+from jedi.evaluate import representation as er
 import recursion
 import docstrings
 import builtin
diff --git a/jedi/evaluate_representation.py b/jedi/evaluate/representation.py
similarity index 99%
rename from jedi/evaluate_representation.py
rename to jedi/evaluate/representation.py
index 2abb8aa0..c5b63fca 100644
--- a/jedi/evaluate_representation.py
+++ b/jedi/evaluate/representation.py
@@ -23,7 +23,6 @@ from jedi import common
 import recursion
 import docstrings
 import imports
-import evaluate
 import builtin
 import dynamic
 
diff --git a/jedi/imports.py b/jedi/imports.py
index a34753fc..a28b94e0 100644
--- a/jedi/imports.py
+++ b/jedi/imports.py
@@ -25,7 +25,6 @@ from jedi import debug
 from jedi.parser import representation as pr
 from jedi import cache
 import builtin
-import evaluate
 
 # for debugging purposes only
 imports_processed = 0
diff --git a/jedi/recursion.py b/jedi/recursion.py
index 82df1826..da083372 100644
--- a/jedi/recursion.py
+++ b/jedi/recursion.py
@@ -10,7 +10,7 @@ calls.
 from jedi.parser import representation as pr
 from jedi import debug
 from jedi import settings
-import evaluate_representation as er
+from jedi.evaluate import representation as er
 import builtin