--- a/hgext/mozext/__init__.py
+++ b/hgext/mozext/__init__.py
@@ -389,18 +389,20 @@ hg._peerorrepo = peerorrepo
 def critique(ui, repo, entire=False, node=None, **kwargs):
     """Perform a critique of a changeset."""
     demandimport.disable()
 
     try:
         from flake8.engine import get_style_guide
     except ImportError:
         our_dir = os.path.dirname(__file__)
+        repo_root = os.path.normpath(os.path.join(our_dir, '..', '..'))
+        pylib = os.path.join(repo_root, 'pylib')
         for p in ('flake8', 'mccabe', 'pep8', 'pyflakes'):
-            sys.path.insert(0, os.path.join(our_dir, p))
+            sys.path.insert(0, os.path.join(pylib, p))
 
     from flake8.engine import get_style_guide
     from pep8 import DiffReport, parse_udiff
 
     style = get_style_guide(parse_argv=False, ignore='E128')
 
     ctx = repo[node]
 

rename from hgext/mozext/flake8/CHANGES.rst
rename to pylib/flake8/CHANGES.rst

rename from hgext/mozext/flake8/CONTRIBUTORS.txt
rename to pylib/flake8/CONTRIBUTORS.txt

rename from hgext/mozext/flake8/LICENSE
rename to pylib/flake8/LICENSE

rename from hgext/mozext/flake8/MANIFEST.in
rename to pylib/flake8/MANIFEST.in

rename from hgext/mozext/flake8/PKG-INFO
rename to pylib/flake8/PKG-INFO

rename from hgext/mozext/flake8/README.rst
rename to pylib/flake8/README.rst

rename from hgext/mozext/flake8/flake8.egg-info/PKG-INFO
rename to pylib/flake8/flake8.egg-info/PKG-INFO

rename from hgext/mozext/flake8/flake8.egg-info/SOURCES.txt
rename to pylib/flake8/flake8.egg-info/SOURCES.txt

rename from hgext/mozext/flake8/flake8.egg-info/dependency_links.txt
rename to pylib/flake8/flake8.egg-info/dependency_links.txt

rename from hgext/mozext/flake8/flake8.egg-info/entry_points.txt
rename to pylib/flake8/flake8.egg-info/entry_points.txt

rename from hgext/mozext/flake8/flake8.egg-info/requires.txt
rename to pylib/flake8/flake8.egg-info/requires.txt

rename from hgext/mozext/flake8/flake8.egg-info/top_level.txt
rename to pylib/flake8/flake8.egg-info/top_level.txt

rename from hgext/mozext/flake8/flake8/__init__.py
rename to pylib/flake8/flake8/__init__.py

rename from hgext/mozext/flake8/flake8/_pyflakes.py
rename to pylib/flake8/flake8/_pyflakes.py

rename from hgext/mozext/flake8/flake8/engine.py
rename to pylib/flake8/flake8/engine.py

rename from hgext/mozext/flake8/flake8/hooks.py
rename to pylib/flake8/flake8/hooks.py

rename from hgext/mozext/flake8/flake8/main.py
rename to pylib/flake8/flake8/main.py

rename from hgext/mozext/flake8/flake8/run.py
rename to pylib/flake8/flake8/run.py

rename from hgext/mozext/flake8/flake8/tests/__init__.py
rename to pylib/flake8/flake8/tests/__init__.py

rename from hgext/mozext/flake8/flake8/tests/test_flakes.py
rename to pylib/flake8/flake8/tests/test_flakes.py

rename from hgext/mozext/flake8/flake8/util.py
rename to pylib/flake8/flake8/util.py

rename from hgext/mozext/flake8/scripts/flake8.cmd
rename to pylib/flake8/scripts/flake8.cmd

rename from hgext/mozext/flake8/setup.cfg
rename to pylib/flake8/setup.cfg

rename from hgext/mozext/flake8/setup.py
rename to pylib/flake8/setup.py

rename from hgext/mozext/mccabe/PKG-INFO
rename to pylib/mccabe/PKG-INFO

