diff --git a/web3/pm.py b/web3/pm.py
index 880908274c..922be852ec 100644
--- a/web3/pm.py
+++ b/web3/pm.py
@@ -15,6 +15,11 @@
     Tuple,
 )
 
+from eth_typing import (
+    URI,
+    Address,
+    Manifest,
+)
 from eth_utils import (
     is_canonical_address,
     is_checksum_address,
@@ -31,25 +36,15 @@
     ASSETS_DIR,
     Package,
 )
-from ethpm.typing import (
-    URI,
-    Address,
-    Manifest,
-)
-from ethpm.utils.backend import (
+from ethpm.uri import (
+    is_supported_content_addressed_uri,
     resolve_uri_contents,
 )
-from ethpm.utils.ipfs import (
-    is_ipfs_uri,
-)
-from ethpm.utils.manifest_validation import (
+from ethpm.validation.manifest import (
     validate_manifest_against_schema,
     validate_raw_manifest_format,
 )
-from ethpm.utils.uri import (
-    is_valid_content_addressed_github_uri,
-)
-from ethpm.validation import (
+from ethpm.validation.package import (
     validate_package_name,
     validate_package_version,
 )
@@ -659,7 +654,7 @@ def get_solidity_registry_manifest() -> Dict[str, Any]:
 
 
 def validate_is_supported_manifest_uri(uri):
-    if not is_ipfs_uri(uri) and not is_valid_content_addressed_github_uri(uri):
+    if not is_supported_content_addressed_uri(uri):
         raise ManifestValidationError(
             f"URI: {uri} is not a valid content-addressed URI. "
             "Currently only IPFS and Github content-addressed URIs are supported."