--- a/configure.in
+++ b/configure.in
@@ -8780,17 +8780,17 @@ ACDEFINES=$DEFS
 AC_SUBST(ACDEFINES)
 rm -f confdefs.h
 mv confdefs.h.save confdefs.h
 
 dnl Create a virtualenv where we can install local Python packages
 AC_MSG_RESULT([Creating Python virtualenv])
 rm -rf _virtualenv
 mkdir -p _virtualenv
-MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/other-licenses/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
+MACOSX_DEPLOYMENT_TARGET= PYTHONDONTWRITEBYTECODE= $PYTHON $_topsrcdir/python/virtualenv/virtualenv.py --system-site-packages ./_virtualenv
 case "$host_os" in
 mingw*)
     PYTHON=$MOZ_BUILD_ROOT/_virtualenv/Scripts/python.exe
     ;;
 *)
     PYTHON=$MOZ_BUILD_ROOT/_virtualenv/bin/python
     ;;
 esac

rename from other-licenses/virtualenv/AUTHORS.txt
rename to python/virtualenv/AUTHORS.txt

rename from other-licenses/virtualenv/LICENSE.txt
rename to python/virtualenv/LICENSE.txt

rename from other-licenses/virtualenv/MANIFEST.in
rename to python/virtualenv/MANIFEST.in

rename from other-licenses/virtualenv/PKG-INFO
rename to python/virtualenv/PKG-INFO

rename from other-licenses/virtualenv/docs/index.txt
rename to python/virtualenv/docs/index.txt

rename from other-licenses/virtualenv/docs/news.txt
rename to python/virtualenv/docs/news.txt

rename from other-licenses/virtualenv/scripts/virtualenv
rename to python/virtualenv/scripts/virtualenv

rename from other-licenses/virtualenv/setup.cfg
rename to python/virtualenv/setup.cfg

rename from other-licenses/virtualenv/setup.py
rename to python/virtualenv/setup.py

rename from other-licenses/virtualenv/virtualenv.py
rename to python/virtualenv/virtualenv.py

rename from other-licenses/virtualenv/virtualenv_embedded/activate.bat
rename to python/virtualenv/virtualenv_embedded/activate.bat

rename from other-licenses/virtualenv/virtualenv_embedded/activate.csh
rename to python/virtualenv/virtualenv_embedded/activate.csh

rename from other-licenses/virtualenv/virtualenv_embedded/activate.fish
rename to python/virtualenv/virtualenv_embedded/activate.fish

rename from other-licenses/virtualenv/virtualenv_embedded/activate.ps1
rename to python/virtualenv/virtualenv_embedded/activate.ps1

rename from other-licenses/virtualenv/virtualenv_embedded/activate.sh
rename to python/virtualenv/virtualenv_embedded/activate.sh

rename from other-licenses/virtualenv/virtualenv_embedded/activate_this.py
rename to python/virtualenv/virtualenv_embedded/activate_this.py

rename from other-licenses/virtualenv/virtualenv_embedded/deactivate.bat
rename to python/virtualenv/virtualenv_embedded/deactivate.bat

rename from other-licenses/virtualenv/virtualenv_embedded/distribute_setup.py
rename to python/virtualenv/virtualenv_embedded/distribute_setup.py

rename from other-licenses/virtualenv/virtualenv_embedded/distutils-init.py
rename to python/virtualenv/virtualenv_embedded/distutils-init.py

rename from other-licenses/virtualenv/virtualenv_embedded/distutils.cfg
rename to python/virtualenv/virtualenv_embedded/distutils.cfg

rename from other-licenses/virtualenv/virtualenv_embedded/ez_setup.py
rename to python/virtualenv/virtualenv_embedded/ez_setup.py

rename from other-licenses/virtualenv/virtualenv_embedded/site.py
rename to python/virtualenv/virtualenv_embedded/site.py

rename from other-licenses/virtualenv/virtualenv_support/__init__.py
rename to python/virtualenv/virtualenv_support/__init__.py

rename from other-licenses/virtualenv/virtualenv_support/distribute-0.6.27.tar.gz
rename to python/virtualenv/virtualenv_support/distribute-0.6.27.tar.gz

rename from other-licenses/virtualenv/virtualenv_support/pip-1.1.tar.gz
rename to python/virtualenv/virtualenv_support/pip-1.1.tar.gz

rename from other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg
rename to python/virtualenv/virtualenv_support/setuptools-0.6c11-py2.4.egg

rename from other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg
rename to python/virtualenv/virtualenv_support/setuptools-0.6c11-py2.5.egg

rename from other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg
rename to python/virtualenv/virtualenv_support/setuptools-0.6c11-py2.6.egg

rename from other-licenses/virtualenv/virtualenv_support/setuptools-0.6c11-py2.7.egg
rename to python/virtualenv/virtualenv_support/setuptools-0.6c11-py2.7.egg