rename from hgext/mozext/mccabe/README.rst
rename to pylib/mccabe/README.rst

rename from hgext/mozext/mccabe/mccabe.egg-info/PKG-INFO
rename to pylib/mccabe/mccabe.egg-info/PKG-INFO

rename from hgext/mozext/mccabe/mccabe.egg-info/SOURCES.txt
rename to pylib/mccabe/mccabe.egg-info/SOURCES.txt

rename from hgext/mozext/mccabe/mccabe.egg-info/dependency_links.txt
rename to pylib/mccabe/mccabe.egg-info/dependency_links.txt

rename from hgext/mozext/mccabe/mccabe.egg-info/entry_points.txt
rename to pylib/mccabe/mccabe.egg-info/entry_points.txt

rename from hgext/mozext/mccabe/mccabe.egg-info/not-zip-safe
rename to pylib/mccabe/mccabe.egg-info/not-zip-safe

rename from hgext/mozext/mccabe/mccabe.egg-info/top_level.txt
rename to pylib/mccabe/mccabe.egg-info/top_level.txt

rename from hgext/mozext/mccabe/mccabe.py
rename to pylib/mccabe/mccabe.py

rename from hgext/mozext/mccabe/setup.cfg
rename to pylib/mccabe/setup.cfg

rename from hgext/mozext/mccabe/setup.py
rename to pylib/mccabe/setup.py

rename from hgext/mozext/pep8/CHANGES.txt
rename to pylib/pep8/CHANGES.txt

rename from hgext/mozext/pep8/MANIFEST.in
rename to pylib/pep8/MANIFEST.in

rename from hgext/mozext/pep8/PKG-INFO
rename to pylib/pep8/PKG-INFO

rename from hgext/mozext/pep8/README.rst
rename to pylib/pep8/README.rst

rename from hgext/mozext/pep8/docs/Makefile
rename to pylib/pep8/docs/Makefile

rename from hgext/mozext/pep8/docs/advanced.rst
rename to pylib/pep8/docs/advanced.rst

rename from hgext/mozext/pep8/docs/api.rst
rename to pylib/pep8/docs/api.rst

rename from hgext/mozext/pep8/docs/conf.py
rename to pylib/pep8/docs/conf.py

rename from hgext/mozext/pep8/docs/developer.rst
rename to pylib/pep8/docs/developer.rst

rename from hgext/mozext/pep8/docs/index.rst
rename to pylib/pep8/docs/index.rst

rename from hgext/mozext/pep8/docs/intro.rst
rename to pylib/pep8/docs/intro.rst

rename from hgext/mozext/pep8/docs/make.bat
rename to pylib/pep8/docs/make.bat

rename from hgext/mozext/pep8/pep8.egg-info/PKG-INFO
rename to pylib/pep8/pep8.egg-info/PKG-INFO

rename from hgext/mozext/pep8/pep8.egg-info/SOURCES.txt
rename to pylib/pep8/pep8.egg-info/SOURCES.txt

rename from hgext/mozext/pep8/pep8.egg-info/dependency_links.txt
rename to pylib/pep8/pep8.egg-info/dependency_links.txt

rename from hgext/mozext/pep8/pep8.egg-info/entry_points.txt
rename to pylib/pep8/pep8.egg-info/entry_points.txt

rename from hgext/mozext/pep8/pep8.egg-info/namespace_packages.txt
rename to pylib/pep8/pep8.egg-info/namespace_packages.txt

rename from hgext/mozext/pep8/pep8.egg-info/not-zip-safe
rename to pylib/pep8/pep8.egg-info/not-zip-safe

rename from hgext/mozext/pep8/pep8.egg-info/top_level.txt
rename to pylib/pep8/pep8.egg-info/top_level.txt

rename from hgext/mozext/pep8/pep8.py
rename to pylib/pep8/pep8.py

rename from hgext/mozext/pep8/setup.cfg
rename to pylib/pep8/setup.cfg

rename from hgext/mozext/pep8/setup.py
rename to pylib/pep8/setup.py

