diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index d951930c..515c523a 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -23,7 +23,7 @@ from jedi import settings
 from jedi import common
 from jedi import cache
 from jedi import interpret
-from jedi import keywords
+from jedi.api import keywords
 from jedi.api import classes
 from jedi.evaluate import Evaluator, filter_private_variable
 from jedi.evaluate import representation as er
diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index 20486ede..5dd086cc 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -9,13 +9,13 @@ import functools
 from jedi._compatibility import unicode, next
 from jedi import settings
 from jedi import common
-from jedi.parser import representation as pr
 from jedi import cache
+from jedi.parser import representation as pr
 from jedi.evaluate import representation as er
 from jedi.evaluate import iterable
 from jedi.evaluate import imports
 from jedi.evaluate import compiled
-from jedi import keywords
+from jedi.api import keywords
 
 
 def clear_caches():
diff --git a/jedi/keywords.py b/jedi/api/keywords.py
similarity index 100%
rename from jedi/keywords.py
rename to jedi/api/keywords.py