diff --git a/jedi/api/__init__.py b/jedi/api/__init__.py
index e470fafe..40d0dd55 100644
--- a/jedi/api/__init__.py
+++ b/jedi/api/__init__.py
@@ -13,9 +13,9 @@ import os
 import warnings
 import sys
 
-from jedi.parser.python import load_grammar
-from jedi.parser.python import tree
-from jedi.parser.python import parse
+from parso.python import load_grammar
+from parso.python import tree
+from parso.python import parse
 from jedi.parser_utils import get_executable_nodes, get_statement_of_position
 from jedi import debug
 from jedi import settings
diff --git a/jedi/api/classes.py b/jedi/api/classes.py
index 0aab4f9f..9c66310a 100644
--- a/jedi/api/classes.py
+++ b/jedi/api/classes.py
@@ -9,7 +9,7 @@ import re
 from jedi._compatibility import u
 from jedi import settings
 from jedi import common
-from jedi.parser.cache import parser_cache
+from parso.cache import parser_cache
 from jedi.cache import memoize_method
 from jedi.evaluate import representation as er
 from jedi.evaluate import instance
@@ -60,7 +60,7 @@ class BaseDefinition(object):
         self._evaluator = evaluator
         self._name = name
         """
-        An instance of :class:`jedi.parser.reprsentation.Name` subclass.
+        An instance of :class:`parso.reprsentation.Name` subclass.
         """
         self.is_keyword = isinstance(self._name, KeywordName)
 
diff --git a/jedi/api/completion.py b/jedi/api/completion.py
index bb6e2e18..bc92afdf 100644
--- a/jedi/api/completion.py
+++ b/jedi/api/completion.py
@@ -1,5 +1,5 @@
-from jedi.parser import token
-from jedi.parser.python import tree
+from parso import token
+from parso.python import tree
 from jedi import debug
 from jedi import settings
 from jedi.api import classes
diff --git a/jedi/api/helpers.py b/jedi/api/helpers.py
index 7d6606f2..dbb74adc 100644
--- a/jedi/api/helpers.py
+++ b/jedi/api/helpers.py
@@ -6,9 +6,9 @@ from collections import namedtuple
 
 from jedi._compatibility import u
 from jedi.evaluate.helpers import evaluate_call_of_leaf
-from jedi.parser.python.parser import Parser
-from jedi.parser.python import tree
-from jedi.parser import tokenize
+from parso.python.parser import Parser
+from parso.python import tree
+from parso import tokenize
 from jedi.cache import time_cache
 from jedi import common
 
diff --git a/jedi/api/keywords.py b/jedi/api/keywords.py
index 1ee92919..07edbdee 100644
--- a/jedi/api/keywords.py
+++ b/jedi/api/keywords.py
@@ -4,7 +4,7 @@ import keyword
 from jedi._compatibility import is_py3, is_py35
 from jedi import common
 from jedi.evaluate.filters import AbstractNameDefinition
-from jedi.parser.python.tree import Leaf
+from parso.python.tree import Leaf
 
 try:
     from pydoc_data import topics as pydoc_topics
diff --git a/jedi/api/usages.py b/jedi/api/usages.py
index a524d678..47b100ed 100644
--- a/jedi/api/usages.py
+++ b/jedi/api/usages.py
@@ -1,5 +1,5 @@
 from jedi.api import classes
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi.evaluate import imports
 from jedi.evaluate.filters import TreeNameDefinition
 from jedi.evaluate.representation import ModuleContext
diff --git a/jedi/cache.py b/jedi/cache.py
index 6fb463b5..f875a638 100644
--- a/jedi/cache.py
+++ b/jedi/cache.py
@@ -15,7 +15,7 @@ import time
 import inspect
 
 from jedi import settings
-from jedi.parser.cache import parser_cache
+from parso.cache import parser_cache
 
 _time_caches = {}
 
diff --git a/jedi/evaluate/__init__.py b/jedi/evaluate/__init__.py
index 1f1537e6..1c41bf54 100644
--- a/jedi/evaluate/__init__.py
+++ b/jedi/evaluate/__init__.py
@@ -63,7 +63,7 @@ that are not used are just being ignored.
 import copy
 import sys
 
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi import debug
 from jedi.common import unite
 from jedi.evaluate import representation as er
