diff --git a/mmgen/baseconv.py b/mmgen/baseconv.py
index 926b411d..f6c34c13 100755
--- a/mmgen/baseconv.py
+++ b/mmgen/baseconv.py
@@ -82,7 +82,7 @@ class baseconv(object):
 	def __init__(self,wl_id):
 
 		if wl_id == 'mmgen':
-			from .mn_electrum import words
+			from .wordlist.electrum import words
 			self.constants['digits'][wl_id] = words
 		elif wl_id not in self.constants['digits']:
 			raise ValueError(f'{wl_id}: unrecognized mnemonic ID')
diff --git a/mmgen/bip39.py b/mmgen/bip39.py
index 576f9dc3..0c61f955 100755
--- a/mmgen/bip39.py
+++ b/mmgen/bip39.py
@@ -49,7 +49,7 @@ class bip39(baseconv):
 
 	def __init__(self,wl_id='bip39'):
 		assert wl_id == 'bip39', "initialize with 'bip39' for compatibility with baseconv API"
-		from .mn_bip39 import words
+		from .wordlist.bip39 import words
 		self.digits = words
 		self.wl_id = 'bip39'
 
diff --git a/mmgen/mn_bip39.py b/mmgen/wordlist/bip39.py
similarity index 100%
rename from mmgen/mn_bip39.py
rename to mmgen/wordlist/bip39.py
diff --git a/mmgen/mn_electrum.py b/mmgen/wordlist/electrum.py
similarity index 100%
rename from mmgen/mn_electrum.py
rename to mmgen/wordlist/electrum.py
diff --git a/mmgen/mn_monero.py b/mmgen/wordlist/monero.py
similarity index 100%
rename from mmgen/mn_monero.py
rename to mmgen/wordlist/monero.py
diff --git a/mmgen/mn_tirosh.py b/mmgen/wordlist/tirosh.py
similarity index 100%
rename from mmgen/mn_tirosh.py
rename to mmgen/wordlist/tirosh.py
diff --git a/mmgen/xmrseed.py b/mmgen/xmrseed.py
index 8e799663..b2fc5a95 100755
--- a/mmgen/xmrseed.py
+++ b/mmgen/xmrseed.py
@@ -36,7 +36,7 @@ class xmrseed(baseconv):
 
 	def __init__(self,wl_id='xmrseed'):
 		assert wl_id == 'xmrseed', "initialize with 'xmrseed' for compatibility with baseconv API"
-		from .mn_monero import words
+		from .wordlist.monero import words
 		self.digits = words
 		self.wl_id = 'xmrseed'
 
diff --git a/setup.cfg b/setup.cfg
index 311f79e5..2213de70 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -58,6 +58,7 @@ packages =
 	mmgen.tx
 	mmgen.tw
 	mmgen.wallet
+	mmgen.wordlist
 
 scripts =
 	cmds/mmgen-addrgen
diff --git a/test/overlay/__init__.py b/test/overlay/__init__.py
index ef035646..9978353f 100644
--- a/test/overlay/__init__.py
+++ b/test/overlay/__init__.py
@@ -55,7 +55,8 @@ def overlay_setup(repo_root):
 				'mmgen.tool',
 				'mmgen.tx',
 				'mmgen.tw',
-				'mmgen.wallet' ):
+				'mmgen.wallet',
+				'mmgen.wordlist' ):
 			process_srcdir(d)
 
 	return overlay_dir