diff --git a/packages/ddp-client/client.js b/packages/ddp-client/client/client.js
similarity index 50%
rename from packages/ddp-client/client.js
rename to packages/ddp-client/client/client.js
index e08adfcd11..d138503233 100644
--- a/packages/ddp-client/client.js
+++ b/packages/ddp-client/client/client.js
@@ -1,8 +1,7 @@
-import { DDP, LivedataTest } from './namespace';
-
+import { DDP, LivedataTest } from '../common/namespace';
 import './stream_client_sockjs';
 
-import './livedata_connection';
+import '../common/livedata_connection';
 
 import './client_convenience';
 
diff --git a/packages/ddp-client/client_convenience.js b/packages/ddp-client/client/client_convenience.js
similarity index 98%
rename from packages/ddp-client/client_convenience.js
rename to packages/ddp-client/client/client_convenience.js
index ece26a963f..62823bddbe 100644
--- a/packages/ddp-client/client_convenience.js
+++ b/packages/ddp-client/client/client_convenience.js
@@ -1,4 +1,4 @@
-import { DDP } from "./namespace.js";
+import { DDP } from "../common/namespace.js";
 
 // Meteor.refresh can be called on the client (if you're in common code) but it
 // only has an effect on the server.
diff --git a/packages/ddp-client/sockjs-0.3.4.js b/packages/ddp-client/client/sockjs-0.3.4.js
similarity index 100%
rename from packages/ddp-client/sockjs-0.3.4.js
rename to packages/ddp-client/client/sockjs-0.3.4.js
diff --git a/packages/ddp-client/stream_client_sockjs.js b/packages/ddp-client/client/stream_client_sockjs.js
similarity index 97%
rename from packages/ddp-client/stream_client_sockjs.js
rename to packages/ddp-client/client/stream_client_sockjs.js
index 036f5381fd..b2154a5d13 100644
--- a/packages/ddp-client/stream_client_sockjs.js
+++ b/packages/ddp-client/client/stream_client_sockjs.js
@@ -1,12 +1,12 @@
-import { DDP, LivedataTest } from "./namespace.js";
 import { _ } from 'meteor/underscore';
 import { Meteor } from 'meteor/meteor';
-import { toSockjsUrl } from './urlHelpers';
 
 // This populates a global variable
 import './sockjs-0.3.4';
 
-import { addCommonMethodsToPrototype } from './stream_client_common';
+import { DDP, LivedataTest } from "../common/namespace.js";
+import { toSockjsUrl } from '../common/urlHelpers';
+import { addCommonMethodsToPrototype } from '../common/stream_client_common';
 
 // @param url {String} URL to Meteor app
 //   "http://subdomain.meteor.com/" or "/" or
diff --git a/packages/ddp-client/id_map.js b/packages/ddp-client/common/id_map.js
similarity index 100%
rename from packages/ddp-client/id_map.js
rename to packages/ddp-client/common/id_map.js
diff --git a/packages/ddp-client/livedata_connection.js b/packages/ddp-client/common/livedata_connection.js
similarity index 99%
rename from packages/ddp-client/livedata_connection.js
rename to packages/ddp-client/common/livedata_connection.js
index 8874bd3523..e948ebe85c 100644
--- a/packages/ddp-client/livedata_connection.js
+++ b/packages/ddp-client/common/livedata_connection.js
@@ -1,5 +1,3 @@
-import { DDP, LivedataTest } from "./namespace.js";
-import { MongoIDMap } from "./id_map.js";
 import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { DDPCommon } from 'meteor/ddp-common';
@@ -13,6 +11,9 @@ if (Meteor.isServer) {
   var Future = Npm.require('fibers/future');
 }
 
+import { DDP, LivedataTest } from "./namespace.js";
+import { MongoIDMap } from "./id_map.js";
+
 // @param url {String|Object} URL to Meteor app,
 //   or an object as a test hook (see code)
 // Options:
