diff --git a/local-ip.js b/lib/local-ip.js
similarity index 100%
rename from local-ip.js
rename to lib/local-ip.js
diff --git a/match-ips.js b/lib/match-ips.js
similarity index 100%
rename from match-ips.js
rename to lib/match-ips.js
diff --git a/serve.js b/serve.js
index 1c6e082..b55f8c7 100755
--- a/serve.js
+++ b/serve.js
@@ -398,12 +398,12 @@ function run() {
 
     if (!(argv.servername && defaultServername !== argv.servername && !(argv.key && argv.cert))) {
       // ifaces
-      opts.ifaces = require('./local-ip.js').find();
+      opts.ifaces = require('./lib/local-ip.js').find();
       promise = PromiseA.resolve();
     } else {
       console.info("Attempting to resolve external connection for '" + argv.servername + "'");
       try {
-        promise = require('./match-ips.js').match(argv.servername, opts);
+        promise = require('./lib/match-ips.js').match(argv.servername, opts);
       } catch(e) {
         console.warn("Upgrade to version 2.x to use automatic certificate issuance for '" + argv.servername + "'");
         promise = PromiseA.resolve();