diff --git a/src/node/binding.gyp b/src/node/binding.gyp
index fe4b5da9c8f..cf2a6acb04f 100644
--- a/src/node/binding.gyp
+++ b/src/node/binding.gyp
@@ -28,17 +28,17 @@
       },
       "target_name": "grpc",
       "sources": [
-        "byte_buffer.cc",
-        "call.cc",
-        "channel.cc",
-        "completion_queue_async_worker.cc",
-        "credentials.cc",
-        "event.cc",
-        "node_grpc.cc",
-        "server.cc",
-        "server_credentials.cc",
-        "tag.cc",
-        "timeval.cc"
+        "ext/byte_buffer.cc",
+        "ext/call.cc",
+        "ext/channel.cc",
+        "ext/completion_queue_async_worker.cc",
+        "ext/credentials.cc",
+        "ext/event.cc",
+        "ext/node_grpc.cc",
+        "ext/server.cc",
+        "ext/server_credentials.cc",
+        "ext/tag.cc",
+        "ext/timeval.cc"
       ],
       'conditions' : [
         ['no_install=="yes"', {
diff --git a/src/node/byte_buffer.cc b/src/node/ext/byte_buffer.cc
similarity index 100%
rename from src/node/byte_buffer.cc
rename to src/node/ext/byte_buffer.cc
diff --git a/src/node/byte_buffer.h b/src/node/ext/byte_buffer.h
similarity index 100%
rename from src/node/byte_buffer.h
rename to src/node/ext/byte_buffer.h
diff --git a/src/node/call.cc b/src/node/ext/call.cc
similarity index 100%
rename from src/node/call.cc
rename to src/node/ext/call.cc
diff --git a/src/node/call.h b/src/node/ext/call.h
similarity index 100%
rename from src/node/call.h
rename to src/node/ext/call.h
diff --git a/src/node/channel.cc b/src/node/ext/channel.cc
similarity index 100%
rename from src/node/channel.cc
rename to src/node/ext/channel.cc
diff --git a/src/node/channel.h b/src/node/ext/channel.h
similarity index 100%
rename from src/node/channel.h
rename to src/node/ext/channel.h
diff --git a/src/node/completion_queue_async_worker.cc b/src/node/ext/completion_queue_async_worker.cc
similarity index 100%
rename from src/node/completion_queue_async_worker.cc
rename to src/node/ext/completion_queue_async_worker.cc
diff --git a/src/node/completion_queue_async_worker.h b/src/node/ext/completion_queue_async_worker.h
similarity index 100%
rename from src/node/completion_queue_async_worker.h
rename to src/node/ext/completion_queue_async_worker.h
diff --git a/src/node/credentials.cc b/src/node/ext/credentials.cc
similarity index 100%
rename from src/node/credentials.cc
rename to src/node/ext/credentials.cc
diff --git a/src/node/credentials.h b/src/node/ext/credentials.h
similarity index 100%
rename from src/node/credentials.h
rename to src/node/ext/credentials.h
diff --git a/src/node/event.cc b/src/node/ext/event.cc
similarity index 100%
rename from src/node/event.cc
rename to src/node/ext/event.cc
diff --git a/src/node/event.h b/src/node/ext/event.h
similarity index 100%
rename from src/node/event.h
rename to src/node/ext/event.h
diff --git a/src/node/node_grpc.cc b/src/node/ext/node_grpc.cc
similarity index 100%
rename from src/node/node_grpc.cc
rename to src/node/ext/node_grpc.cc
diff --git a/src/node/server.cc b/src/node/ext/server.cc
similarity index 100%
rename from src/node/server.cc
rename to src/node/ext/server.cc
diff --git a/src/node/server.h b/src/node/ext/server.h
similarity index 100%
rename from src/node/server.h
rename to src/node/ext/server.h
diff --git a/src/node/server_credentials.cc b/src/node/ext/server_credentials.cc
similarity index 100%
rename from src/node/server_credentials.cc
rename to src/node/ext/server_credentials.cc
diff --git a/src/node/server_credentials.h b/src/node/ext/server_credentials.h
similarity index 100%
rename from src/node/server_credentials.h
rename to src/node/ext/server_credentials.h
diff --git a/src/node/tag.cc b/src/node/ext/tag.cc
similarity index 100%
rename from src/node/tag.cc
rename to src/node/ext/tag.cc
diff --git a/src/node/tag.h b/src/node/ext/tag.h
similarity index 100%
rename from src/node/tag.h
rename to src/node/ext/tag.h
diff --git a/src/node/timeval.cc b/src/node/ext/timeval.cc
similarity index 100%
rename from src/node/timeval.cc
rename to src/node/ext/timeval.cc
diff --git a/src/node/timeval.h b/src/node/ext/timeval.h
similarity index 100%
rename from src/node/timeval.h
rename to src/node/ext/timeval.h
diff --git a/src/node/main.js b/src/node/index.js
similarity index 96%
rename from src/node/main.js
rename to src/node/index.js
index 751c3525d37..0627e7f5576 100644
--- a/src/node/main.js
+++ b/src/node/index.js
@@ -35,9 +35,9 @@ var _ = require('underscore');
 
 var ProtoBuf = require('protobufjs');
 
-var surface_client = require('./surface_client.js');
+var surface_client = require('./src/surface_client.js');
 
-var surface_server = require('./surface_server.js');
+var surface_server = require('./src/surface_server.js');
 
 var grpc = require('bindings')('grpc');
 
diff --git a/src/node/package.json b/src/node/package.json
index 5f3c6fa3455..8a0b51dda8e 100644
--- a/src/node/package.json
+++ b/src/node/package.json
@@ -17,5 +17,5 @@
     "mocha": "~1.21.0",
     "minimist": "^1.1.0"
   },
-  "main": "main.js"
+  "main": "index.js"
 }
diff --git a/src/node/client.js b/src/node/src/client.js
similarity index 100%
rename from src/node/client.js
rename to src/node/src/client.js
diff --git a/src/node/common.js b/src/node/src/common.js
similarity index 100%
rename from src/node/common.js
rename to src/node/src/common.js
diff --git a/src/node/server.js b/src/node/src/server.js
similarity index 100%
rename from src/node/server.js
rename to src/node/src/server.js
diff --git a/src/node/surface_client.js b/src/node/src/surface_client.js
similarity index 100%
rename from src/node/surface_client.js
rename to src/node/src/surface_client.js
diff --git a/src/node/surface_server.js b/src/node/src/surface_server.js
similarity index 100%
rename from src/node/surface_server.js
rename to src/node/src/surface_server.js
diff --git a/src/node/test/client_server_test.js b/src/node/test/client_server_test.js
index 11cc511dc94..d657ef41a46 100644
--- a/src/node/test/client_server_test.js
+++ b/src/node/test/client_server_test.js
@@ -35,9 +35,9 @@ var assert = require('assert');
 var fs = require('fs');
 var path = require('path');
 var grpc = require('bindings')('grpc.node');
-var Server = require('../server');
-var client = require('../client');
-var common = require('../common');
+var Server = require('../src/server');
+var client = require('../src/client');
+var common = require('../src/common');
 var _ = require('highland');
 
 var ca_path = path.join(__dirname, 'data/ca.pem');
diff --git a/src/node/test/server_test.js b/src/node/test/server_test.js
index d0ec1555c6d..5fad9a5564e 100644
--- a/src/node/test/server_test.js
+++ b/src/node/test/server_test.js
@@ -33,7 +33,7 @@
 
 var assert = require('assert');
 var grpc = require('bindings')('grpc.node');
-var Server = require('../server');
+var Server = require('../src/server');
 
 /**
  * This is used for testing functions with multiple asynchronous calls that
diff --git a/src/node/test/surface_test.js b/src/node/test/surface_test.js
index 16e4869d83e..85f4841d4bc 100644
--- a/src/node/test/surface_test.js
+++ b/src/node/test/surface_test.js
@@ -33,9 +33,9 @@
 
 var assert = require('assert');
 
-var surface_server = require('../surface_server.js');
+var surface_server = require('../src/surface_server.js');
 
-var surface_client = require('../surface_client.js');
+var surface_client = require('../src/surface_client.js');
 
 var ProtoBuf = require('protobufjs');