diff --git a/lbrynet/core/BlobAvailability.py b/lbrynet/p2p/BlobAvailability.py
similarity index 100%
rename from lbrynet/core/BlobAvailability.py
rename to lbrynet/p2p/BlobAvailability.py
diff --git a/lbrynet/core/BlobInfo.py b/lbrynet/p2p/BlobInfo.py
similarity index 100%
rename from lbrynet/core/BlobInfo.py
rename to lbrynet/p2p/BlobInfo.py
diff --git a/lbrynet/core/BlobManager.py b/lbrynet/p2p/BlobManager.py
similarity index 100%
rename from lbrynet/core/BlobManager.py
rename to lbrynet/p2p/BlobManager.py
diff --git a/lbrynet/core/DownloadOption.py b/lbrynet/p2p/DownloadOption.py
similarity index 100%
rename from lbrynet/core/DownloadOption.py
rename to lbrynet/p2p/DownloadOption.py
diff --git a/lbrynet/core/Error.py b/lbrynet/p2p/Error.py
similarity index 100%
rename from lbrynet/core/Error.py
rename to lbrynet/p2p/Error.py
diff --git a/lbrynet/core/HTTPBlobDownloader.py b/lbrynet/p2p/HTTPBlobDownloader.py
similarity index 100%
rename from lbrynet/core/HTTPBlobDownloader.py
rename to lbrynet/p2p/HTTPBlobDownloader.py
diff --git a/lbrynet/core/Offer.py b/lbrynet/p2p/Offer.py
similarity index 100%
rename from lbrynet/core/Offer.py
rename to lbrynet/p2p/Offer.py
diff --git a/lbrynet/core/PaymentRateManager.py b/lbrynet/p2p/PaymentRateManager.py
similarity index 100%
rename from lbrynet/core/PaymentRateManager.py
rename to lbrynet/p2p/PaymentRateManager.py
diff --git a/lbrynet/core/Peer.py b/lbrynet/p2p/Peer.py
similarity index 100%
rename from lbrynet/core/Peer.py
rename to lbrynet/p2p/Peer.py
diff --git a/lbrynet/core/PeerManager.py b/lbrynet/p2p/PeerManager.py
similarity index 100%
rename from lbrynet/core/PeerManager.py
rename to lbrynet/p2p/PeerManager.py
diff --git a/lbrynet/core/PriceModel.py b/lbrynet/p2p/PriceModel.py
similarity index 100%
rename from lbrynet/core/PriceModel.py
rename to lbrynet/p2p/PriceModel.py
diff --git a/lbrynet/core/RateLimiter.py b/lbrynet/p2p/RateLimiter.py
similarity index 100%
rename from lbrynet/core/RateLimiter.py
rename to lbrynet/p2p/RateLimiter.py
diff --git a/lbrynet/core/SinglePeerDownloader.py b/lbrynet/p2p/SinglePeerDownloader.py
similarity index 100%
rename from lbrynet/core/SinglePeerDownloader.py
rename to lbrynet/p2p/SinglePeerDownloader.py
diff --git a/lbrynet/core/Strategy.py b/lbrynet/p2p/Strategy.py
similarity index 100%
rename from lbrynet/core/Strategy.py
rename to lbrynet/p2p/Strategy.py
diff --git a/lbrynet/core/StreamDescriptor.py b/lbrynet/p2p/StreamDescriptor.py
similarity index 100%
rename from lbrynet/core/StreamDescriptor.py
rename to lbrynet/p2p/StreamDescriptor.py
diff --git a/lbrynet/core/__init__.py b/lbrynet/p2p/__init__.py
similarity index 100%
rename from lbrynet/core/__init__.py
rename to lbrynet/p2p/__init__.py
diff --git a/lbrynet/core/call_later_manager.py b/lbrynet/p2p/call_later_manager.py
similarity index 100%
rename from lbrynet/core/call_later_manager.py
rename to lbrynet/p2p/call_later_manager.py
diff --git a/lbrynet/core/client/BlobRequester.py b/lbrynet/p2p/client/BlobRequester.py
similarity index 100%
rename from lbrynet/core/client/BlobRequester.py
rename to lbrynet/p2p/client/BlobRequester.py
diff --git a/lbrynet/core/client/ClientProtocol.py b/lbrynet/p2p/client/ClientProtocol.py
similarity index 100%
rename from lbrynet/core/client/ClientProtocol.py
rename to lbrynet/p2p/client/ClientProtocol.py
diff --git a/lbrynet/core/client/ClientRequest.py b/lbrynet/p2p/client/ClientRequest.py
similarity index 100%
rename from lbrynet/core/client/ClientRequest.py
rename to lbrynet/p2p/client/ClientRequest.py
diff --git a/lbrynet/core/client/ConnectionManager.py b/lbrynet/p2p/client/ConnectionManager.py
similarity index 100%
rename from lbrynet/core/client/ConnectionManager.py
rename to lbrynet/p2p/client/ConnectionManager.py
diff --git a/lbrynet/core/client/DownloadManager.py b/lbrynet/p2p/client/DownloadManager.py
similarity index 100%
rename from lbrynet/core/client/DownloadManager.py
rename to lbrynet/p2p/client/DownloadManager.py
diff --git a/lbrynet/core/client/StandaloneBlobDownloader.py b/lbrynet/p2p/client/StandaloneBlobDownloader.py
similarity index 100%
rename from lbrynet/core/client/StandaloneBlobDownloader.py
rename to lbrynet/p2p/client/StandaloneBlobDownloader.py
diff --git a/lbrynet/core/client/StreamProgressManager.py b/lbrynet/p2p/client/StreamProgressManager.py
similarity index 100%
rename from lbrynet/core/client/StreamProgressManager.py
rename to lbrynet/p2p/client/StreamProgressManager.py
diff --git a/lbrynet/core/client/__init__.py b/lbrynet/p2p/client/__init__.py
similarity index 100%
rename from lbrynet/core/client/__init__.py
rename to lbrynet/p2p/client/__init__.py
diff --git a/lbrynet/core/cryptoutils.py b/lbrynet/p2p/cryptoutils.py
similarity index 100%
rename from lbrynet/core/cryptoutils.py
rename to lbrynet/p2p/cryptoutils.py
diff --git a/lbrynet/core/log_support.py b/lbrynet/p2p/log_support.py
similarity index 100%
rename from lbrynet/core/log_support.py
rename to lbrynet/p2p/log_support.py
diff --git a/lbrynet/core/looping_call_manager.py b/lbrynet/p2p/looping_call_manager.py
similarity index 100%
rename from lbrynet/core/looping_call_manager.py
rename to lbrynet/p2p/looping_call_manager.py
diff --git a/lbrynet/core/server/BlobAvailabilityHandler.py b/lbrynet/p2p/server/BlobAvailabilityHandler.py
similarity index 100%
rename from lbrynet/core/server/BlobAvailabilityHandler.py
rename to lbrynet/p2p/server/BlobAvailabilityHandler.py
diff --git a/lbrynet/core/server/BlobRequestHandler.py b/lbrynet/p2p/server/BlobRequestHandler.py
similarity index 100%
rename from lbrynet/core/server/BlobRequestHandler.py
rename to lbrynet/p2p/server/BlobRequestHandler.py
diff --git a/lbrynet/core/server/ServerProtocol.py b/lbrynet/p2p/server/ServerProtocol.py
similarity index 100%
rename from lbrynet/core/server/ServerProtocol.py
rename to lbrynet/p2p/server/ServerProtocol.py
diff --git a/lbrynet/core/server/ServerRequestHandler.py b/lbrynet/p2p/server/ServerRequestHandler.py
similarity index 100%
rename from lbrynet/core/server/ServerRequestHandler.py
rename to lbrynet/p2p/server/ServerRequestHandler.py
diff --git a/lbrynet/core/server/__init__.py b/lbrynet/p2p/server/__init__.py
similarity index 100%
rename from lbrynet/core/server/__init__.py
rename to lbrynet/p2p/server/__init__.py
diff --git a/lbrynet/core/system_info.py b/lbrynet/p2p/system_info.py
similarity index 100%
rename from lbrynet/core/system_info.py
rename to lbrynet/p2p/system_info.py
diff --git a/lbrynet/core/utils.py b/lbrynet/p2p/utils.py
similarity index 100%
rename from lbrynet/core/utils.py
rename to lbrynet/p2p/utils.py