diff --git a/lib/Key.js b/lib/Key.js
index 437c856f2..f2c655fa8 100644
--- a/lib/Key.js
+++ b/lib/Key.js
@@ -1,5 +1,5 @@
 if (process.versions) {
-  module.exports = require('./Key.node');
+  module.exports = require('./node/Key');
   return;
 }
-module.exports = require('./Key.browser');
+module.exports = require('./browser/Key');
diff --git a/lib/Point.js b/lib/Point.js
index fc611ec00..0fb01ac53 100644
--- a/lib/Point.js
+++ b/lib/Point.js
@@ -1,5 +1,5 @@
 if (process.versions) {
-  module.exports = require('./Point.node');
+  module.exports = require('./node/Point');
   return;
 }
-module.exports = require('./Point.browser');
+module.exports = require('./browser/Point');
diff --git a/lib/Key.browser.js b/lib/browser/Key.js
similarity index 97%
rename from lib/Key.browser.js
rename to lib/browser/Key.js
index b172e64ed..796819d62 100644
--- a/lib/Key.browser.js
+++ b/lib/browser/Key.js
@@ -1,4 +1,4 @@
-var ECKey = require('../browser/vendor-bundle.js').ECKey;
+var ECKey = require('../../browser/vendor-bundle.js').ECKey;
 var buffertools = require('buffertools');
 
 var Key = function() {
diff --git a/lib/Point.browser.js b/lib/browser/Point.js
similarity index 87%
rename from lib/Point.browser.js
rename to lib/browser/Point.js
index dacf965cd..b9f4c3638 100644
--- a/lib/Point.browser.js
+++ b/lib/browser/Point.js
@@ -4,11 +4,11 @@ var imports = require('soop').imports();
 var Key = imports.Key || require('./Key'); 
 var bignum = imports.bignum || require('bignum');
 var assert = require('assert');
-var ECKey = require('../browser/vendor-bundle.js').ECKey;
-var ECPointFp = require('../browser/vendor-bundle.js').ECPointFp;
-var ECFieldElementFp = require('../browser/vendor-bundle.js').ECFieldElementFp;
-var getSECCurveByName = require('../browser/vendor-bundle.js').getSECCurveByName;
-var BigInteger = require('../browser/vendor-bundle.js').BigInteger;
+var ECKey = require('../../browser/vendor-bundle.js').ECKey;
+var ECPointFp = require('../../browser/vendor-bundle.js').ECPointFp;
+var ECFieldElementFp = require('../../browser/vendor-bundle.js').ECFieldElementFp;
+var getSECCurveByName = require('../../browser/vendor-bundle.js').getSECCurveByName;
+var BigInteger = require('../../browser/vendor-bundle.js').BigInteger;
 var should = require('chai').should();
 
 //a point on the secp256k1 curve
diff --git a/lib/Key.node.js b/lib/node/Key.js
similarity index 100%
rename from lib/Key.node.js
rename to lib/node/Key.js
diff --git a/lib/Point.node.js b/lib/node/Point.js
similarity index 96%
rename from lib/Point.node.js
rename to lib/node/Point.js
index a3d2f4508..38a6466b8 100644
--- a/lib/Point.node.js
+++ b/lib/node/Point.js
@@ -1,7 +1,7 @@
 "use strict";
 
 var imports = require('soop').imports();
-var Key = imports.Key || require('./Key'); 
+var Key = imports.Key || require('../Key'); 
 var bignum = imports.bignum || require('bignum');
 var assert = require('assert');