diff --git a/lib/bn.js b/lib/crypto/bn.js
similarity index 100%
rename from lib/bn.js
rename to lib/crypto/bn.js
diff --git a/lib/identity.js b/lib/extra/identity.js
similarity index 100%
rename from lib/identity.js
rename to lib/extra/identity.js
diff --git a/lib/message.js b/lib/extra/message.js
similarity index 100%
rename from lib/message.js
rename to lib/extra/message.js
diff --git a/lib/base58.js b/lib/protocol/base58.js
similarity index 100%
rename from lib/base58.js
rename to lib/protocol/base58.js
diff --git a/lib/base58check.js b/lib/protocol/base58check.js
similarity index 100%
rename from lib/base58check.js
rename to lib/protocol/base58check.js
diff --git a/lib/constants.js b/lib/protocol/constants.js
similarity index 100%
rename from lib/constants.js
rename to lib/protocol/constants.js
diff --git a/lib/varint.js b/lib/protocol/varint.js
similarity index 100%
rename from lib/varint.js
rename to lib/protocol/varint.js