rename from hgext/mozext/pep8/testsuite/E10.py
rename to pylib/pep8/testsuite/E10.py

rename from hgext/mozext/pep8/testsuite/E11.py
rename to pylib/pep8/testsuite/E11.py

rename from hgext/mozext/pep8/testsuite/E12.py
rename to pylib/pep8/testsuite/E12.py

rename from hgext/mozext/pep8/testsuite/E12not.py
rename to pylib/pep8/testsuite/E12not.py

rename from hgext/mozext/pep8/testsuite/E20.py
rename to pylib/pep8/testsuite/E20.py

rename from hgext/mozext/pep8/testsuite/E21.py
rename to pylib/pep8/testsuite/E21.py

rename from hgext/mozext/pep8/testsuite/E22.py
rename to pylib/pep8/testsuite/E22.py

rename from hgext/mozext/pep8/testsuite/E23.py
rename to pylib/pep8/testsuite/E23.py

rename from hgext/mozext/pep8/testsuite/E24.py
rename to pylib/pep8/testsuite/E24.py

rename from hgext/mozext/pep8/testsuite/E25.py
rename to pylib/pep8/testsuite/E25.py

rename from hgext/mozext/pep8/testsuite/E26.py
rename to pylib/pep8/testsuite/E26.py

rename from hgext/mozext/pep8/testsuite/E27.py
rename to pylib/pep8/testsuite/E27.py

rename from hgext/mozext/pep8/testsuite/E30.py
rename to pylib/pep8/testsuite/E30.py

rename from hgext/mozext/pep8/testsuite/E30not.py
rename to pylib/pep8/testsuite/E30not.py

rename from hgext/mozext/pep8/testsuite/E40.py
rename to pylib/pep8/testsuite/E40.py

rename from hgext/mozext/pep8/testsuite/E50.py
rename to pylib/pep8/testsuite/E50.py

rename from hgext/mozext/pep8/testsuite/E70.py
rename to pylib/pep8/testsuite/E70.py

rename from hgext/mozext/pep8/testsuite/E71.py
rename to pylib/pep8/testsuite/E71.py

rename from hgext/mozext/pep8/testsuite/E72.py
rename to pylib/pep8/testsuite/E72.py

rename from hgext/mozext/pep8/testsuite/E90.py
rename to pylib/pep8/testsuite/E90.py

rename from hgext/mozext/pep8/testsuite/W19.py
rename to pylib/pep8/testsuite/W19.py

rename from hgext/mozext/pep8/testsuite/W29.py
rename to pylib/pep8/testsuite/W29.py

rename from hgext/mozext/pep8/testsuite/W39.py
rename to pylib/pep8/testsuite/W39.py

rename from hgext/mozext/pep8/testsuite/W60.py
rename to pylib/pep8/testsuite/W60.py

rename from hgext/mozext/pep8/testsuite/__init__.py
rename to pylib/pep8/testsuite/__init__.py

rename from hgext/mozext/pep8/testsuite/latin-1.py
rename to pylib/pep8/testsuite/latin-1.py

rename from hgext/mozext/pep8/testsuite/noqa.py
rename to pylib/pep8/testsuite/noqa.py

rename from hgext/mozext/pep8/testsuite/python3.py
rename to pylib/pep8/testsuite/python3.py

rename from hgext/mozext/pep8/testsuite/support.py
rename to pylib/pep8/testsuite/support.py

rename from hgext/mozext/pep8/testsuite/test_all.py
rename to pylib/pep8/testsuite/test_all.py

rename from hgext/mozext/pep8/testsuite/test_api.py
rename to pylib/pep8/testsuite/test_api.py

rename from hgext/mozext/pep8/testsuite/test_shell.py
rename to pylib/pep8/testsuite/test_shell.py

rename from hgext/mozext/pep8/testsuite/utf-8-bom.py
rename to pylib/pep8/testsuite/utf-8-bom.py

rename from hgext/mozext/pep8/testsuite/utf-8.py
rename to pylib/pep8/testsuite/utf-8.py

