diff --git a/platformio/commands/access.py b/platformio/commands/access.py
index 74f48e2b..ccd4150a 100644
--- a/platformio/commands/access.py
+++ b/platformio/commands/access.py
@@ -20,9 +20,9 @@ import re
 import click
 from tabulate import tabulate
 
-from platformio.clients.registry import RegistryClient
 from platformio.commands.account import validate_username
 from platformio.commands.team import validate_orgname_teamname
+from platformio.package.registry import RegistryClient
 
 
 def validate_client(value):
diff --git a/platformio/package/commands/publish.py b/platformio/package/commands/publish.py
index 150fdb19..89cc5c01 100644
--- a/platformio/package/commands/publish.py
+++ b/platformio/package/commands/publish.py
@@ -22,12 +22,12 @@ from tabulate import tabulate
 
 from platformio import fs
 from platformio.clients.account import AccountClient
-from platformio.clients.registry import RegistryClient
 from platformio.exception import UserSideException
 from platformio.package.manifest.parser import ManifestParserFactory
 from platformio.package.manifest.schema import ManifestSchema
 from platformio.package.meta import PackageType
 from platformio.package.pack import PackagePacker
+from platformio.package.registry import RegistryClient
 from platformio.package.unpack import FileUnpacker, TARArchiver
 
 
diff --git a/platformio/package/commands/search.py b/platformio/package/commands/search.py
index 57ec76ec..787d94dd 100644
--- a/platformio/package/commands/search.py
+++ b/platformio/package/commands/search.py
@@ -17,7 +17,7 @@ import math
 import click
 
 from platformio import util
-from platformio.clients.registry import RegistryClient
+from platformio.package.registry import RegistryClient
 
 
 @click.command("search", short_help="Search for packages")
diff --git a/platformio/package/commands/show.py b/platformio/package/commands/show.py
index ce50bc88..5fd45f62 100644
--- a/platformio/package/commands/show.py
+++ b/platformio/package/commands/show.py
@@ -18,10 +18,10 @@ import click
 from tabulate import tabulate
 
 from platformio import fs, util
-from platformio.clients.registry import RegistryClient
 from platformio.exception import UserSideException
 from platformio.package.manager._registry import PackageManagerRegistryMixin
 from platformio.package.meta import PackageSpec, PackageType
+from platformio.package.registry import RegistryClient
 
 
 @click.command("show", short_help="Show package information")
diff --git a/platformio/package/commands/unpublish.py b/platformio/package/commands/unpublish.py
index 3185144e..88646095 100644
--- a/platformio/package/commands/unpublish.py
+++ b/platformio/package/commands/unpublish.py
@@ -15,8 +15,8 @@
 import click
 
 from platformio.clients.account import AccountClient
-from platformio.clients.registry import RegistryClient
 from platformio.package.meta import PackageSpec, PackageType
+from platformio.package.registry import RegistryClient
 
 
 @click.command("unpublish", short_help="Remove a pushed package from the registry")
diff --git a/platformio/package/manager/_registry.py b/platformio/package/manager/_registry.py
index de0464d2..7e00c78f 100644
--- a/platformio/package/manager/_registry.py
+++ b/platformio/package/manager/_registry.py
@@ -20,10 +20,10 @@ import click
 
 from platformio import __registry_mirror_hosts__
 from platformio.cache import ContentCache
-from platformio.clients.registry import RegistryClient
 from platformio.http import HTTPClient
 from platformio.package.exception import UnknownPackageError
 from platformio.package.meta import PackageSpec
+from platformio.package.registry import RegistryClient
 from platformio.package.version import cast_version_to_semver
 
 
diff --git a/platformio/clients/registry.py b/platformio/package/registry.py
similarity index 100%
rename from platformio/clients/registry.py
rename to platformio/package/registry.py
diff --git a/tests/commands/test_lib.py b/tests/commands/test_lib.py
index 9429aaba..3825a4e1 100644
--- a/tests/commands/test_lib.py
+++ b/tests/commands/test_lib.py
@@ -20,9 +20,9 @@ import os
 import pytest
 import semantic_version
 
-from platformio.clients.registry import RegistryClient
 from platformio.commands.lib.command import cli as cmd_lib
 from platformio.package.meta import PackageType
+from platformio.package.registry import RegistryClient
 from platformio.package.vcsclient import VCSClientFactory
 from platformio.project.config import ProjectConfig
 
diff --git a/tests/misc/test_misc.py b/tests/misc/test_misc.py
index 5596b9a2..e63b8451 100644
--- a/tests/misc/test_misc.py
+++ b/tests/misc/test_misc.py
@@ -18,7 +18,7 @@ import pytest
 import requests
 
 from platformio import __check_internet_hosts__, http, proc
-from platformio.clients.registry import RegistryClient
+from platformio.package.registry import RegistryClient
 
 
 def test_platformio_cli():