diff --git a/jedi/evaluate/analysis.py b/jedi/evaluate/analysis.py
index e013aa10..cdd00232 100644
--- a/jedi/evaluate/analysis.py
+++ b/jedi/evaluate/analysis.py
@@ -2,7 +2,7 @@
 Module for statical analysis.
 """
 from jedi import debug
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi.evaluate.compiled import CompiledObject
 
 
diff --git a/jedi/evaluate/compiled/fake.py b/jedi/evaluate/compiled/fake.py
index 20e911a1..8145f055 100644
--- a/jedi/evaluate/compiled/fake.py
+++ b/jedi/evaluate/compiled/fake.py
@@ -10,8 +10,8 @@ import types
 from itertools import chain
 
 from jedi._compatibility import is_py3, builtins, unicode, is_py34
-from jedi.parser.python import parse
-from jedi.parser.python import tree
+from parso.python import parse
+from parso.python import tree
 
 modules = {}
 
diff --git a/jedi/evaluate/compiled/mixed.py b/jedi/evaluate/compiled/mixed.py
index 1390ea47..107c5bef 100644
--- a/jedi/evaluate/compiled/mixed.py
+++ b/jedi/evaluate/compiled/mixed.py
@@ -5,7 +5,7 @@ Used only for REPL Completion.
 import inspect
 import os
 
-from jedi.parser.python import parse
+from parso.python import parse
 from jedi.evaluate import compiled
 from jedi.cache import underscore_memoization
 from jedi.evaluate import imports
diff --git a/jedi/evaluate/context.py b/jedi/evaluate/context.py
index cef67689..eda194ca 100644
--- a/jedi/evaluate/context.py
+++ b/jedi/evaluate/context.py
@@ -1,6 +1,6 @@
 from jedi._compatibility import Python3Method
 from jedi.common import unite
-from jedi.parser.python.tree import ExprStmt, CompFor
+from parso.python.tree import ExprStmt, CompFor
 from jedi.parser_utils import clean_scope_docstring, get_doc_with_call_signature
 
 
diff --git a/jedi/evaluate/docstrings.py b/jedi/evaluate/docstrings.py
index 341c77ad..b3ccef73 100644
--- a/jedi/evaluate/docstrings.py
+++ b/jedi/evaluate/docstrings.py
@@ -22,7 +22,7 @@ from jedi._compatibility import u
 from jedi.common import unite
 from jedi.evaluate import context
 from jedi.evaluate.cache import memoize_default
-from jedi.parser.python import parse
+from parso.python import parse
 from jedi.common import indent_block
 from jedi.evaluate.iterable import SequenceLiteralContext, FakeSequence
 
diff --git a/jedi/evaluate/dynamic.py b/jedi/evaluate/dynamic.py
index 53977fd2..cf6f19e3 100644
--- a/jedi/evaluate/dynamic.py
+++ b/jedi/evaluate/dynamic.py
@@ -17,7 +17,7 @@ It works as follows:
 - execute these calls and check the input. This work with a ``ParamListener``.
 """
 
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi import settings
 from jedi import debug
 from jedi.evaluate.cache import memoize_default
diff --git a/jedi/evaluate/filters.py b/jedi/evaluate/filters.py
index 198389a1..5afdb7a7 100644
--- a/jedi/evaluate/filters.py
+++ b/jedi/evaluate/filters.py
@@ -4,7 +4,7 @@ are needed for name resolution.
 """
 from abc import abstractmethod
 
-from jedi.parser.tree import search_ancestor
+from parso.tree import search_ancestor
 from jedi.evaluate import flow_analysis
 from jedi.common import to_list, unite
 from jedi.parser_utils import get_parent_scope
diff --git a/jedi/evaluate/finder.py b/jedi/evaluate/finder.py
index 1eb94c67..caad770c 100644
--- a/jedi/evaluate/finder.py
+++ b/jedi/evaluate/finder.py
@@ -15,8 +15,8 @@ Unfortunately every other thing is being ignored (e.g. a == '' would be easy to
 check for -> a is a string). There's big potential in these checks.
 """
 
-from jedi.parser.python import tree
-from jedi.parser.tree import search_ancestor
+from parso.python import tree
+from parso.tree import search_ancestor
 from jedi import debug
 from jedi.common import unite
 from jedi import settings
diff --git a/jedi/evaluate/helpers.py b/jedi/evaluate/helpers.py
index d85e94f8..a67779c4 100644
--- a/jedi/evaluate/helpers.py
+++ b/jedi/evaluate/helpers.py
@@ -2,7 +2,7 @@ import copy
 from itertools import chain
 from contextlib import contextmanager
 
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi.parser_utils import get_parent_scope
 
 
diff --git a/jedi/evaluate/imports.py b/jedi/evaluate/imports.py
index b0f5bedc..5ab9938b 100644
--- a/jedi/evaluate/imports.py
+++ b/jedi/evaluate/imports.py
@@ -20,10 +20,10 @@ from jedi._compatibility import find_module, unicode, ImplicitNSInfo
 from jedi import debug
 from jedi import settings
 from jedi.common import source_to_unicode, unite
