diff --git a/lbrynet/wallet/ledger.py b/lbrynet/wallet/ledger.py
index 6171678b0..2499ce25e 100644
--- a/lbrynet/wallet/ledger.py
+++ b/lbrynet/wallet/ledger.py
@@ -6,13 +6,13 @@ from lbrynet.schema.validator import validate_claim_id
 from torba.client.baseledger import BaseLedger
 from lbrynet.schema.error import URIParseError
 from lbrynet.schema.uri import parse_lbry_uri
-from lbrynet.extras.wallet.dewies import dewies_to_lbc
-from lbrynet.extras.wallet.resolve import Resolver
-from lbrynet.extras.wallet.account import Account
-from lbrynet.extras.wallet.network import Network
-from lbrynet.extras.wallet.database import WalletDatabase
-from lbrynet.extras.wallet.transaction import Transaction
-from lbrynet.extras.wallet.header import Headers, UnvalidatedHeaders
+from lbrynet.wallet.dewies import dewies_to_lbc
+from lbrynet.wallet.resolve import Resolver
+from lbrynet.wallet.account import Account
+from lbrynet.wallet.network import Network
+from lbrynet.wallet.database import WalletDatabase
+from lbrynet.wallet.transaction import Transaction
+from lbrynet.wallet.header import Headers, UnvalidatedHeaders
 
 
 log = logging.getLogger(__name__)
diff --git a/lbrynet/wallet/manager.py b/lbrynet/wallet/manager.py
index 42b628706..b2e1ab80a 100644
--- a/lbrynet/wallet/manager.py
+++ b/lbrynet/wallet/manager.py
@@ -12,11 +12,11 @@ from torba.rpc.jsonrpc import CodeMessageError
 
 from lbrynet.schema.claim import ClaimDict
 
-from lbrynet.extras.wallet.ledger import MainNetLedger
-from lbrynet.extras.wallet.account import BaseAccount, generate_certificate
-from lbrynet.extras.wallet.transaction import Transaction
-from lbrynet.extras.wallet.database import WalletDatabase
-from lbrynet.extras.wallet.dewies import dewies_to_lbc
+from lbrynet.wallet.ledger import MainNetLedger
+from lbrynet.wallet.account import BaseAccount, generate_certificate
+from lbrynet.wallet.transaction import Transaction
+from lbrynet.wallet.database import WalletDatabase
+from lbrynet.wallet.dewies import dewies_to_lbc
 
 
 log = logging.getLogger(__name__)
diff --git a/lbrynet/wallet/resolve.py b/lbrynet/wallet/resolve.py
index 544d39053..13e29ca20 100644
--- a/lbrynet/wallet/resolve.py
+++ b/lbrynet/wallet/resolve.py
@@ -2,14 +2,12 @@ import logging
 
 from ecdsa import BadSignatureError
 from binascii import unhexlify, hexlify
-from lbrynet.extras.wallet.dewies import dewies_to_lbc
+from lbrynet.wallet.dewies import dewies_to_lbc
 from lbrynet.error import UnknownNameError, UnknownClaimID, UnknownURI, UnknownOutpoint
-from lbrynet.schema.address import is_address
-from lbrynet.schema.claim import ClaimDict
-from lbrynet.schema.decode import smart_decode
+from lbrynet.schema.claim import Claim
 from lbrynet.schema.error import DecodeError
 from lbrynet.schema.uri import parse_lbry_uri
-from lbrynet.extras.wallet.claim_proofs import verify_proof, InvalidProofError
+from lbrynet.wallet.claim_proofs import verify_proof, InvalidProofError
 log = logging.getLogger(__name__)
 
 
diff --git a/lbrynet/wallet/transaction.py b/lbrynet/wallet/transaction.py
index a60619918..5b9857f9b 100644
--- a/lbrynet/wallet/transaction.py
+++ b/lbrynet/wallet/transaction.py
@@ -5,8 +5,8 @@ from typing import List, Iterable, Optional
 from torba.client.basetransaction import BaseTransaction, BaseInput, BaseOutput
 from torba.client.hash import hash160
 from lbrynet.schema.claim import Claim
-from lbrynet.extras.wallet.account import Account
-from lbrynet.extras.wallet.script import InputScript, OutputScript
+from lbrynet.wallet.account import Account
+from lbrynet.wallet.script import InputScript, OutputScript
 
 
 class Input(BaseInput):