diff --git a/lbrynet/wallet/__init__.py b/lbrynet/wallet/__init__.py
index df2e399b6..d809b7160 100644
--- a/lbrynet/wallet/__init__.py
+++ b/lbrynet/wallet/__init__.py
@@ -6,6 +6,5 @@ __node_url__ = (
 )
 __spvserver__ = 'lbrynet.extras.wallet.server.coin.LBCRegTest'
 
-from lbrynet.extras.wallet.ledger import MainNetLedger, RegTestLedger
-from lbrynet.extras.wallet.manager import LbryWalletManager
+from lbrynet.wallet.manager import LbryWalletManager
 from lbrynet.extras.wallet.network import Network
diff --git a/lbrynet/wallet/server/block_processor.py b/lbrynet/wallet/server/block_processor.py
index aeea10ee9..39093295d 100644
--- a/lbrynet/wallet/server/block_processor.py
+++ b/lbrynet/wallet/server/block_processor.py
@@ -9,7 +9,7 @@ from torba.server.block_processor import BlockProcessor
 from lbrynet.schema.uri import parse_lbry_uri
 from lbrynet.schema.decode import smart_decode
 
-from lbrynet.extras.wallet.server.model import NameClaim, ClaimInfo, ClaimUpdate, ClaimSupport
+from lbrynet.wallet.server.model import NameClaim, ClaimInfo, ClaimUpdate, ClaimSupport
 
 
 class LBRYBlockProcessor(BlockProcessor):
diff --git a/lbrynet/wallet/server/db.py b/lbrynet/wallet/server/db.py
index bcdffed2e..6ef9f5f9d 100644
--- a/lbrynet/wallet/server/db.py
+++ b/lbrynet/wallet/server/db.py
@@ -6,7 +6,7 @@ from torba.server.hash import hash_to_hex_str
 
 from torba.server.db import DB
 
-from lbrynet.extras.wallet.server.model import ClaimInfo
+from lbrynet.wallet.server.model import ClaimInfo
 
 
 class LBRYDB(DB):
diff --git a/lbrynet/wallet/server/opcodes.py b/lbrynet/wallet/server/opcodes.py
index 8e17f5a25..8878357b5 100644
--- a/lbrynet/wallet/server/opcodes.py
+++ b/lbrynet/wallet/server/opcodes.py
@@ -1,6 +1,6 @@
 import struct
 from torba.server.enum import Enumeration
-from lbrynet.extras.wallet.server.model import NameClaim, ClaimSupport, ClaimUpdate
+from lbrynet.wallet.server.model import NameClaim, ClaimSupport, ClaimUpdate
 # TODO: Take this to lbryschema (it's also on lbryum and lbryum-server)
 
 
diff --git a/lbrynet/wallet/server/tx.py b/lbrynet/wallet/server/tx.py
index eba24d751..2aa6f48dd 100644
--- a/lbrynet/wallet/server/tx.py
+++ b/lbrynet/wallet/server/tx.py
@@ -1,6 +1,6 @@
 from torba.server.tx import Deserializer
 from lbrynet.extras.wallet.server.opcodes import decode_claim_script
-from lbrynet.extras.wallet.server.model import TxClaimOutput, LBRYTx
+from lbrynet.wallet.server.model import TxClaimOutput, LBRYTx
 
 
 class LBRYDeserializer(Deserializer):