diff --git a/index.js b/index.js
index 5e45e8f5..07b7c209 100644
--- a/index.js
+++ b/index.js
@@ -40,9 +40,9 @@ var Dissemination = require('./lib/dissemination.js');
 var errors = require('./lib/errors.js');
 var getTChannelVersion = require('./lib/util.js').getTChannelVersion;
 var HashRing = require('./lib/ring');
-var Membership = require('./lib/membership.js');
-var MembershipIterator = require('./lib/membership-iterator.js');
-var MembershipUpdateRollup = require('./lib/membership-update-rollup.js');
+var Membership = require('./lib/membership/index.js');
+var MembershipIterator = require('./lib/membership/iterator.js');
+var MembershipUpdateRollup = require('./lib/membership/rollup.js');
 var nulls = require('./lib/nulls');
 var rawHead = require('./lib/request-proxy/util.js').rawHead;
 var RequestProxy = require('./lib/request-proxy/index.js');
diff --git a/lib/membership-set-listener.js b/lib/membership-set-listener.js
index ec3af2a0..36c917a9 100644
--- a/lib/membership-set-listener.js
+++ b/lib/membership-set-listener.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('./member.js');
+var Member = require('./membership/member.js');
 
 module.exports = function createMembershipSetListener(ringpop) {
     return function onMembershipSet(updates) {
diff --git a/lib/membership-update-listener.js b/lib/membership-update-listener.js
index 41ceb00e..ed4c5c9a 100644
--- a/lib/membership-update-listener.js
+++ b/lib/membership-update-listener.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('./member.js');
+var Member = require('./membership/member.js');
 
 module.exports = function createListener(ringpop) {
     return function onMembershipUpdated(updates) {
diff --git a/lib/membership.js b/lib/membership/index.js
similarity index 98%
rename from lib/membership.js
rename to lib/membership/index.js
index 64c8f9e6..9b056aba 100644
--- a/lib/membership.js
+++ b/lib/membership/index.js
@@ -23,8 +23,8 @@ var _ = require('underscore');
 var EventEmitter = require('events').EventEmitter;
 var farmhash = require('farmhash');
 var Member = require('./member.js');
-var MembershipUpdateRules = require('./membership-update-rules.js');
-var mergeMembershipChangesets = require('./membership-changeset-merge.js');
+var MembershipUpdateRules = require('./rules.js');
+var mergeMembershipChangesets = require('./merge.js');
 var util = require('util');
 var uuid = require('node-uuid');
 
diff --git a/lib/membership-iterator.js b/lib/membership/iterator.js
similarity index 99%
rename from lib/membership-iterator.js
rename to lib/membership/iterator.js
index 2dc19ab2..ba456515 100644
--- a/lib/membership-iterator.js
+++ b/lib/membership/iterator.js
@@ -17,7 +17,6 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-
 'use strict';
 
 function MembershipIterator(ring) {
diff --git a/lib/member.js b/lib/membership/member.js
similarity index 100%
rename from lib/member.js
rename to lib/membership/member.js
diff --git a/lib/membership-changeset-merge.js b/lib/membership/merge.js
similarity index 100%
rename from lib/membership-changeset-merge.js
rename to lib/membership/merge.js
diff --git a/lib/membership-update-rollup.js b/lib/membership/rollup.js
similarity index 100%
rename from lib/membership-update-rollup.js
rename to lib/membership/rollup.js
diff --git a/lib/membership-update-rules.js b/lib/membership/rules.js
similarity index 100%
rename from lib/membership-update-rules.js
rename to lib/membership/rules.js
diff --git a/lib/swim/join-response-merge.js b/lib/swim/join-response-merge.js
index d08fb78e..7a0350b8 100644
--- a/lib/swim/join-response-merge.js
+++ b/lib/swim/join-response-merge.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var mergeMembershipChangesets = require('../membership-changeset-merge.js');
+var mergeMembershipChangesets = require('../membership/merge.js');
 
 function hasSameChecksums(joinResponses) {
     var lastChecksum = -1;
diff --git a/test/join-response-merge-test.js b/test/join-response-merge-test.js
index a1405d1c..5076d6b1 100644
--- a/test/join-response-merge-test.js
+++ b/test/join-response-merge-test.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var Member = require('../lib/member.js');
+var Member = require('../lib/membership/member.js');
 var mergeJoinResponses = require('../lib/swim/join-response-merge.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
diff --git a/test/membership-changeset-merge-test.js b/test/membership-changeset-merge-test.js
index af32dbd1..fc5696d8 100644
--- a/test/membership-changeset-merge-test.js
+++ b/test/membership-changeset-merge-test.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var mergeMembershipChangesets = require('../lib/membership-changeset-merge.js');
+var mergeMembershipChangesets = require('../lib/membership/merge.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('merges incarnation numbers', function t(deps, assert) {
diff --git a/test/membership-iterator-test.js b/test/membership-iterator-test.js
index 7505c36a..636be674 100644
--- a/test/membership-iterator-test.js
+++ b/test/membership-iterator-test.js
@@ -17,11 +17,9 @@
 // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
-var MembershipIterator = require('../lib/membership-iterator.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('iterates over two members correctly', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 
@@ -36,7 +34,6 @@ testRingpop('iterates over two members correctly', function t(deps, assert) {
 });
 
 testRingpop('iterates over three members correctly', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 
@@ -53,7 +50,6 @@ testRingpop('iterates over three members correctly', function t(deps, assert) {
 });
 
 testRingpop('skips over faulty member and 1 local member', function t(deps, assert) {
-    var ringpop = deps.ringpop;
     var membership = deps.membership;
     var iterator = deps.iterator;
 
diff --git a/test/membership-test.js b/test/membership-test.js
index 22e0e0a3..5d09e03a 100644
--- a/test/membership-test.js
+++ b/test/membership-test.js
@@ -21,7 +21,7 @@
 'use strict';
 
 // Test dependencies
-var Member = require('../lib/member.js');
+var Member = require('../lib/membership/member.js');
 
 // Test helpers
 var testRingpop = require('./lib/test-ringpop.js');
diff --git a/test/membership-update-rollup-test.js b/test/membership-update-rollup-test.js
index c3d4b845..53d6e1da 100644
--- a/test/membership-update-rollup-test.js
+++ b/test/membership-update-rollup-test.js
@@ -19,7 +19,7 @@
 // THE SOFTWARE.
 'use strict';
 
-var MembershipUpdateRollup = require('../lib/membership-update-rollup.js');
+var MembershipUpdateRollup = require('../lib/membership/rollup.js');
 var Ringpop = require('../index.js');
 var test = require('tape');
 var testRingpop = require('./lib/test-ringpop.js');
diff --git a/test/swim_test.js b/test/swim_test.js
index ee7f33e0..1e04bf26 100644
--- a/test/swim_test.js
+++ b/test/swim_test.js
@@ -18,9 +18,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-var Member = require('../lib/member.js');
-var Ringpop = require('../index.js');
-var test = require('tape');
+var Member = require('../lib/membership/member.js');
 var testRingpop = require('./lib/test-ringpop.js');
 
 testRingpop('starting and stopping gossip sets timer / unsets timers', function t(deps, assert) {