-from jedi.parser.python import parse
-from jedi.parser.python import tree
-from jedi.parser.tree import search_ancestor
-from jedi.parser.cache import parser_cache
+from parso.python import parse
+from parso.python import tree
+from parso.tree import search_ancestor
+from parso.cache import parser_cache
 from jedi.evaluate import sys_path
 from jedi.evaluate import helpers
 from jedi.evaluate import compiled
diff --git a/jedi/evaluate/param.py b/jedi/evaluate/param.py
index b09419ce..c8b3b0ab 100644
--- a/jedi/evaluate/param.py
+++ b/jedi/evaluate/param.py
@@ -3,7 +3,7 @@ from collections import defaultdict
 from jedi._compatibility import zip_longest
 from jedi import debug
 from jedi import common
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi.evaluate import iterable
 from jedi.evaluate import analysis
 from jedi.evaluate import context
diff --git a/jedi/evaluate/pep0484.py b/jedi/evaluate/pep0484.py
index 84bd772d..0d126986 100644
--- a/jedi/evaluate/pep0484.py
+++ b/jedi/evaluate/pep0484.py
@@ -22,8 +22,8 @@ x support for type hint comments for functions, `# type: (int, str) -> int`.
 import itertools
 
 import os
-from jedi.parser import ParserSyntaxError
-from jedi.parser.python import parse, tree
+from parso import ParserSyntaxError
+from parso.python import parse, tree
 from jedi.common import unite
 from jedi.evaluate.cache import memoize_default
 from jedi.evaluate import compiled
diff --git a/jedi/evaluate/precedence.py b/jedi/evaluate/precedence.py
index fa1a8fe6..44335217 100644
--- a/jedi/evaluate/precedence.py
+++ b/jedi/evaluate/precedence.py
@@ -4,7 +4,6 @@ Handles operator precedence.
 import operator as op
 
 from jedi._compatibility import unicode
-from jedi.parser.python import tree
 from jedi import debug
 from jedi.evaluate.compiled import CompiledObject, create, builtin_from_name
 from jedi.evaluate import analysis
