diff --git a/lib/contract.js b/contracts/index.js
similarity index 100%
rename from lib/contract.js
rename to contracts/index.js
diff --git a/lib/providers.js b/providers/index.js
similarity index 100%
rename from lib/providers.js
rename to providers/index.js
diff --git a/test-wallets/wallet-test-encseed-no-password.json b/tests/make-tests/test-wallets/wallet-crowdsale-.json
similarity index 100%
rename from test-wallets/wallet-test-encseed-no-password.json
rename to tests/make-tests/test-wallets/wallet-crowdsale-.json
diff --git a/test-wallets/wallet-test-encseed-foo.json b/tests/make-tests/test-wallets/wallet-crowdsale-foo.json
similarity index 100%
rename from test-wallets/wallet-test-encseed-foo.json
rename to tests/make-tests/test-wallets/wallet-crowdsale-foo.json
diff --git a/test-wallets/wallet-test-geth-no-password.json b/tests/make-tests/test-wallets/wallet-secretstorage-.json
similarity index 100%
rename from test-wallets/wallet-test-geth-no-password.json
rename to tests/make-tests/test-wallets/wallet-secretstorage-.json
diff --git a/test-wallets/wallet-test-geth-foo.json b/tests/make-tests/test-wallets/wallet-secretstorage-foo.json
similarity index 100%
rename from test-wallets/wallet-test-geth-foo.json
rename to tests/make-tests/test-wallets/wallet-secretstorage-foo.json
diff --git a/test-wallets/wallet-test-life.json b/tests/make-tests/test-wallets/wallet-test-life.json
similarity index 100%
rename from test-wallets/wallet-test-life.json
rename to tests/make-tests/test-wallets/wallet-test-life.json
diff --git a/lib/browser-random-bytes.js b/utils/browser-random-bytes.js
similarity index 100%
rename from lib/browser-random-bytes.js
rename to utils/browser-random-bytes.js
diff --git a/lib/browser-xmlhttprequest.js b/utils/browser-xmlhttprequest.js
similarity index 100%
rename from lib/browser-xmlhttprequest.js
rename to utils/browser-xmlhttprequest.js
diff --git a/lib/utils.js b/utils/index.js
similarity index 100%
rename from lib/utils.js
rename to utils/index.js
diff --git a/lib/random-bytes.js b/utils/random-bytes.js
similarity index 100%
rename from lib/random-bytes.js
rename to utils/random-bytes.js
diff --git a/lib/units.js b/utils/units.js
similarity index 100%
rename from lib/units.js
rename to utils/units.js
diff --git a/lib/wallet.js b/wallet/index.js
similarity index 100%
rename from lib/wallet.js
rename to wallet/index.js
diff --git a/lib/secret-storage.js b/wallet/secret-storage.js
similarity index 100%
rename from lib/secret-storage.js
rename to wallet/secret-storage.js
diff --git a/lib/signing-key.js b/wallet/signing-key.js
similarity index 100%
rename from lib/signing-key.js
rename to wallet/signing-key.js