diff --git a/jedi/parsing.py b/jedi/parser/__init__.py
similarity index 99%
rename from jedi/parsing.py
rename to jedi/parser/__init__.py
index d469b344..8a656e28 100644
--- a/jedi/parsing.py
+++ b/jedi/parser/__init__.py
@@ -23,7 +23,7 @@ import keyword
 from jedi._compatibility import next, StringIO
 from jedi import debug
 from jedi import common
-from jedi import parsing_representation as pr
+from jedi.parser import representation as pr
 
 
 class Parser(object):
diff --git a/jedi/fast_parser.py b/jedi/parser/fast.py
similarity index 98%
rename from jedi/fast_parser.py
rename to jedi/parser/fast.py
index c2ef4ec4..45c97cfb 100644
--- a/jedi/fast_parser.py
+++ b/jedi/parser/fast.py
@@ -7,8 +7,8 @@ import re
 
 from jedi._compatibility import use_metaclass
 from jedi import settings
-from jedi import parsing
-from jedi import parsing_representation as pr
+from jedi.parser import Parser
+from jedi.parser import representation as pr
 from jedi import cache
 from jedi import common
 
@@ -62,10 +62,10 @@ class CachedFastParser(type):
     """ This is a metaclass for caching `FastParser`. """
     def __call__(self, source, module_path=None, user_position=None):
         if not settings.fast_parser:
-            return parsing.Parser(source, module_path, user_position)
+            return Parser(source, module_path, user_position)
 
         pi = cache.parser_cache.get(module_path, None)
-        if pi is None or isinstance(pi.parser, parsing.Parser):
+        if pi is None or isinstance(pi.parser, Parser):
             p = super(CachedFastParser, self).__call__(source, module_path,
                                                        user_position)
         else:
@@ -406,7 +406,7 @@ class FastParser(use_metaclass(CachedFastParser)):
             if nodes[index].code != code:
                 raise ValueError()
         except ValueError:
-            p = parsing.Parser(parser_code, self.module_path,
+            p = Parser(parser_code, self.module_path,
                                self.user_position, offset=(line_offset, 0),
                                is_fast_parser=True, top_module=self.module,
                                no_docstr=no_docstr)
diff --git a/jedi/parsing_representation.py b/jedi/parser/representation.py
similarity index 100%
rename from jedi/parsing_representation.py
rename to jedi/parser/representation.py