diff --git a/jedi/evaluate/representation.py b/jedi/evaluate/representation.py
index a47cfad6..a3497278 100644
--- a/jedi/evaluate/representation.py
+++ b/jedi/evaluate/representation.py
@@ -1,5 +1,5 @@
 """
-Like described in the :mod:`jedi.parser.python.tree` module,
+Like described in the :mod:`parso.python.tree` module,
 there's a need for an ast like module to represent the states of parsed
 modules.
 
@@ -44,7 +44,7 @@ import re
 from itertools import chain
 
 from jedi._compatibility import use_metaclass
-from jedi.parser.python import tree
+from parso.python import tree
 from jedi import debug
 from jedi import common
 from jedi.evaluate.cache import memoize_default, CachedMetaClass, NO_DEFAULT
diff --git a/jedi/evaluate/stdlib.py b/jedi/evaluate/stdlib.py
index 1dbfae73..e5a62d30 100644
--- a/jedi/evaluate/stdlib.py
+++ b/jedi/evaluate/stdlib.py
@@ -18,7 +18,7 @@ from jedi.evaluate import representation as er
 from jedi.evaluate.instance import InstanceFunctionExecution, \
     AbstractInstanceContext, CompiledInstance, BoundMethod
 from jedi.evaluate import iterable
-from jedi.parser.python import parse
+from parso.python import parse
 from jedi import debug
 from jedi.evaluate import precedence
 from jedi.evaluate import param
diff --git a/jedi/evaluate/sys_path.py b/jedi/evaluate/sys_path.py
index e967f6ee..262ba4ae 100644
--- a/jedi/evaluate/sys_path.py
+++ b/jedi/evaluate/sys_path.py
@@ -4,8 +4,8 @@ import sys
 from jedi.evaluate.site import addsitedir
 
 from jedi._compatibility import exec_function, unicode
-from jedi.parser.python import tree
-from jedi.parser.python import parse
+from parso.python import tree
+from parso.python import parse
 from jedi.evaluate.cache import memoize_default
 from jedi import debug
 from jedi import common
diff --git a/jedi/parser_utils.py b/jedi/parser_utils.py
index a3d97be9..e50596e3 100644
--- a/jedi/parser_utils.py
+++ b/jedi/parser_utils.py
@@ -2,7 +2,7 @@ import textwrap
 from inspect import cleandoc
 
 from jedi._compatibility import literal_eval, is_py3
-from jedi.parser.python import tree
+from parso.python import tree
 
 _EXECUTE_NODES = set([
     'funcdef', 'classdef', 'import_from', 'import_name', 'test', 'or_test',
diff --git a/jedi/refactoring.py b/jedi/refactoring.py
index 1e572638..7db7da90 100644
--- a/jedi/refactoring.py
+++ b/jedi/refactoring.py
@@ -16,7 +16,6 @@ import difflib
 
 from jedi import common
 from jedi.evaluate import helpers
-from jedi.parser.python import tree as pt
 
 
 class Refactoring(object):
diff --git a/test/run.py b/test/run.py
index c70a3366..4354ea1a 100755
--- a/test/run.py
+++ b/test/run.py
@@ -120,7 +120,7 @@ from functools import reduce
 import jedi
 from jedi import debug
 from jedi._compatibility import unicode, is_py3
-from jedi.parser.python import parse
+from parso.python import parse
 from jedi.api.classes import Definition
 from jedi.api.completion import get_user_scope
 from jedi import parser_utils
diff --git a/test/test_api/test_api.py b/test/test_api/test_api.py
index 3c8ea89d..e047922e 100644
--- a/test/test_api/test_api.py
+++ b/test/test_api/test_api.py
@@ -7,7 +7,7 @@ from textwrap import dedent
 from jedi import api
 from jedi._compatibility import is_py3
 from pytest import raises
-from jedi.parser import cache
+from parso import cache
 
 
 def test_preload_modules():
diff --git a/test/test_cache.py b/test/test_cache.py
index 6fb3af9e..92b5ef5f 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -9,10 +9,9 @@ import pytest
 
 import jedi
 from jedi import settings, cache
-from jedi.parser.cache import _NodeCacheItem, save_module, load_module, \
-    _get_hashed_path, parser_cache, _load_from_file_system, \
-    _save_to_file_system
-from jedi.parser.python import load_grammar
+from parso.cache import _NodeCacheItem, save_module, load_module, \
+    _get_hashed_path, parser_cache, _load_from_file_system
+from parso.python import load_grammar
 
 
 def test_modulepickling_change_cache_dir(monkeypatch, tmpdir):
diff --git a/test/test_evaluate/test_buildout_detection.py b/test/test_evaluate/test_buildout_detection.py
index 7c187d81..0bb36328 100644
--- a/test/test_evaluate/test_buildout_detection.py
+++ b/test/test_evaluate/test_buildout_detection.py
@@ -8,7 +8,7 @@ from jedi.evaluate.sys_path import (_get_parent_dir_with_file,
                                     _check_module)
 from jedi.evaluate import Evaluator
 from jedi.evaluate.representation import ModuleContext
-from jedi.parser.python import parse, load_grammar
+from parso.python import parse, load_grammar
 
 from ..helpers import cwd_at
 
diff --git a/test/test_evaluate/test_compiled.py b/test/test_evaluate/test_compiled.py
index 5bcaa2e7..396a0052 100644
--- a/test/test_evaluate/test_compiled.py
+++ b/test/test_evaluate/test_compiled.py
@@ -1,7 +1,7 @@
 from textwrap import dedent
 
 from jedi._compatibility import builtins, is_py3
-from jedi.parser.python import load_grammar
+from parso.python import load_grammar
 from jedi.evaluate import compiled, instance
 from jedi.evaluate.representation import FunctionContext
 from jedi.evaluate import Evaluator
diff --git a/test/test_parso_integration/test_basic.py b/test/test_parso_integration/test_basic.py
index 8840ca1f..e8fa48bc 100644
--- a/test/test_parso_integration/test_basic.py
+++ b/test/test_parso_integration/test_basic.py
@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from jedi.parser.python import parse
+from parso.python import parse
 import jedi
 
 
diff --git a/test/test_parso_integration/test_parser_utils.py b/test/test_parso_integration/test_parser_utils.py
index 55494a74..16663c95 100644
--- a/test/test_parso_integration/test_parser_utils.py
+++ b/test/test_parso_integration/test_parser_utils.py
@@ -1,7 +1,7 @@
 from jedi._compatibility import u, is_py3
 from jedi import parser_utils
-from jedi.parser.python import parse
-from jedi.parser.python import tree
+from parso.python import parse
+from parso.python import tree
 
 import pytest
 
diff --git a/test/test_regression.py b/test/test_regression.py
index 03557a64..f32db6ca 100644
--- a/test/test_regression.py
+++ b/test/test_regression.py
@@ -13,7 +13,7 @@ from jedi import Script
 from jedi import api
 from jedi import common
 from jedi.evaluate import imports
-from jedi.parser.python import parse
+from parso.python import parse
 from .helpers import TestCase, cwd_at
 
 #jedi.set_debug_function()