diff --git a/.gitignore b/.gitignore
index a9999b81..3b057baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,9 @@ prof/
 .venv/
 .mypy_cache/
 __pycache__/
+.idea/
+.vscode/
+decred/setup.py
 .pytest_cache
 .coverage
 *.c
diff --git a/README.md b/README.md
index 48e4a031..8ad8ac57 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,19 @@ The [`tinywallet`](./tinywallet) package contains a wallet based on the
 Each package may be installed from the [Python Package Index](https://pypi.org/)
 using the [`pip`](https://pip.pypa.io/) command as usual.
 
+## Requirements
+
+To run tinydecred on your machine you will need to set up the following. 
+
+- pip install websocket_client
+- pip install blake256
+- pip install base58
+- pip install PyNaCl
+- pip install appdirs
+
+Set up and run dcrd. Ensure your rpcusername and rpcpassword is set in your dcrd config file.
+Installation guide can be found [`here`](https://docs.decred.org/wallets/cli/dcrd-setup/).
+
 ## Status
 
 [![Check and test both packages](https://github.com/decred/tinydecred/workflows/Check%20and%20test%20both%20packages/badge.svg)](https://github.com/decred/tinydecred/actions)
@@ -28,6 +41,7 @@ using the [`pip`](https://pip.pypa.io/) command as usual.
 [![GitHub contributors](https://img.shields.io/github/contributors/decred/tinydecred)](https://github.com/decred/tinydecred/graphs/contributors)
 [![GitHub](https://img.shields.io/github/license/decred/tinydecred)](./LICENSE)
 
+
 ## Roadmap
 
 In no particular order:
diff --git a/decred/decred/crypto/crypto.py b/decred/decred/crypto/crypto.py
index 13bdbca8..b90b007f 100644
--- a/decred/decred/crypto/crypto.py
+++ b/decred/decred/crypto/crypto.py
@@ -13,9 +13,9 @@
 from blake256.blake256 import blake_hash
 import nacl.secret
 
-from decred import DecredError
-from decred.util import encode
-from decred.util.encode import ByteArray, unblobCheck
+from decred.decred import DecredError
+from decred.decred.util import encode
+from decred.decred.util.encode import ByteArray, unblobCheck
 
 from . import rando
 from .secp256k1.curve import PrivateKey, PublicKey, curve as Curve
diff --git a/decred/decred/crypto/mnemonic.py b/decred/decred/crypto/mnemonic.py
index 5f957b2b..6c8c97ce 100644
--- a/decred/decred/crypto/mnemonic.py
+++ b/decred/decred/crypto/mnemonic.py
@@ -6,8 +6,8 @@
 PGP-based mnemonic seed generation.
 """
 
-from decred import DecredError
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.util.encode import ByteArray
 
 from .crypto import sha256ChecksumByte
 
diff --git a/decred/decred/crypto/rando.py b/decred/decred/crypto/rando.py
index e27397f8..21a27fa2 100644
--- a/decred/decred/crypto/rando.py
+++ b/decred/decred/crypto/rando.py
@@ -6,8 +6,8 @@
 
 import os
 
-from decred import DecredError
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.util.encode import ByteArray
 
 
 KEY_SIZE = 32
diff --git a/decred/decred/crypto/secp256k1/curve.py b/decred/decred/crypto/secp256k1/curve.py
index cba88c7d..8e6b72cb 100644
--- a/decred/decred/crypto/secp256k1/curve.py
+++ b/decred/decred/crypto/secp256k1/curve.py
@@ -26,9 +26,9 @@
 where x = x1/z1^2 and y = y1/z1^3.
 """
 
-from decred import DecredError
-from decred.crypto.rando import generateSeed
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.crypto.rando import generateSeed
+from decred.decred.util.encode import ByteArray
 
 from .field import BytePoints, FieldVal
 
diff --git a/decred/decred/crypto/secp256k1/field.py b/decred/decred/crypto/secp256k1/field.py
index d813f572..b9ee20af 100644
--- a/decred/decred/crypto/secp256k1/field.py
+++ b/decred/decred/crypto/secp256k1/field.py
@@ -7,7 +7,7 @@
 from base64 import b64decode
 from zlib import decompress as zdecompress
 
-from decred.util.encode import ByteArray
+from decred.decred.util.encode import ByteArray
 
 from .bytepoints import secp256k1BytePoints
 
diff --git a/decred/decred/dcr/account.py b/decred/decred/dcr/account.py
index 58756251..08216c61 100644
--- a/decred/decred/dcr/account.py
+++ b/decred/decred/dcr/account.py
@@ -4,12 +4,12 @@
 See LICENSE for details
 """
 
-from decred import DecredError
-from decred.crypto import crypto, opcode
-from decred.dcr import addrlib
-from decred.dcr.txscript import DefaultRelayFeePerKb
-from decred.util import encode, helpers
-from decred.util.encode import BuildyBytes, ByteArray, unblobCheck
+from decred.decred import DecredError
+from decred.decred.crypto import crypto, opcode
+from decred.decred.dcr import addrlib
+from decred.decred.dcr.txscript import DefaultRelayFeePerKb
+from decred.decred.util import encode, helpers
+from decred.decred.util.encode import BuildyBytes, ByteArray, unblobCheck
 
 from . import nets, txscript
 from .vsp import VotingServiceProvider
diff --git a/decred/decred/dcr/addrlib.py b/decred/decred/dcr/addrlib.py
index e0fec3bc..d7b2981a 100644
--- a/decred/decred/dcr/addrlib.py
+++ b/decred/decred/dcr/addrlib.py
@@ -9,8 +9,8 @@
 
 from base58 import b58encode
 
-from decred import DecredError
-from decred.crypto.crypto import (
+from decred.decred import DecredError
+from decred.decred.crypto.crypto import (
     RIPEMD160_SIZE,
     PKFCompressed,
     PKFUncompressed,
@@ -21,9 +21,9 @@
     checksum,
     hash160,
 )
-from decred.crypto.secp256k1.curve import curve as Secp256k1
-from decred.dcr import nets
-from decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck
+from decred.decred.crypto.secp256k1.curve import curve as Secp256k1
+from decred.decred.dcr import nets
+from decred.decred.util.encode import BuildyBytes, ByteArray, decodeBlob, unblobCheck
 
 
 class Address:
diff --git a/decred/decred/dcr/blockchain.py b/decred/decred/dcr/blockchain.py
index bf1e9410..2bf52a7d 100644
--- a/decred/decred/dcr/blockchain.py
+++ b/decred/decred/dcr/blockchain.py
@@ -4,10 +4,10 @@
 
 import time
 
-from decred.dcr import addrlib, rpc
-from decred.dcr.wire.msgblock import BlockHeader
-from decred.util import database, helpers
-from decred.util.encode import ByteArray
+from decred.decred.dcr import addrlib, rpc
+from decred.decred.dcr.wire.msgblock import BlockHeader
+from decred.decred.util import database, helpers
+from decred.decred.util.encode import ByteArray
 
 
 log = helpers.getLogger("blockchain")
diff --git a/decred/decred/dcr/dcrdata.py b/decred/decred/dcr/dcrdata.py
index a8cf41e0..dba9c22c 100644
--- a/decred/decred/dcr/dcrdata.py
+++ b/decred/decred/dcr/dcrdata.py
@@ -12,12 +12,12 @@
 import time
 from urllib.parse import urlencode, urljoin, urlsplit, urlunsplit
 
-from decred import DecredError
-from decred.crypto import crypto
-from decred.dcr import addrlib
-from decred.util import database, tinyhttp, ws
-from decred.util.encode import ByteArray
-from decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL
+from decred.decred import DecredError
+from decred.decred.crypto import crypto
+from decred.decred.dcr import addrlib
+from decred.decred.util import database, tinyhttp, ws
+from decred.decred.util.encode import ByteArray
+from decred.decred.util.helpers import formatTraceback, getLogger, makeWebsocketURL
 
 from . import account, agenda, txscript
 from .wire import msgblock, msgtx, wire
diff --git a/decred/decred/dcr/nets/__init__.py b/decred/decred/dcr/nets/__init__.py
index 6f28745a..d6934037 100644
--- a/decred/decred/dcr/nets/__init__.py
+++ b/decred/decred/dcr/nets/__init__.py
@@ -3,7 +3,7 @@
 See LICENSE for details
 """
 
-from decred import DecredError
+from decred.decred import DecredError
 
 from . import mainnet, simnet, testnet
 
diff --git a/decred/decred/dcr/nets/mainnet.py b/decred/decred/dcr/nets/mainnet.py
index e1278597..62586a62 100644
--- a/decred/decred/dcr/nets/mainnet.py
+++ b/decred/decred/dcr/nets/mainnet.py
@@ -7,7 +7,7 @@
 https://github.com/decred/dcrd/blob/master/chaincfg/mainnetparams.go
 """
 
-from decred.dcr import constants as C
+from decred.decred.dcr import constants as C
 
 
 Name = "mainnet"
diff --git a/decred/decred/dcr/rpc.py b/decred/decred/dcr/rpc.py
index f387df9b..c87dcc8e 100644
--- a/decred/decred/dcr/rpc.py
+++ b/decred/decred/dcr/rpc.py
@@ -9,11 +9,11 @@
 import ssl
 import types
 
-from decred import DecredError
-from decred.crypto.opcode import OP_SSRTX
-from decred.util import tinyhttp, ws
-from decred.util.encode import ByteArray
-from decred.util.helpers import getLogger, makeWebsocketURL
+from decred.decred import DecredError
+from decred.decred.crypto.opcode import OP_SSRTX
+from decred.decred.util import tinyhttp, ws
+from decred.decred.util.encode import ByteArray
+from decred.decred.util.helpers import getLogger, makeWebsocketURL
 
 from . import agenda, txscript
 from .wire.msgblock import BlockHeader
diff --git a/decred/decred/dcr/txscript.py b/decred/decred/dcr/txscript.py
index 9c80bbbe..dbc719af 100644
--- a/decred/decred/dcr/txscript.py
+++ b/decred/decred/dcr/txscript.py
@@ -9,12 +9,12 @@
 import bisect
 import math
 
-from decred import DecredError
-from decred.crypto import crypto, opcode
-from decred.crypto.secp256k1.curve import curve as Curve
-from decred.dcr import addrlib
-from decred.util import helpers
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.crypto import crypto, opcode
+from decred.decred.crypto.secp256k1.curve import curve as Curve
+from decred.decred.dcr import addrlib
+from decred.decred.util import helpers
+from decred.decred.util.encode import ByteArray
 
 from .wire import msgtx, wire
 
diff --git a/decred/decred/dcr/vsp.py b/decred/decred/dcr/vsp.py
index fbb06586..fc58971a 100644
--- a/decred/decred/dcr/vsp.py
+++ b/decred/decred/dcr/vsp.py
@@ -9,10 +9,10 @@
 import time
 from urllib.parse import urlsplit, urlunsplit
 
-from decred import DecredError
-from decred.dcr import addrlib
-from decred.util import encode, tinyhttp
-from decred.util.encode import ByteArray, unblobCheck
+from decred.decred import DecredError
+from decred.decred.dcr import addrlib
+from decred.decred.util import encode, tinyhttp
+from decred.decred.util.encode import ByteArray, unblobCheck
 
 from . import constants, nets, txscript
 
diff --git a/decred/decred/dcr/wire/msgblock.py b/decred/decred/dcr/wire/msgblock.py
index 0fa47515..4904339f 100644
--- a/decred/decred/dcr/wire/msgblock.py
+++ b/decred/decred/dcr/wire/msgblock.py
@@ -6,8 +6,8 @@
 Based on dcrd MsgBlock.
 """
 
-from decred.crypto import crypto
-from decred.util.encode import ByteArray
+from decred.decred.crypto import crypto
+from decred.decred.util.encode import ByteArray
 
 
 # chainhash.HashSize in Go
diff --git a/decred/decred/dcr/wire/msgping.py b/decred/decred/dcr/wire/msgping.py
index fe35e669..d11d4f4a 100644
--- a/decred/decred/dcr/wire/msgping.py
+++ b/decred/decred/dcr/wire/msgping.py
@@ -5,7 +5,7 @@
 Based on dcrd MsgPing.
 """
 
-from decred.util.encode import ByteArray
+from decred.decred.util.encode import ByteArray
 
 
 CmdPing = "ping"
diff --git a/decred/decred/dcr/wire/msgpong.py b/decred/decred/dcr/wire/msgpong.py
index db0f37ed..b6002961 100644
--- a/decred/decred/dcr/wire/msgpong.py
+++ b/decred/decred/dcr/wire/msgpong.py
@@ -5,7 +5,7 @@
 Based on dcrd MsgPing.
 """
 
-from decred.util.encode import ByteArray
+from decred.decred.util.encode import ByteArray
 
 
 CmdPong = "pong"
diff --git a/decred/decred/dcr/wire/msgtx.py b/decred/decred/dcr/wire/msgtx.py
index 11edb9d2..6de6e176 100644
--- a/decred/decred/dcr/wire/msgtx.py
+++ b/decred/decred/dcr/wire/msgtx.py
@@ -6,10 +6,10 @@
 Based on dcrd MsgTx.
 """
 
-from decred import DecredError
-from decred.crypto.crypto import hashH
-from decred.dcr import txscript
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.crypto.crypto import hashH
+from decred.decred.dcr import txscript
+from decred.decred.util.encode import ByteArray
 
 from . import wire
 
diff --git a/decred/decred/dcr/wire/msgverack.py b/decred/decred/dcr/wire/msgverack.py
index 9b039159..4dd8ca85 100644
--- a/decred/decred/dcr/wire/msgverack.py
+++ b/decred/decred/dcr/wire/msgverack.py
@@ -5,7 +5,7 @@
 Based on dcrd MsgVerAck.
 """
 
-from decred.util.encode import ByteArray
+from decred.decred.util.encode import ByteArray
 
 
 CmdVerAck = "verack"
diff --git a/decred/decred/dcr/wire/msgversion.py b/decred/decred/dcr/wire/msgversion.py
index ceee1903..174569de 100644
--- a/decred/decred/dcr/wire/msgversion.py
+++ b/decred/decred/dcr/wire/msgversion.py
@@ -5,9 +5,9 @@
 
 import time
 
-from decred import DecredError
-from decred.dcr.wire import netaddress, wire
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.dcr.wire import netaddress, wire
+from decred.decred.util.encode import ByteArray
 
 
 # MaxUserAgentLen is the maximum allowed length for the user agent field in a
diff --git a/decred/decred/dcr/wire/netaddress.py b/decred/decred/dcr/wire/netaddress.py
index e8ef9065..6bce9bbc 100644
--- a/decred/decred/dcr/wire/netaddress.py
+++ b/decred/decred/dcr/wire/netaddress.py
@@ -6,8 +6,8 @@
 import socket
 import time
 
-from decred import DecredError
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.util.encode import ByteArray
 
 
 MaxNetAddressPayload = 30
diff --git a/decred/decred/dcr/wire/wire.py b/decred/decred/dcr/wire/wire.py
index c30de349..c321ad2f 100644
--- a/decred/decred/dcr/wire/wire.py
+++ b/decred/decred/dcr/wire/wire.py
@@ -6,8 +6,8 @@
 Constants and common routines from the dcrd wire package.
 """
 
-from decred import DecredError
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.util.encode import ByteArray
 
 
 # fmt: off
diff --git a/decred/decred/util/chains.py b/decred/decred/util/chains.py
index 05a99716..b4f2e33a 100644
--- a/decred/decred/util/chains.py
+++ b/decred/decred/util/chains.py
@@ -3,8 +3,8 @@
 See LICENSE for details
 """
 
-from decred import DecredError
-from decred.dcr import account as dcracct, nets as dcrnets
+from decred.decred import DecredError
+from decred.decred.dcr import account as dcracct, nets as dcrnets
 
 
 class BipIDs:
diff --git a/decred/decred/util/database.py b/decred/decred/util/database.py
index 83a6e54e..539bde7f 100644
--- a/decred/decred/util/database.py
+++ b/decred/decred/util/database.py
@@ -16,7 +16,7 @@
 import sqlite3
 import threading
 
-from decred import DecredError
+from decred.decred import DecredError
 
 
 TRUE = bytearray([1])
diff --git a/decred/decred/util/encode.py b/decred/decred/util/encode.py
index 485e4f0d..93f2b227 100644
--- a/decred/decred/util/encode.py
+++ b/decred/decred/util/encode.py
@@ -8,7 +8,7 @@
 
 import struct
 
-from decred import DecredError
+from decred.decred import DecredError
 
 
 NONE = "None".encode()
diff --git a/decred/decred/util/tinyhttp.py b/decred/decred/util/tinyhttp.py
index 8b420d76..f071121d 100644
--- a/decred/decred/util/tinyhttp.py
+++ b/decred/decred/util/tinyhttp.py
@@ -9,7 +9,7 @@
 from urllib.parse import urlencode
 import urllib.request as urlrequest
 
-from decred import DecredError
+from decred.decred import DecredError
 
 from .helpers import formatTraceback
 
diff --git a/decred/decred/wallet/accounts.py b/decred/decred/wallet/accounts.py
index b5868ea8..d19191b8 100644
--- a/decred/decred/wallet/accounts.py
+++ b/decred/decred/wallet/accounts.py
@@ -8,9 +8,9 @@
     mostly be through the AccountManager.
 """
 
-from decred import DecredError
-from decred.crypto import crypto
-from decred.util import chains, encode, helpers
+from decred.decred import DecredError
+from decred.decred.crypto import crypto
+from decred.decred.util import chains, encode, helpers
 
 
 EXTERNAL_BRANCH = 0
diff --git a/decred/decred/wallet/wallet.py b/decred/decred/wallet/wallet.py
index fc493d94..8c4df1d3 100644
--- a/decred/decred/wallet/wallet.py
+++ b/decred/decred/wallet/wallet.py
@@ -6,12 +6,12 @@
 
 from pathlib import Path
 
-from decred import DecredError
-from decred.crypto import crypto, mnemonic, rando
-from decred.dcr import nets
-from decred.dcr.dcrdata import DcrdataBlockchain
-from decred.util import chains, database, encode, helpers
-from decred.util.helpers import mkdir
+from decred.decred import DecredError
+from decred.decred.crypto import crypto, mnemonic, rando
+from decred.decred.dcr import nets
+from decred.decred.dcr.dcrdata import DcrdataBlockchain
+from decred.decred.util import chains, database, encode, helpers
+from decred.decred.util.helpers import mkdir
 
 from . import accounts
 
diff --git a/decred/examples/create_testnet_wallet.py b/decred/examples/create_testnet_wallet.py
index 91aaa040..31fc76fe 100644
--- a/decred/examples/create_testnet_wallet.py
+++ b/decred/examples/create_testnet_wallet.py
@@ -7,7 +7,7 @@
 
 from getpass import getpass
 
-from decred.wallet.wallet import SimpleWallet
+from decred.decred.wallet.wallet import SimpleWallet
 
 
 def main():
diff --git a/decred/examples/plot_ticket_price.py b/decred/examples/plot_ticket_price.py
index ce167847..d0d5de36 100644
--- a/decred/examples/plot_ticket_price.py
+++ b/decred/examples/plot_ticket_price.py
@@ -6,8 +6,8 @@
 be installed separately with `pip3 install matplotlib`.
 """
 
-from decred.dcr.dcrdata import DcrdataClient
-from decred.util.helpers import mktime
+from decred.decred.dcr.dcrdata import DcrdataClient
+from decred.decred.util.helpers import mktime
 
 
 try:
diff --git a/decred/examples/send_testnet.py b/decred/examples/send_testnet.py
index c0e76624..697ac76c 100644
--- a/decred/examples/send_testnet.py
+++ b/decred/examples/send_testnet.py
@@ -9,7 +9,7 @@
 
 from getpass import getpass
 
-from decred.wallet.wallet import SimpleWallet
+from decred.decred.wallet.wallet import SimpleWallet
 
 # Testnet return address for faucet.decred.org.
 TESTNET_ADDRESS = "TsfDLrRkk9ciUuwfp2b8PawwnukYD7yAjGd"
diff --git a/decred/tests/benchmark/util/test_database_benchmark.py b/decred/tests/benchmark/util/test_database_benchmark.py
index d32623ff..169673d1 100644
--- a/decred/tests/benchmark/util/test_database_benchmark.py
+++ b/decred/tests/benchmark/util/test_database_benchmark.py
@@ -5,7 +5,7 @@
 
 import pytest
 
-from decred.util import database
+from decred.decred.util import database
 
 
 @pytest.fixture
diff --git a/decred/tests/conftest.py b/decred/tests/conftest.py
index 37713be0..24573898 100644
--- a/decred/tests/conftest.py
+++ b/decred/tests/conftest.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from decred.util import chains, helpers
+from decred.decred.util import chains, helpers
 
 
 @pytest.fixture
diff --git a/decred/tests/integration/dcr/test_blockchain_live.py b/decred/tests/integration/dcr/test_blockchain_live.py
index e7d977d6..9719861d 100644
--- a/decred/tests/integration/dcr/test_blockchain_live.py
+++ b/decred/tests/integration/dcr/test_blockchain_live.py
@@ -5,10 +5,10 @@
 
 import pytest
 
-from decred.dcr.blockchain import LocalNode
-from decred.dcr.nets import mainnet
-from decred.dcr.wire.msgtx import OutPoint
-from decred.util.encode import ByteArray, rba
+from decred.decred.dcr.blockchain import LocalNode
+from decred.decred.dcr.nets import mainnet
+from decred.decred.dcr.wire.msgtx import OutPoint
+from decred.decred.util.encode import ByteArray, rba
 
 
 @pytest.fixture
diff --git a/decred/tests/integration/dcr/test_dcrdata_live.py b/decred/tests/integration/dcr/test_dcrdata_live.py
index e051184a..23c8bec1 100644
--- a/decred/tests/integration/dcr/test_dcrdata_live.py
+++ b/decred/tests/integration/dcr/test_dcrdata_live.py
@@ -5,12 +5,12 @@
 
 import time
 
-from decred.crypto import crypto, rando
-from decred.crypto.secp256k1 import curve as Curve
-from decred.dcr import account, addrlib, dcrdata, txscript
-from decred.dcr.nets import mainnet, testnet
-from decred.dcr.wire import msgtx
-from decred.util.encode import ByteArray
+from decred.decred.crypto import crypto, rando
+from decred.decred.crypto.secp256k1 import curve as Curve
+from decred.decred.dcr import account, addrlib, dcrdata, txscript
+from decred.decred.dcr.nets import mainnet, testnet
+from decred.decred.dcr.wire import msgtx
+from decred.decred.util.encode import ByteArray
 
 
 class TestDcrdata:
diff --git a/decred/tests/integration/dcr/test_rpc_live.py b/decred/tests/integration/dcr/test_rpc_live.py
index 572527ee..2be4d2d5 100644
--- a/decred/tests/integration/dcr/test_rpc_live.py
+++ b/decred/tests/integration/dcr/test_rpc_live.py
@@ -8,14 +8,14 @@
 from base58 import b58decode
 import pytest
 
-from decred import DecredError
-from decred.crypto import crypto, opcode
-from decred.dcr import account, addrlib, rpc, txscript
-from decred.dcr.nets import mainnet
-from decred.dcr.wire import wire
-from decred.dcr.wire.msgblock import BlockHeader
-from decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut
-from decred.util.encode import ByteArray
+from decred.decred import DecredError
+from decred.decred.crypto import crypto, opcode
+from decred.decred.dcr import account, addrlib, rpc, txscript
+from decred.decred.dcr.nets import mainnet
+from decred.decred.dcr.wire import wire
+from decred.decred.dcr.wire.msgblock import BlockHeader
+from decred.decred.dcr.wire.msgtx import MsgTx, OutPoint, TxIn, TxOut
+from decred.decred.util.encode import ByteArray
 
 
 mainnetAddress = "Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx"
diff --git a/decred/tests/integration/dcr/test_vsp_live.py b/decred/tests/integration/dcr/test_vsp_live.py
index 78d9b6bd..f1169890 100644
--- a/decred/tests/integration/dcr/test_vsp_live.py
+++ b/decred/tests/integration/dcr/test_vsp_live.py
@@ -3,8 +3,8 @@
 See LICENSE for details
 """
 
-from decred.dcr import vsp
-from decred.dcr.nets import testnet
+from decred.decred.dcr import vsp
+from decred.decred.dcr.nets import testnet
 
 
 VSP_URL = "https://dcrstakedinner.com"
diff --git a/decred/tests/integration/util/test_ws.py b/decred/tests/integration/util/test_ws.py
index 4b7caa0d..a5f15ed0 100644
--- a/decred/tests/integration/util/test_ws.py
+++ b/decred/tests/integration/util/test_ws.py
@@ -12,7 +12,7 @@
 import websocket
 from websocket_server import WebsocketServer
 
-from decred.util import ws
+from decred.decred.util import ws
 
 
 HOST = "localhost"
diff --git a/decred/tests/integration/wallet/test_wallet.py b/decred/tests/integration/wallet/test_wallet.py
index afe17085..5790f015 100644
--- a/decred/tests/integration/wallet/test_wallet.py
+++ b/decred/tests/integration/wallet/test_wallet.py
@@ -2,8 +2,8 @@
 Copyright (c) 2020, The Decred developers
 """
 
-from decred.dcr import nets
-from decred.wallet.wallet import SimpleWallet, Wallet
+from decred.decred.dcr import nets
+from decred.decred.wallet.wallet import SimpleWallet, Wallet
 
 
 PASSWORD = "test_password"
diff --git a/tinywallet/tinywallet/app.py b/tinywallet/tinywallet/app.py
index 710d9dd3..adab6c90 100644
--- a/tinywallet/tinywallet/app.py
+++ b/tinywallet/tinywallet/app.py
@@ -12,15 +12,15 @@
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-from decred.dcr import constants as DCR
-from decred.dcr.dcrdata import DcrdataBlockchain
-from decred.util import chains, database, helpers
-from decred.util.helpers import formatTraceback
-from decred.wallet.wallet import Wallet
-
-from . import config, qutilities as Q, screens, ui
-from .config import DB
-from .ui import LARGE, MEDIUM, SMALL, TINY
+from decred.decred.dcr import constants as DCR
+from decred.decred.dcr.dcrdata import DcrdataBlockchain
+from decred.decred.util import chains, database, helpers
+from decred.decred.util.helpers import formatTraceback
+from decred.decred.wallet.wallet import Wallet
+
+import config, qutilities as Q, screens, ui
+from config import DB
+from ui import LARGE, MEDIUM, SMALL, TINY
 
 
 # The directory of the tinywallet package.
diff --git a/tinywallet/tinywallet/config.py b/tinywallet/tinywallet/config.py
index b2c60def..4b4b63f6 100644
--- a/tinywallet/tinywallet/config.py
+++ b/tinywallet/tinywallet/config.py
@@ -14,8 +14,8 @@
 
 from appdirs import AppDirs
 
-from decred.dcr import nets
-from decred.util import helpers
+from decred.decred.dcr import nets
+from decred.decred.util import helpers
 
 
 # Set the data directory in a OS-appropriate location.
diff --git a/tinywallet/tinywallet/qutilities.py b/tinywallet/tinywallet/qutilities.py
index 5bb9856b..a6760dbe 100644
--- a/tinywallet/tinywallet/qutilities.py
+++ b/tinywallet/tinywallet/qutilities.py
@@ -10,7 +10,7 @@
 
 from PyQt5 import QtCore, QtGui, QtWidgets
 
-from decred.util import helpers
+from decred.decred.util import helpers
 
 
 log = helpers.getLogger("QUTIL")
diff --git a/tinywallet/tinywallet/screens.py b/tinywallet/tinywallet/screens.py
index 2ff81441..050406d3 100644
--- a/tinywallet/tinywallet/screens.py
+++ b/tinywallet/tinywallet/screens.py
@@ -14,19 +14,19 @@
 
 from PyQt5 import QtCore, QtGui, QtSvg, QtWidgets
 
-from decred import DecredError
-from decred.crypto import crypto
-from decred.dcr import constants as DCR, nets
-from decred.dcr.blockchain import LocalNode
-from decred.dcr.txscript import DefaultRelayFeePerKb
-from decred.dcr.vsp import VotingServiceProvider
-from decred.util import chains, database, helpers
-from decred.util.helpers import formatTraceback
-from decred.wallet.wallet import Wallet
-
-from . import config, qutilities as Q, ui
-from .config import DB
-from .ui import SMALL, TINY
+from decred.decred import DecredError
+from decred.decred.crypto import crypto
+from decred.decred.dcr import constants as DCR, nets
+from decred.decred.dcr.blockchain import LocalNode
+from decred.decred.dcr.txscript import DefaultRelayFeePerKb
+from decred.decred.dcr.vsp import VotingServiceProvider
+from decred.decred.util import chains, database, helpers
+from decred.decred.util.helpers import formatTraceback
+from decred.decred.wallet.wallet import Wallet
+
+import config, qutilities as Q, ui
+from config import DB
+from ui import SMALL, TINY
 
 
 UI_DIR = os.path.dirname(os.path.realpath(__file__))