diff --git a/.gitignore b/modules/libjuju/.gitignore
similarity index 100%
rename from .gitignore
rename to modules/libjuju/.gitignore
diff --git a/.travis.yml b/modules/libjuju/.travis.yml
similarity index 100%
rename from .travis.yml
rename to modules/libjuju/.travis.yml
diff --git a/CONTRIBUTORS b/modules/libjuju/CONTRIBUTORS
similarity index 100%
rename from CONTRIBUTORS
rename to modules/libjuju/CONTRIBUTORS
diff --git a/LICENSE b/modules/libjuju/LICENSE
similarity index 100%
rename from LICENSE
rename to modules/libjuju/LICENSE
diff --git a/MANIFEST.in b/modules/libjuju/MANIFEST.in
similarity index 100%
rename from MANIFEST.in
rename to modules/libjuju/MANIFEST.in
diff --git a/Makefile b/modules/libjuju/Makefile
similarity index 100%
rename from Makefile
rename to modules/libjuju/Makefile
diff --git a/README.rst b/modules/libjuju/README.rst
similarity index 100%
rename from README.rst
rename to modules/libjuju/README.rst
diff --git a/TODO b/modules/libjuju/TODO
similarity index 100%
rename from TODO
rename to modules/libjuju/TODO
diff --git a/VERSION b/modules/libjuju/VERSION
similarity index 100%
rename from VERSION
rename to modules/libjuju/VERSION
diff --git a/docs/Makefile b/modules/libjuju/docs/Makefile
similarity index 100%
rename from docs/Makefile
rename to modules/libjuju/docs/Makefile
diff --git a/docs/_extensions/automembersummary.py b/modules/libjuju/docs/_extensions/automembersummary.py
similarity index 100%
rename from docs/_extensions/automembersummary.py
rename to modules/libjuju/docs/_extensions/automembersummary.py
diff --git a/docs/_static/custom.css b/modules/libjuju/docs/_static/custom.css
similarity index 100%
rename from docs/_static/custom.css
rename to modules/libjuju/docs/_static/custom.css
diff --git a/docs/api/juju.action.rst b/modules/libjuju/docs/api/juju.action.rst
similarity index 100%
rename from docs/api/juju.action.rst
rename to modules/libjuju/docs/api/juju.action.rst
diff --git a/docs/api/juju.annotation.rst b/modules/libjuju/docs/api/juju.annotation.rst
similarity index 100%
rename from docs/api/juju.annotation.rst
rename to modules/libjuju/docs/api/juju.annotation.rst
diff --git a/docs/api/juju.application.rst b/modules/libjuju/docs/api/juju.application.rst
similarity index 100%
rename from docs/api/juju.application.rst
rename to modules/libjuju/docs/api/juju.application.rst
diff --git a/docs/api/juju.client.rst b/modules/libjuju/docs/api/juju.client.rst
similarity index 100%
rename from docs/api/juju.client.rst
rename to modules/libjuju/docs/api/juju.client.rst
diff --git a/docs/api/juju.cloud.rst b/modules/libjuju/docs/api/juju.cloud.rst
similarity index 100%
rename from docs/api/juju.cloud.rst
rename to modules/libjuju/docs/api/juju.cloud.rst
diff --git a/docs/api/juju.constraints.rst b/modules/libjuju/docs/api/juju.constraints.rst
similarity index 100%
rename from docs/api/juju.constraints.rst
rename to modules/libjuju/docs/api/juju.constraints.rst
diff --git a/docs/api/juju.controller.rst b/modules/libjuju/docs/api/juju.controller.rst
similarity index 100%
rename from docs/api/juju.controller.rst
rename to modules/libjuju/docs/api/juju.controller.rst
diff --git a/docs/api/juju.delta.rst b/modules/libjuju/docs/api/juju.delta.rst
similarity index 100%
rename from docs/api/juju.delta.rst
rename to modules/libjuju/docs/api/juju.delta.rst
diff --git a/docs/api/juju.errors.rst b/modules/libjuju/docs/api/juju.errors.rst
similarity index 100%
rename from docs/api/juju.errors.rst
rename to modules/libjuju/docs/api/juju.errors.rst
diff --git a/docs/api/juju.exceptions.rst b/modules/libjuju/docs/api/juju.exceptions.rst
similarity index 100%
rename from docs/api/juju.exceptions.rst
rename to modules/libjuju/docs/api/juju.exceptions.rst
diff --git a/docs/api/juju.juju.rst b/modules/libjuju/docs/api/juju.juju.rst
similarity index 100%
rename from docs/api/juju.juju.rst
rename to modules/libjuju/docs/api/juju.juju.rst
diff --git a/docs/api/juju.loop.rst b/modules/libjuju/docs/api/juju.loop.rst
similarity index 100%
rename from docs/api/juju.loop.rst
rename to modules/libjuju/docs/api/juju.loop.rst
diff --git a/docs/api/juju.machine.rst b/modules/libjuju/docs/api/juju.machine.rst
similarity index 100%
rename from docs/api/juju.machine.rst
rename to modules/libjuju/docs/api/juju.machine.rst
diff --git a/docs/api/juju.model.rst b/modules/libjuju/docs/api/juju.model.rst
similarity index 100%
rename from docs/api/juju.model.rst
rename to modules/libjuju/docs/api/juju.model.rst
diff --git a/docs/api/juju.placement.rst b/modules/libjuju/docs/api/juju.placement.rst
similarity index 100%
rename from docs/api/juju.placement.rst
rename to modules/libjuju/docs/api/juju.placement.rst
diff --git a/docs/api/juju.relation.rst b/modules/libjuju/docs/api/juju.relation.rst
similarity index 100%
rename from docs/api/juju.relation.rst
rename to modules/libjuju/docs/api/juju.relation.rst
diff --git a/docs/api/juju.tag.rst b/modules/libjuju/docs/api/juju.tag.rst
similarity index 100%
rename from docs/api/juju.tag.rst
rename to modules/libjuju/docs/api/juju.tag.rst
diff --git a/docs/api/juju.unit.rst b/modules/libjuju/docs/api/juju.unit.rst
similarity index 100%
rename from docs/api/juju.unit.rst
rename to modules/libjuju/docs/api/juju.unit.rst
diff --git a/docs/api/juju.utils.rst b/modules/libjuju/docs/api/juju.utils.rst
similarity index 100%
rename from docs/api/juju.utils.rst
rename to modules/libjuju/docs/api/juju.utils.rst
diff --git a/docs/api/modules.rst b/modules/libjuju/docs/api/modules.rst
similarity index 100%
rename from docs/api/modules.rst
rename to modules/libjuju/docs/api/modules.rst
diff --git a/docs/changelog.rst b/modules/libjuju/docs/changelog.rst
similarity index 100%
rename from docs/changelog.rst
rename to modules/libjuju/docs/changelog.rst
diff --git a/docs/conf.py b/modules/libjuju/docs/conf.py
similarity index 100%
rename from docs/conf.py
rename to modules/libjuju/docs/conf.py
diff --git a/docs/index.rst b/modules/libjuju/docs/index.rst
similarity index 100%
rename from docs/index.rst
rename to modules/libjuju/docs/index.rst
diff --git a/docs/narrative/application.rst b/modules/libjuju/docs/narrative/application.rst
similarity index 100%
rename from docs/narrative/application.rst
rename to modules/libjuju/docs/narrative/application.rst
diff --git a/docs/narrative/controller.rst b/modules/libjuju/docs/narrative/controller.rst
similarity index 100%
rename from docs/narrative/controller.rst
rename to modules/libjuju/docs/narrative/controller.rst
diff --git a/docs/narrative/index.rst b/modules/libjuju/docs/narrative/index.rst
similarity index 100%
rename from docs/narrative/index.rst
rename to modules/libjuju/docs/narrative/index.rst
diff --git a/docs/narrative/model.rst b/modules/libjuju/docs/narrative/model.rst
similarity index 100%
rename from docs/narrative/model.rst
rename to modules/libjuju/docs/narrative/model.rst
diff --git a/docs/narrative/unit.rst b/modules/libjuju/docs/narrative/unit.rst
similarity index 100%
rename from docs/narrative/unit.rst
rename to modules/libjuju/docs/narrative/unit.rst
diff --git a/docs/readme.rst b/modules/libjuju/docs/readme.rst
similarity index 100%
rename from docs/readme.rst
rename to modules/libjuju/docs/readme.rst
diff --git a/docs/requirements.txt b/modules/libjuju/docs/requirements.txt
similarity index 100%
rename from docs/requirements.txt
rename to modules/libjuju/docs/requirements.txt
diff --git a/docs/upstream-updates/index.rst b/modules/libjuju/docs/upstream-updates/index.rst
similarity index 100%
rename from docs/upstream-updates/index.rst
rename to modules/libjuju/docs/upstream-updates/index.rst
diff --git a/examples/action.py b/modules/libjuju/examples/action.py
similarity index 100%
rename from examples/action.py
rename to modules/libjuju/examples/action.py
diff --git a/examples/add_machine.py b/modules/libjuju/examples/add_machine.py
similarity index 100%
rename from examples/add_machine.py
rename to modules/libjuju/examples/add_machine.py
diff --git a/examples/add_model.py b/modules/libjuju/examples/add_model.py
similarity index 100%
rename from examples/add_model.py
rename to modules/libjuju/examples/add_model.py
diff --git a/examples/allwatcher.py b/modules/libjuju/examples/allwatcher.py
similarity index 100%
rename from examples/allwatcher.py
rename to modules/libjuju/examples/allwatcher.py
diff --git a/examples/config.py b/modules/libjuju/examples/config.py
similarity index 100%
rename from examples/config.py
rename to modules/libjuju/examples/config.py
diff --git a/examples/controller.py b/modules/libjuju/examples/controller.py
similarity index 100%
rename from examples/controller.py
rename to modules/libjuju/examples/controller.py
diff --git a/examples/deploy.py b/modules/libjuju/examples/deploy.py
similarity index 100%
rename from examples/deploy.py
rename to modules/libjuju/examples/deploy.py
diff --git a/examples/fullstatus.py b/modules/libjuju/examples/fullstatus.py
similarity index 100%
rename from examples/fullstatus.py
rename to modules/libjuju/examples/fullstatus.py
diff --git a/examples/future.py b/modules/libjuju/examples/future.py
similarity index 100%
rename from examples/future.py
rename to modules/libjuju/examples/future.py
diff --git a/examples/leadership.py b/modules/libjuju/examples/leadership.py
similarity index 100%
rename from examples/leadership.py
rename to modules/libjuju/examples/leadership.py
diff --git a/examples/livemodel.py b/modules/libjuju/examples/livemodel.py
similarity index 100%
rename from examples/livemodel.py
rename to modules/libjuju/examples/livemodel.py
diff --git a/examples/localcharm.py b/modules/libjuju/examples/localcharm.py
similarity index 100%
rename from examples/localcharm.py
rename to modules/libjuju/examples/localcharm.py
diff --git a/examples/relate.py b/modules/libjuju/examples/relate.py
similarity index 100%
rename from examples/relate.py
rename to modules/libjuju/examples/relate.py
diff --git a/examples/unitrun.py b/modules/libjuju/examples/unitrun.py
similarity index 100%
rename from examples/unitrun.py
rename to modules/libjuju/examples/unitrun.py
diff --git a/juju/__init__.py b/modules/libjuju/juju/__init__.py
similarity index 100%
rename from juju/__init__.py
rename to modules/libjuju/juju/__init__.py
diff --git a/juju/action.py b/modules/libjuju/juju/action.py
similarity index 100%
rename from juju/action.py
rename to modules/libjuju/juju/action.py
diff --git a/juju/annotation.py b/modules/libjuju/juju/annotation.py
similarity index 100%
rename from juju/annotation.py
rename to modules/libjuju/juju/annotation.py
diff --git a/juju/application.py b/modules/libjuju/juju/application.py
similarity index 100%
rename from juju/application.py
rename to modules/libjuju/juju/application.py
diff --git a/juju/client/__init__.py b/modules/libjuju/juju/client/__init__.py
similarity index 100%
rename from juju/client/__init__.py
rename to modules/libjuju/juju/client/__init__.py
diff --git a/juju/client/_client.py b/modules/libjuju/juju/client/_client.py
similarity index 100%
rename from juju/client/_client.py
rename to modules/libjuju/juju/client/_client.py
diff --git a/juju/client/_client1.py b/modules/libjuju/juju/client/_client1.py
similarity index 100%
rename from juju/client/_client1.py
rename to modules/libjuju/juju/client/_client1.py
diff --git a/juju/client/_client2.py b/modules/libjuju/juju/client/_client2.py
similarity index 100%
rename from juju/client/_client2.py
rename to modules/libjuju/juju/client/_client2.py
diff --git a/juju/client/_client3.py b/modules/libjuju/juju/client/_client3.py
similarity index 100%
rename from juju/client/_client3.py
rename to modules/libjuju/juju/client/_client3.py
diff --git a/juju/client/_client4.py b/modules/libjuju/juju/client/_client4.py
similarity index 100%
rename from juju/client/_client4.py
rename to modules/libjuju/juju/client/_client4.py
diff --git a/juju/client/_client5.py b/modules/libjuju/juju/client/_client5.py
similarity index 100%
rename from juju/client/_client5.py
rename to modules/libjuju/juju/client/_client5.py
diff --git a/juju/client/_definitions.py b/modules/libjuju/juju/client/_definitions.py
similarity index 100%
rename from juju/client/_definitions.py
rename to modules/libjuju/juju/client/_definitions.py
diff --git a/juju/client/client.py b/modules/libjuju/juju/client/client.py
similarity index 100%
rename from juju/client/client.py
rename to modules/libjuju/juju/client/client.py
diff --git a/juju/client/codegen.py b/modules/libjuju/juju/client/codegen.py
similarity index 100%
rename from juju/client/codegen.py
rename to modules/libjuju/juju/client/codegen.py
diff --git a/juju/client/connection.py b/modules/libjuju/juju/client/connection.py
similarity index 100%
rename from juju/client/connection.py
rename to modules/libjuju/juju/client/connection.py
diff --git a/juju/client/facade.py b/modules/libjuju/juju/client/facade.py
similarity index 100%
rename from juju/client/facade.py
rename to modules/libjuju/juju/client/facade.py
diff --git a/juju/client/overrides.py b/modules/libjuju/juju/client/overrides.py
similarity index 100%
rename from juju/client/overrides.py
rename to modules/libjuju/juju/client/overrides.py
diff --git a/juju/client/runner.py b/modules/libjuju/juju/client/runner.py
similarity index 100%
rename from juju/client/runner.py
rename to modules/libjuju/juju/client/runner.py
diff --git a/juju/client/schemas-juju-2.0.0.json b/modules/libjuju/juju/client/schemas-juju-2.0.0.json
similarity index 100%
rename from juju/client/schemas-juju-2.0.0.json
rename to modules/libjuju/juju/client/schemas-juju-2.0.0.json
diff --git a/juju/client/schemas-juju-2.0.1.json b/modules/libjuju/juju/client/schemas-juju-2.0.1.json
similarity index 100%
rename from juju/client/schemas-juju-2.0.1.json
rename to modules/libjuju/juju/client/schemas-juju-2.0.1.json
diff --git a/juju/client/schemas-juju-2.0.2.json b/modules/libjuju/juju/client/schemas-juju-2.0.2.json
similarity index 100%
rename from juju/client/schemas-juju-2.0.2.json
rename to modules/libjuju/juju/client/schemas-juju-2.0.2.json
diff --git a/juju/client/schemas-juju-2.0.3.json b/modules/libjuju/juju/client/schemas-juju-2.0.3.json
similarity index 100%
rename from juju/client/schemas-juju-2.0.3.json
rename to modules/libjuju/juju/client/schemas-juju-2.0.3.json
diff --git a/juju/client/schemas-juju-2.1.0.json b/modules/libjuju/juju/client/schemas-juju-2.1.0.json
similarity index 100%
rename from juju/client/schemas-juju-2.1.0.json
rename to modules/libjuju/juju/client/schemas-juju-2.1.0.json
diff --git a/juju/client/schemas-juju-2.1.1.json b/modules/libjuju/juju/client/schemas-juju-2.1.1.json
similarity index 100%
rename from juju/client/schemas-juju-2.1.1.json
rename to modules/libjuju/juju/client/schemas-juju-2.1.1.json
diff --git a/juju/client/schemas-juju-2.1.2.json b/modules/libjuju/juju/client/schemas-juju-2.1.2.json
similarity index 100%
rename from juju/client/schemas-juju-2.1.2.json
rename to modules/libjuju/juju/client/schemas-juju-2.1.2.json
diff --git a/juju/client/schemas-juju-2.2-alpha1.json b/modules/libjuju/juju/client/schemas-juju-2.2-alpha1.json
similarity index 100%
rename from juju/client/schemas-juju-2.2-alpha1.json
rename to modules/libjuju/juju/client/schemas-juju-2.2-alpha1.json
diff --git a/juju/client/schemas-juju-2.2-beta1.json b/modules/libjuju/juju/client/schemas-juju-2.2-beta1.json
similarity index 100%
rename from juju/client/schemas-juju-2.2-beta1.json
rename to modules/libjuju/juju/client/schemas-juju-2.2-beta1.json
diff --git a/juju/client/schemas-juju-2.2-beta2.json b/modules/libjuju/juju/client/schemas-juju-2.2-beta2.json
similarity index 100%
rename from juju/client/schemas-juju-2.2-beta2.json
rename to modules/libjuju/juju/client/schemas-juju-2.2-beta2.json
diff --git a/juju/client/schemas-juju-2.2-rc1.json b/modules/libjuju/juju/client/schemas-juju-2.2-rc1.json
similarity index 100%
rename from juju/client/schemas-juju-2.2-rc1.json
rename to modules/libjuju/juju/client/schemas-juju-2.2-rc1.json
diff --git a/juju/client/schemas-juju-2.3-alpha1.json b/modules/libjuju/juju/client/schemas-juju-2.3-alpha1.json
similarity index 100%
rename from juju/client/schemas-juju-2.3-alpha1.json
rename to modules/libjuju/juju/client/schemas-juju-2.3-alpha1.json
diff --git a/juju/client/schemas-juju-latest.json b/modules/libjuju/juju/client/schemas-juju-latest.json
similarity index 100%
rename from juju/client/schemas-juju-latest.json
rename to modules/libjuju/juju/client/schemas-juju-latest.json
diff --git a/juju/cloud.py b/modules/libjuju/juju/cloud.py
similarity index 100%
rename from juju/cloud.py
rename to modules/libjuju/juju/cloud.py
diff --git a/juju/constraints.py b/modules/libjuju/juju/constraints.py
similarity index 100%
rename from juju/constraints.py
rename to modules/libjuju/juju/constraints.py
diff --git a/juju/controller.py b/modules/libjuju/juju/controller.py
similarity index 100%
rename from juju/controller.py
rename to modules/libjuju/juju/controller.py
diff --git a/juju/credential.py b/modules/libjuju/juju/credential.py
similarity index 100%
rename from juju/credential.py
rename to modules/libjuju/juju/credential.py
diff --git a/juju/delta.py b/modules/libjuju/juju/delta.py
similarity index 100%
rename from juju/delta.py
rename to modules/libjuju/juju/delta.py
diff --git a/juju/errors.py b/modules/libjuju/juju/errors.py
similarity index 100%
rename from juju/errors.py
rename to modules/libjuju/juju/errors.py
diff --git a/juju/exceptions.py b/modules/libjuju/juju/exceptions.py
similarity index 100%
rename from juju/exceptions.py
rename to modules/libjuju/juju/exceptions.py
diff --git a/juju/juju.py b/modules/libjuju/juju/juju.py
similarity index 100%
rename from juju/juju.py
rename to modules/libjuju/juju/juju.py
diff --git a/juju/loop.py b/modules/libjuju/juju/loop.py
similarity index 100%
rename from juju/loop.py
rename to modules/libjuju/juju/loop.py
diff --git a/juju/machine.py b/modules/libjuju/juju/machine.py
similarity index 100%
rename from juju/machine.py
rename to modules/libjuju/juju/machine.py
diff --git a/juju/model.py b/modules/libjuju/juju/model.py
similarity index 100%
rename from juju/model.py
rename to modules/libjuju/juju/model.py
diff --git a/juju/placement.py b/modules/libjuju/juju/placement.py
similarity index 100%
rename from juju/placement.py
rename to modules/libjuju/juju/placement.py
diff --git a/juju/relation.py b/modules/libjuju/juju/relation.py
similarity index 100%
rename from juju/relation.py
rename to modules/libjuju/juju/relation.py
diff --git a/juju/tag.py b/modules/libjuju/juju/tag.py
similarity index 100%
rename from juju/tag.py
rename to modules/libjuju/juju/tag.py
diff --git a/juju/unit.py b/modules/libjuju/juju/unit.py
similarity index 100%
rename from juju/unit.py
rename to modules/libjuju/juju/unit.py
diff --git a/juju/utils.py b/modules/libjuju/juju/utils.py
similarity index 100%
rename from juju/utils.py
rename to modules/libjuju/juju/utils.py
diff --git a/scripts/gendoc b/modules/libjuju/scripts/gendoc
similarity index 100%
rename from scripts/gendoc
rename to modules/libjuju/scripts/gendoc
diff --git a/setup.py b/modules/libjuju/setup.py
similarity index 100%
rename from setup.py
rename to modules/libjuju/setup.py
diff --git a/tests/__init__.py b/modules/libjuju/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to modules/libjuju/tests/__init__.py
diff --git a/tests/base.py b/modules/libjuju/tests/base.py
similarity index 100%
rename from tests/base.py
rename to modules/libjuju/tests/base.py
diff --git a/tests/bundle/bundle.yaml b/modules/libjuju/tests/bundle/bundle.yaml
similarity index 100%
rename from tests/bundle/bundle.yaml
rename to modules/libjuju/tests/bundle/bundle.yaml
diff --git a/tests/charm/metadata.yaml b/modules/libjuju/tests/charm/metadata.yaml
similarity index 100%
rename from tests/charm/metadata.yaml
rename to modules/libjuju/tests/charm/metadata.yaml
diff --git a/tests/integration/__init__.py b/modules/libjuju/tests/integration/__init__.py
similarity index 100%
rename from tests/integration/__init__.py
rename to modules/libjuju/tests/integration/__init__.py
diff --git a/tests/integration/bundle/bundle.yaml b/modules/libjuju/tests/integration/bundle/bundle.yaml
similarity index 100%
rename from tests/integration/bundle/bundle.yaml
rename to modules/libjuju/tests/integration/bundle/bundle.yaml
diff --git a/tests/integration/charm/metadata.yaml b/modules/libjuju/tests/integration/charm/metadata.yaml
similarity index 100%
rename from tests/integration/charm/metadata.yaml
rename to modules/libjuju/tests/integration/charm/metadata.yaml
diff --git a/tests/integration/test_application.py b/modules/libjuju/tests/integration/test_application.py
similarity index 100%
rename from tests/integration/test_application.py
rename to modules/libjuju/tests/integration/test_application.py
diff --git a/tests/integration/test_client.py b/modules/libjuju/tests/integration/test_client.py
similarity index 100%
rename from tests/integration/test_client.py
rename to modules/libjuju/tests/integration/test_client.py
diff --git a/tests/integration/test_connection.py b/modules/libjuju/tests/integration/test_connection.py
similarity index 100%
rename from tests/integration/test_connection.py
rename to modules/libjuju/tests/integration/test_connection.py
diff --git a/tests/integration/test_controller.py b/modules/libjuju/tests/integration/test_controller.py
similarity index 100%
rename from tests/integration/test_controller.py
rename to modules/libjuju/tests/integration/test_controller.py
diff --git a/tests/integration/test_errors.py b/modules/libjuju/tests/integration/test_errors.py
similarity index 100%
rename from tests/integration/test_errors.py
rename to modules/libjuju/tests/integration/test_errors.py
diff --git a/tests/integration/test_machine.py b/modules/libjuju/tests/integration/test_machine.py
similarity index 100%
rename from tests/integration/test_machine.py
rename to modules/libjuju/tests/integration/test_machine.py
diff --git a/tests/integration/test_model.py b/modules/libjuju/tests/integration/test_model.py
similarity index 100%
rename from tests/integration/test_model.py
rename to modules/libjuju/tests/integration/test_model.py
diff --git a/tests/integration/test_unit.py b/modules/libjuju/tests/integration/test_unit.py
similarity index 100%
rename from tests/integration/test_unit.py
rename to modules/libjuju/tests/integration/test_unit.py
diff --git a/tests/unit/__init__.py b/modules/libjuju/tests/unit/__init__.py
similarity index 100%
rename from tests/unit/__init__.py
rename to modules/libjuju/tests/unit/__init__.py
diff --git a/tests/unit/test_client.py b/modules/libjuju/tests/unit/test_client.py
similarity index 100%
rename from tests/unit/test_client.py
rename to modules/libjuju/tests/unit/test_client.py
diff --git a/tests/unit/test_connection.py b/modules/libjuju/tests/unit/test_connection.py
similarity index 100%
rename from tests/unit/test_connection.py
rename to modules/libjuju/tests/unit/test_connection.py
diff --git a/tests/unit/test_constraints.py b/modules/libjuju/tests/unit/test_constraints.py
similarity index 100%
rename from tests/unit/test_constraints.py
rename to modules/libjuju/tests/unit/test_constraints.py
diff --git a/tests/unit/test_loop.py b/modules/libjuju/tests/unit/test_loop.py
similarity index 100%
rename from tests/unit/test_loop.py
rename to modules/libjuju/tests/unit/test_loop.py
diff --git a/tests/unit/test_model.py b/modules/libjuju/tests/unit/test_model.py
similarity index 100%
rename from tests/unit/test_model.py
rename to modules/libjuju/tests/unit/test_model.py
diff --git a/tests/unit/test_overrides.py b/modules/libjuju/tests/unit/test_overrides.py
similarity index 100%
rename from tests/unit/test_overrides.py
rename to modules/libjuju/tests/unit/test_overrides.py
diff --git a/tests/unit/test_placement.py b/modules/libjuju/tests/unit/test_placement.py
similarity index 100%
rename from tests/unit/test_placement.py
rename to modules/libjuju/tests/unit/test_placement.py
diff --git a/tox.ini b/modules/libjuju/tox.ini
similarity index 100%
rename from tox.ini
rename to modules/libjuju/tox.ini