diff --git a/lbrynet/blob/CryptStreamCreator.py b/lbrynet/blob/CryptStreamCreator.py
index f9e2494ec..e69eda6d9 100644
--- a/lbrynet/blob/CryptStreamCreator.py
+++ b/lbrynet/blob/CryptStreamCreator.py
@@ -6,7 +6,7 @@ import logging
 
 from cryptography.hazmat.primitives.ciphers.algorithms import AES
 from twisted.internet import defer
-from lbrynet.cryptstream.CryptBlob import CryptStreamBlobMaker
+from lbrynet.blob.CryptBlob import CryptStreamBlobMaker
 
 
 log = logging.getLogger(__name__)
diff --git a/lbrynet/blob/client/CryptBlobHandler.py b/lbrynet/blob/client/CryptBlobHandler.py
index 6f7ae2adb..436901dcd 100644
--- a/lbrynet/blob/client/CryptBlobHandler.py
+++ b/lbrynet/blob/client/CryptBlobHandler.py
@@ -1,6 +1,6 @@
 import binascii
 from twisted.internet import defer
-from lbrynet.cryptstream.CryptBlob import StreamBlobDecryptor
+from lbrynet.blob.CryptBlob import StreamBlobDecryptor
 
 
 class CryptBlobHandler:
diff --git a/lbrynet/blob/client/CryptStreamDownloader.py b/lbrynet/blob/client/CryptStreamDownloader.py
index 317d514b7..ffc0844cf 100644
--- a/lbrynet/blob/client/CryptStreamDownloader.py
+++ b/lbrynet/blob/client/CryptStreamDownloader.py
@@ -4,7 +4,7 @@ from lbrynet.p2p.client.BlobRequester import BlobRequester
 from lbrynet.p2p.client.ConnectionManager import ConnectionManager
 from lbrynet.p2p.client.DownloadManager import DownloadManager
 from lbrynet.p2p.client.StreamProgressManager import FullStreamProgressManager
-from lbrynet.cryptstream.client.CryptBlobHandler import CryptBlobHandler
+from lbrynet.blob.client.CryptBlobHandler import CryptBlobHandler
 from twisted.internet import defer
 from twisted.python.failure import Failure
 
diff --git a/lbrynet/extras/daemon/migrator/migrate8to9.py b/lbrynet/extras/daemon/migrator/migrate8to9.py
index 285934a0e..b97a8651e 100644
--- a/lbrynet/extras/daemon/migrator/migrate8to9.py
+++ b/lbrynet/extras/daemon/migrator/migrate8to9.py
@@ -4,7 +4,7 @@ import os
 
 from lbrynet.p2p.Error import InvalidStreamDescriptorError
 from lbrynet.p2p.StreamDescriptor import EncryptedFileStreamType, format_sd_info, format_blobs, validate_descriptor
-from lbrynet.cryptstream.CryptBlob import CryptBlobInfo
+from lbrynet.blob.CryptBlob import CryptBlobInfo
 
 log = logging.getLogger(__name__)
 
diff --git a/lbrynet/extras/daemon/storage.py b/lbrynet/extras/daemon/storage.py
index da9fae7b0..0e6ef70f5 100644
--- a/lbrynet/extras/daemon/storage.py
+++ b/lbrynet/extras/daemon/storage.py
@@ -10,7 +10,7 @@ from twisted.enterprise import adbapi
 from lbrynet.schema.claim import ClaimDict
 from lbrynet.schema.decode import smart_decode
 from lbrynet import conf
-from lbrynet.cryptstream.CryptBlob import CryptBlobInfo
+from lbrynet.blob.CryptBlob import CryptBlobInfo
 from lbrynet.dht.constants import dataExpireTimeout
 from torba.client.constants import COIN
 
diff --git a/lbrynet/file_manager/EncryptedFileCreator.py b/lbrynet/file_manager/EncryptedFileCreator.py
index 57347363d..7d1fec30a 100644
--- a/lbrynet/file_manager/EncryptedFileCreator.py
+++ b/lbrynet/file_manager/EncryptedFileCreator.py
@@ -11,7 +11,7 @@ from twisted.protocols.basic import FileSender
 
 from lbrynet.p2p.StreamDescriptor import BlobStreamDescriptorWriter, EncryptedFileStreamType
 from lbrynet.p2p.StreamDescriptor import format_sd_info, get_stream_hash, validate_descriptor
-from lbrynet.cryptstream.CryptStreamCreator import CryptStreamCreator
+from lbrynet.blob.CryptStreamCreator import CryptStreamCreator
 
 log = logging.getLogger(__name__)
 
diff --git a/lbrynet/file_manager/EncryptedFileManager.py b/lbrynet/file_manager/EncryptedFileManager.py
index fbf4d4403..85f593baa 100644
--- a/lbrynet/file_manager/EncryptedFileManager.py
+++ b/lbrynet/file_manager/EncryptedFileManager.py
@@ -11,8 +11,8 @@ from lbrynet.extras.reflector.reupload import reflect_file
 from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloader
 from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
 from lbrynet.p2p.StreamDescriptor import EncryptedFileStreamType, get_sd_info
-from lbrynet.cryptstream.client.CryptStreamDownloader import AlreadyStoppedError
-from lbrynet.cryptstream.client.CryptStreamDownloader import CurrentlyStoppingError
+from lbrynet.blob.client.CryptStreamDownloader import AlreadyStoppedError
+from lbrynet.blob.client.CryptStreamDownloader import CurrentlyStoppingError
 from lbrynet.p2p.utils import safe_start_looping_call, safe_stop_looping_call
 from lbrynet import conf
 
diff --git a/lbrynet/lbry_file/client/EncryptedFileDownloader.py b/lbrynet/lbry_file/client/EncryptedFileDownloader.py
index 38254a749..36934e6a7 100644
--- a/lbrynet/lbry_file/client/EncryptedFileDownloader.py
+++ b/lbrynet/lbry_file/client/EncryptedFileDownloader.py
@@ -4,7 +4,7 @@ import traceback
 from binascii import hexlify, unhexlify
 
 from lbrynet.p2p.StreamDescriptor import save_sd_info
-from lbrynet.cryptstream.client.CryptStreamDownloader import CryptStreamDownloader
+from lbrynet.blob.client.CryptStreamDownloader import CryptStreamDownloader
 from lbrynet.p2p.client.StreamProgressManager import FullStreamProgressManager
 from lbrynet.p2p.Error import FileOpenError
 from lbrynet.lbry_file.client.EncryptedFileMetadataHandler import EncryptedFileMetadataHandler
diff --git a/tests/unit/cryptstream/test_cryptblob.py b/tests/unit/cryptstream/test_cryptblob.py
index 943e7e4f3..a7062ee4b 100644
--- a/tests/unit/cryptstream/test_cryptblob.py
+++ b/tests/unit/cryptstream/test_cryptblob.py
@@ -1,6 +1,6 @@
 from twisted.trial import unittest
 from twisted.internet import defer
-from lbrynet.cryptstream import CryptBlob
+from lbrynet.blob import CryptBlob
 from lbrynet.blob.blob_file import MAX_BLOB_SIZE
 
 from tests.mocks import mock_conf_settings