diff --git a/packages/ddp-client/namespace.js b/packages/ddp-client/common/namespace.js
similarity index 100%
rename from packages/ddp-client/namespace.js
rename to packages/ddp-client/common/namespace.js
diff --git a/packages/ddp-client/stream_client_common.js b/packages/ddp-client/common/stream_client_common.js
similarity index 99%
rename from packages/ddp-client/stream_client_common.js
rename to packages/ddp-client/common/stream_client_common.js
index c9a0416bab..3c68bd9aa3 100644
--- a/packages/ddp-client/stream_client_common.js
+++ b/packages/ddp-client/common/stream_client_common.js
@@ -1,10 +1,11 @@
-import { DDP, LivedataTest } from "./namespace.js";
 import { Random } from 'meteor/random';
 import { Meteor } from 'meteor/meteor';
 import { _ } from 'meteor/underscore';
 import { Tracker } from 'meteor/tracker';
 import { Retry } from 'meteor/retry';
 
+import { DDP, LivedataTest } from "./namespace.js";
+
 export function addCommonMethodsToPrototype(proto) {
   _.extend(proto, {
     // Register for callbacks.
diff --git a/packages/ddp-client/urlHelpers.js b/packages/ddp-client/common/urlHelpers.js
similarity index 100%
rename from packages/ddp-client/urlHelpers.js
rename to packages/ddp-client/common/urlHelpers.js
diff --git a/packages/ddp-client/package.js b/packages/ddp-client/package.js
index 8327a87bd3..8d03a5609e 100644
--- a/packages/ddp-client/package.js
+++ b/packages/ddp-client/package.js
@@ -29,8 +29,8 @@ Package.onUse(function (api) {
 
   // For backcompat where things use Package.ddp.DDP, etc
   api.export('DDP');
-  api.mainModule("client.js", "client");
-  api.mainModule("server.js", "server");
+  api.mainModule("client/client.js", "client");
+  api.mainModule("server/server.js", "server");
 });
 
 Package.onTest(function (api) {
@@ -49,14 +49,14 @@ Package.onTest(function (api) {
     'ejson'
   ]);
 
-  api.addFiles('stub_stream.js');
-  api.addFiles('livedata_connection_tests.js', ['client', 'server']);
-  api.addFiles('livedata_tests.js', ['client', 'server']);
-  api.addFiles('livedata_test_service.js', ['client', 'server']);
-  api.addFiles('random_stream_tests.js', ['client', 'server']);
+  api.addFiles('test/stub_stream.js');
+  api.addFiles('test/livedata_connection_tests.js', ['client', 'server']);
+  api.addFiles('test/livedata_tests.js', ['client', 'server']);
+  api.addFiles('test/livedata_test_service.js', ['client', 'server']);
+  api.addFiles('test/random_stream_tests.js', ['client', 'server']);
 
   api.use('http', 'client');
-  api.addFiles(['stream_tests.js'], 'client');
-  api.addFiles('stream_client_tests.js', 'server');
+  api.addFiles('test/stream_tests.js', 'client');
+  api.addFiles('test/stream_client_tests.js', 'server');
   api.use('check', ['client', 'server']);
 });
diff --git a/packages/ddp-client/server.js b/packages/ddp-client/server.js
deleted file mode 100644
index eac4c408e0..0000000000
--- a/packages/ddp-client/server.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import { DDP, LivedataTest } from './namespace';
-
-import './stream_client_nodejs';
-
-import './livedata_connection';
-
-export { DDP, LivedataTest };
diff --git a/packages/ddp-client/server/server.js b/packages/ddp-client/server/server.js
new file mode 100644
index 0000000000..6239d2e55e
--- /dev/null
+++ b/packages/ddp-client/server/server.js
@@ -0,0 +1,7 @@
+import { DDP, LivedataTest } from '../common/namespace';
+
+import './stream_client_nodejs';
+
+import '../common/livedata_connection';
+
+export { DDP, LivedataTest };
diff --git a/packages/ddp-client/stream_client_nodejs.js b/packages/ddp-client/server/stream_client_nodejs.js
similarity index 97%
rename from packages/ddp-client/stream_client_nodejs.js
rename to packages/ddp-client/server/stream_client_nodejs.js
index cc9220a63c..999da1c8bb 100644
--- a/packages/ddp-client/stream_client_nodejs.js
+++ b/packages/ddp-client/server/stream_client_nodejs.js
@@ -1,9 +1,9 @@
-import { DDP, LivedataTest } from "./namespace";
 import { _ } from 'meteor/underscore';
-import { toWebsocketUrl } from './urlHelpers';
 import { Meteor } from 'meteor/meteor';
 
-import { addCommonMethodsToPrototype } from './stream_client_common';
+import { DDP, LivedataTest } from "../common/namespace";
+import { toWebsocketUrl } from '../common/urlHelpers';
+import { addCommonMethodsToPrototype } from '../common/stream_client_common';
 
 // @param endpoint {String} URL to Meteor app
 //   "http://subdomain.meteor.com/" or "/" or
diff --git a/packages/ddp-client/livedata_connection_tests.js b/packages/ddp-client/test/livedata_connection_tests.js
similarity index 99%
rename from packages/ddp-client/livedata_connection_tests.js
rename to packages/ddp-client/test/livedata_connection_tests.js
index 4b7c71e45e..4f23650931 100644
--- a/packages/ddp-client/livedata_connection_tests.js
+++ b/packages/ddp-client/test/livedata_connection_tests.js
@@ -1,5 +1,5 @@
 import lolex from 'lolex';
-import { DDP, LivedataTest } from "./namespace.js";
+import { DDP, LivedataTest } from "../common/namespace.js";
 
 var newConnection = function (stream, options) {
   // Some of these tests leave outstanding methods with no result yet
diff --git a/packages/ddp-client/livedata_test_service.js b/packages/ddp-client/test/livedata_test_service.js
similarity index 100%
rename from packages/ddp-client/livedata_test_service.js
rename to packages/ddp-client/test/livedata_test_service.js
diff --git a/packages/ddp-client/livedata_tests.js b/packages/ddp-client/test/livedata_tests.js
similarity index 99%
rename from packages/ddp-client/livedata_tests.js
rename to packages/ddp-client/test/livedata_tests.js
index a7befa817e..403bab7840 100644
--- a/packages/ddp-client/livedata_tests.js
+++ b/packages/ddp-client/test/livedata_tests.js
@@ -1,4 +1,4 @@
-import { DDP, LivedataTest } from "./namespace.js";
+import { DDP, LivedataTest } from "../common/namespace.js";
 
 // XXX should check error codes
 var failure = function (test, code, reason) {
diff --git a/packages/ddp-client/random_stream_tests.js b/packages/ddp-client/test/random_stream_tests.js
similarity index 100%
rename from packages/ddp-client/random_stream_tests.js
rename to packages/ddp-client/test/random_stream_tests.js
diff --git a/packages/ddp-client/stream_client_tests.js b/packages/ddp-client/test/stream_client_tests.js
similarity index 91%
rename from packages/ddp-client/stream_client_tests.js
rename to packages/ddp-client/test/stream_client_tests.js
index 24a184f1d3..e9a6545606 100644
--- a/packages/ddp-client/stream_client_tests.js
+++ b/packages/ddp-client/test/stream_client_tests.js
@@ -1,4 +1,4 @@
-import { LivedataTest } from "./namespace.js";
+import { LivedataTest } from "../common/namespace.js";
 
 var Fiber = Npm.require('fibers');
 
diff --git a/packages/ddp-client/stream_tests.js b/packages/ddp-client/test/stream_tests.js
similarity index 99%
rename from packages/ddp-client/stream_tests.js
rename to packages/ddp-client/test/stream_tests.js
index 8afc63e85a..88c8f672a1 100644
--- a/packages/ddp-client/stream_tests.js
+++ b/packages/ddp-client/test/stream_tests.js
@@ -1,4 +1,4 @@
-import { LivedataTest } from "./namespace.js";
+import { LivedataTest } from "../common/namespace.js";
 
 Tinytest.add("stream - status", function (test) {
   // Very basic test. Just see that it runs and returns something. Not a
diff --git a/packages/ddp-client/stub_stream.js b/packages/ddp-client/test/stub_stream.js
similarity index 100%
rename from packages/ddp-client/stub_stream.js
rename to packages/ddp-client/test/stub_stream.js