diff --git a/.cirrus.yml b/.cirrus.yml
index f8c6185..942792d 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -6,8 +6,8 @@ lint_task:
     - pip install flake8
     - pip install codespell
   script:
-    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=segwit_addr.py,key.py,messages_pb2.py,.eggs
-    - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,*mnemonics.py
+    - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,messages_pb2.py,.eggs
+    - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,*mnemonics.py,basicswap/contrib
 
 test_task:
   environment:
diff --git a/.travis.yml b/.travis.yml
index a6efe60..30de7c0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,8 +47,8 @@ jobs:
         - travis_retry pip install codespell==1.15.0
       before_script:
       script:
-        - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=segwit_addr.py,key.py,messages_pb2.py,.eggs
-        - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc
+        - PYTHONWARNINGS="ignore" flake8 --ignore=E501,F841,W503 --exclude=basicswap/contrib,messages_pb2.py,.eggs
+        - codespell --check-filenames --disable-colors --quiet-level=7 --ignore-words=tests/lint/spelling.ignore-words.txt -S .git,.eggs,gitianpubkeys,*.pyc,basicswap/contrib
       after_success:
         - echo "End lint"
     - stage: test
diff --git a/basicswap/base.py b/basicswap/base.py
index 8c22a4d..b70e9f5 100644
--- a/basicswap/base.py
+++ b/basicswap/base.py
@@ -10,7 +10,7 @@ import logging
 import subprocess
 
 import basicswap.config as cfg
-import basicswap.segwit_addr as segwit_addr
+import basicswap.contrib.segwit_addr as segwit_addr
 
 from .chainparams import (
     chainparams,
diff --git a/basicswap/key.py b/basicswap/contrib/key.py
similarity index 100%
rename from basicswap/key.py
rename to basicswap/contrib/key.py
diff --git a/basicswap/segwit_addr.py b/basicswap/contrib/segwit_addr.py
similarity index 100%
rename from basicswap/segwit_addr.py
rename to basicswap/contrib/segwit_addr.py
diff --git a/basicswap/util.py b/basicswap/util.py
index f0f3339..c895208 100644
--- a/basicswap/util.py
+++ b/basicswap/util.py
@@ -7,7 +7,7 @@
 import decimal
 import json
 import hashlib
-from .segwit_addr import bech32_decode, convertbits, bech32_encode
+from .contrib.segwit_addr import bech32_decode, convertbits, bech32_encode
 
 COIN = 100000000
 DCOIN = decimal.Decimal(COIN)
diff --git a/tests/basicswap/test_nmc.py b/tests/basicswap/test_nmc.py
index 0cadb86..5f19c39 100644
--- a/tests/basicswap/test_nmc.py
+++ b/tests/basicswap/test_nmc.py
@@ -38,7 +38,7 @@ from basicswap.rpc import (
     callrpc_cli,
     waitForRPC,
 )
-from basicswap.key import (
+from basicswap.contrib.key import (
     ECKey,
 )
 from basicswap.http_server import (
diff --git a/tests/basicswap/test_run.py b/tests/basicswap/test_run.py
index 1d8966e..98a9c1f 100644
--- a/tests/basicswap/test_run.py
+++ b/tests/basicswap/test_run.py
@@ -42,7 +42,7 @@ from basicswap.rpc import (
     callrpc_cli,
     waitForRPC,
 )
-from basicswap.key import (
+from basicswap.contrib.key import (
     ECKey,
 )
 from basicswap.http_server import (
@@ -87,6 +87,7 @@ def prepareOtherDir(datadir, nodeId, conf_file='litecoin.conf'):
         fp.write('findpeers=0\n')
         fp.write('debug=1\n')
         fp.write('debugexclude=libevent\n')
+        fp.write('fallbackfee=0.0002\n')
 
         fp.write('acceptnonstdtxn=0\n')