diff --git a/src/charsets.js b/src/address-formats/charsets.js
similarity index 100%
rename from src/charsets.js
rename to src/address-formats/charsets.js
diff --git a/src/p2pkh.js b/src/address-formats/p2pkh.js
similarity index 100%
rename from src/p2pkh.js
rename to src/address-formats/p2pkh.js
diff --git a/src/p2wpkh-p2sh.js b/src/address-formats/p2wpkh-p2sh.js
similarity index 100%
rename from src/p2wpkh-p2sh.js
rename to src/address-formats/p2wpkh-p2sh.js
diff --git a/src/p2wpkh.js b/src/address-formats/p2wpkh.js
similarity index 100%
rename from src/p2wpkh.js
rename to src/address-formats/p2wpkh.js
diff --git a/src/index.js b/src/index.js
index ed02b7b..00401b5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,13 +3,13 @@ const Emitter = require('tiny-emitter');
 const ONE_SECOND = 1000;
 
 const keyFormats = new Map(Object.entries({
-	wif: require('./wif')
+	wif: require('./key-formats/wif')
 }));
 
 const addressFormats = new Map(Object.entries({
-	p2pkh: require('./p2pkh'),
-	'p2wpkh-p2sh': require('./p2wpkh-p2sh'),
-	p2wpkh: require('./p2wpkh')
+	p2pkh: require('./address-formats/p2pkh'),
+	'p2wpkh-p2sh': require('./address-formats/p2wpkh-p2sh'),
+	p2wpkh: require('./address-formats/p2wpkh')
 }));
 
 class Vain extends Emitter {
diff --git a/src/wif.js b/src/key-formats/wif.js
similarity index 100%
rename from src/wif.js
rename to src/key-formats/wif.js