rename from hgext/mozext/pyflakes/AUTHORS
rename to pylib/pyflakes/AUTHORS

rename from hgext/mozext/pyflakes/LICENSE
rename to pylib/pyflakes/LICENSE

rename from hgext/mozext/pyflakes/MANIFEST.in
rename to pylib/pyflakes/MANIFEST.in

rename from hgext/mozext/pyflakes/NEWS.txt
rename to pylib/pyflakes/NEWS.txt

rename from hgext/mozext/pyflakes/PKG-INFO
rename to pylib/pyflakes/PKG-INFO

rename from hgext/mozext/pyflakes/README.rst
rename to pylib/pyflakes/README.rst

rename from hgext/mozext/pyflakes/bin/pyflakes
rename to pylib/pyflakes/bin/pyflakes

rename from hgext/mozext/pyflakes/pyflakes.egg-info/PKG-INFO
rename to pylib/pyflakes/pyflakes.egg-info/PKG-INFO

rename from hgext/mozext/pyflakes/pyflakes.egg-info/SOURCES.txt
rename to pylib/pyflakes/pyflakes.egg-info/SOURCES.txt

rename from hgext/mozext/pyflakes/pyflakes.egg-info/dependency_links.txt
rename to pylib/pyflakes/pyflakes.egg-info/dependency_links.txt

rename from hgext/mozext/pyflakes/pyflakes.egg-info/entry_points.txt
rename to pylib/pyflakes/pyflakes.egg-info/entry_points.txt

rename from hgext/mozext/pyflakes/pyflakes.egg-info/top_level.txt
rename to pylib/pyflakes/pyflakes.egg-info/top_level.txt

rename from hgext/mozext/pyflakes/pyflakes/__init__.py
rename to pylib/pyflakes/pyflakes/__init__.py

rename from hgext/mozext/pyflakes/pyflakes/__main__.py
rename to pylib/pyflakes/pyflakes/__main__.py

rename from hgext/mozext/pyflakes/pyflakes/api.py
rename to pylib/pyflakes/pyflakes/api.py

rename from hgext/mozext/pyflakes/pyflakes/checker.py
rename to pylib/pyflakes/pyflakes/checker.py

rename from hgext/mozext/pyflakes/pyflakes/messages.py
rename to pylib/pyflakes/pyflakes/messages.py

rename from hgext/mozext/pyflakes/pyflakes/reporter.py
rename to pylib/pyflakes/pyflakes/reporter.py

rename from hgext/mozext/pyflakes/pyflakes/scripts/__init__.py
rename to pylib/pyflakes/pyflakes/scripts/__init__.py

rename from hgext/mozext/pyflakes/pyflakes/scripts/pyflakes.py
rename to pylib/pyflakes/pyflakes/scripts/pyflakes.py

rename from hgext/mozext/pyflakes/pyflakes/test/__init__.py
rename to pylib/pyflakes/pyflakes/test/__init__.py

rename from hgext/mozext/pyflakes/pyflakes/test/harness.py
rename to pylib/pyflakes/pyflakes/test/harness.py

rename from hgext/mozext/pyflakes/pyflakes/test/test_api.py
rename to pylib/pyflakes/pyflakes/test/test_api.py

rename from hgext/mozext/pyflakes/pyflakes/test/test_doctests.py
rename to pylib/pyflakes/pyflakes/test/test_doctests.py

rename from hgext/mozext/pyflakes/pyflakes/test/test_imports.py
rename to pylib/pyflakes/pyflakes/test/test_imports.py

rename from hgext/mozext/pyflakes/pyflakes/test/test_other.py
rename to pylib/pyflakes/pyflakes/test/test_other.py

rename from hgext/mozext/pyflakes/pyflakes/test/test_undefined_names.py
rename to pylib/pyflakes/pyflakes/test/test_undefined_names.py

rename from hgext/mozext/pyflakes/setup.cfg
rename to pylib/pyflakes/setup.cfg

rename from hgext/mozext/pyflakes/setup.py
rename to pylib/pyflakes/setup.py