diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 3de53332..8e151e6a 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -83,7 +83,7 @@ from jedi.evaluate import imports
 from jedi.evaluate import recursion
 from jedi.evaluate import iterable
 from jedi.evaluate.cache import memoize_default
-from jedi import docstrings
+from jedi.evaluate import docstrings
 from jedi.evaluate import dynamic
 from jedi.evaluate import stdlib
 
diff --git a/jedi/docstrings.py b/jedi/evaluate/docstrings.py
similarity index 100%
rename from jedi/docstrings.py
rename to jedi/evaluate/docstrings.py
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index 3b09ff67..442d2025 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -20,7 +20,7 @@ from jedi.evaluate import builtin
 from jedi.evaluate import recursion
 from jedi.evaluate.cache import memoize_default, CachedMetaClass
 from jedi.evaluate import iterable
-from jedi import docstrings
+from jedi.evaluate import docstrings
 
 
 class Executable(pr.IsScope):
diff --git a/jedi/keywords.py b/jedi/keywords.py
index 19abde64..ab0fd4b3 100644
--- a/jedi/keywords.py
+++ b/jedi/keywords.py
@@ -1,5 +1,3 @@
-from __future__ import with_statement
-
 import pydoc
 import keyword