diff --git a/packages/SwingSet/src/controller.js b/packages/SwingSet/src/controller/controller.js
similarity index 100%
rename from packages/SwingSet/src/controller.js
rename to packages/SwingSet/src/controller/controller.js
diff --git a/packages/SwingSet/src/hostStorage.js b/packages/SwingSet/src/controller/hostStorage.js
similarity index 100%
rename from packages/SwingSet/src/hostStorage.js
rename to packages/SwingSet/src/controller/hostStorage.js
diff --git a/packages/SwingSet/src/kernel/initializeKernel.js b/packages/SwingSet/src/controller/initializeKernel.js
similarity index 100%
rename from packages/SwingSet/src/kernel/initializeKernel.js
rename to packages/SwingSet/src/controller/initializeKernel.js
diff --git a/packages/SwingSet/src/initializeSwingset.js b/packages/SwingSet/src/controller/initializeSwingset.js
similarity index 100%
rename from packages/SwingSet/src/initializeSwingset.js
rename to packages/SwingSet/src/controller/initializeSwingset.js
diff --git a/packages/SwingSet/src/devices/bridge.js b/packages/SwingSet/src/devices/bridge/bridge.js
similarity index 100%
rename from packages/SwingSet/src/devices/bridge.js
rename to packages/SwingSet/src/devices/bridge/bridge.js
diff --git a/packages/SwingSet/src/devices/bridge-src.js b/packages/SwingSet/src/devices/bridge/device-bridge.js
similarity index 100%
rename from packages/SwingSet/src/devices/bridge-src.js
rename to packages/SwingSet/src/devices/bridge/device-bridge.js
diff --git a/packages/SwingSet/src/devices/bundle.js b/packages/SwingSet/src/devices/bundle/device-bundle.js
similarity index 100%
rename from packages/SwingSet/src/devices/bundle.js
rename to packages/SwingSet/src/devices/bundle/device-bundle.js
diff --git a/packages/SwingSet/src/devices/command.js b/packages/SwingSet/src/devices/command/command.js
similarity index 100%
rename from packages/SwingSet/src/devices/command.js
rename to packages/SwingSet/src/devices/command/command.js
diff --git a/packages/SwingSet/src/devices/command-src.js b/packages/SwingSet/src/devices/command/device-command.js
similarity index 100%
rename from packages/SwingSet/src/devices/command-src.js
rename to packages/SwingSet/src/devices/command/device-command.js
diff --git a/packages/SwingSet/src/deviceTools.js b/packages/SwingSet/src/devices/lib/deviceTools.js
similarity index 100%
rename from packages/SwingSet/src/deviceTools.js
rename to packages/SwingSet/src/devices/lib/deviceTools.js
diff --git a/packages/SwingSet/src/devices/loopbox-src.js b/packages/SwingSet/src/devices/loopbox/device-loopbox.js
similarity index 100%
rename from packages/SwingSet/src/devices/loopbox-src.js
rename to packages/SwingSet/src/devices/loopbox/device-loopbox.js
diff --git a/packages/SwingSet/src/devices/loopbox.js b/packages/SwingSet/src/devices/loopbox/loopbox.js
similarity index 100%
rename from packages/SwingSet/src/devices/loopbox.js
rename to packages/SwingSet/src/devices/loopbox/loopbox.js
diff --git a/packages/SwingSet/src/devices/mailbox-src.js b/packages/SwingSet/src/devices/mailbox/device-mailbox.js
similarity index 100%
rename from packages/SwingSet/src/devices/mailbox-src.js
rename to packages/SwingSet/src/devices/mailbox/device-mailbox.js
diff --git a/packages/SwingSet/src/devices/mailbox.js b/packages/SwingSet/src/devices/mailbox/mailbox.js
similarity index 100%
rename from packages/SwingSet/src/devices/mailbox.js
rename to packages/SwingSet/src/devices/mailbox/mailbox.js
diff --git a/packages/SwingSet/src/devices/plugin-src.js b/packages/SwingSet/src/devices/plugin/device-plugin.js
similarity index 100%
rename from packages/SwingSet/src/devices/plugin-src.js
rename to packages/SwingSet/src/devices/plugin/device-plugin.js
diff --git a/packages/SwingSet/src/devices/plugin.js b/packages/SwingSet/src/devices/plugin/plugin.js
similarity index 100%
rename from packages/SwingSet/src/devices/plugin.js
rename to packages/SwingSet/src/devices/plugin/plugin.js
diff --git a/packages/SwingSet/src/devices/timer-src.js b/packages/SwingSet/src/devices/timer/device-timer.js
similarity index 100%
rename from packages/SwingSet/src/devices/timer-src.js
rename to packages/SwingSet/src/devices/timer/device-timer.js
diff --git a/packages/SwingSet/src/devices/timer.js b/packages/SwingSet/src/devices/timer/timer.js
similarity index 100%
rename from packages/SwingSet/src/devices/timer.js
rename to packages/SwingSet/src/devices/timer/timer.js
diff --git a/packages/SwingSet/src/kernel/vatAdmin/vatAdmin-src.js b/packages/SwingSet/src/devices/vat-admin/device-vat-admin.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatAdmin/vatAdmin-src.js
rename to packages/SwingSet/src/devices/vat-admin/device-vat-admin.js
diff --git a/packages/SwingSet/src/kernel/vatManager/factory.js b/packages/SwingSet/src/kernel/vat-loader/manager-factory.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/factory.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-factory.js
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-helper.js b/packages/SwingSet/src/kernel/vat-loader/manager-helper.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/manager-helper.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-helper.js
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-local.js b/packages/SwingSet/src/kernel/vat-loader/manager-local.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/manager-local.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-local.js
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-nodeworker.js b/packages/SwingSet/src/kernel/vat-loader/manager-nodeworker.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/manager-nodeworker.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-nodeworker.js
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-node.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/manager-subprocess-node.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-subprocess-node.js
diff --git a/packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js b/packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/manager-subprocess-xsnap.js
rename to packages/SwingSet/src/kernel/vat-loader/manager-subprocess-xsnap.js
diff --git a/packages/SwingSet/src/kernel/vatManager/transcript.js b/packages/SwingSet/src/kernel/vat-loader/transcript.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/transcript.js
rename to packages/SwingSet/src/kernel/vat-loader/transcript.js
diff --git a/packages/SwingSet/src/kernel/vatManager/types.js b/packages/SwingSet/src/kernel/vat-loader/types.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/types.js
rename to packages/SwingSet/src/kernel/vat-loader/types.js
diff --git a/packages/SwingSet/src/kernel/loadVat.js b/packages/SwingSet/src/kernel/vat-loader/vat-loader.js
similarity index 100%
rename from packages/SwingSet/src/kernel/loadVat.js
rename to packages/SwingSet/src/kernel/vat-loader/vat-loader.js
diff --git a/packages/SwingSet/src/kernel/vatManager/vat-warehouse.js b/packages/SwingSet/src/kernel/vat-warehouse.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/vat-warehouse.js
rename to packages/SwingSet/src/kernel/vat-warehouse.js
diff --git a/packages/SwingSet/src/engine-gc.js b/packages/SwingSet/src/lib-nodejs/engine-gc.js
similarity index 100%
rename from packages/SwingSet/src/engine-gc.js
rename to packages/SwingSet/src/lib-nodejs/engine-gc.js
diff --git a/packages/SwingSet/src/gc-and-finalize.js b/packages/SwingSet/src/lib-nodejs/gc-and-finalize.js
similarity index 100%
rename from packages/SwingSet/src/gc-and-finalize.js
rename to packages/SwingSet/src/lib-nodejs/gc-and-finalize.js
diff --git a/packages/SwingSet/src/hasher.js b/packages/SwingSet/src/lib-nodejs/hasher.js
similarity index 100%
rename from packages/SwingSet/src/hasher.js
rename to packages/SwingSet/src/lib-nodejs/hasher.js
diff --git a/packages/SwingSet/src/spawnSubprocessWorker.js b/packages/SwingSet/src/lib-nodejs/spawnSubprocessWorker.js
similarity index 100%
rename from packages/SwingSet/src/spawnSubprocessWorker.js
rename to packages/SwingSet/src/lib-nodejs/spawnSubprocessWorker.js
diff --git a/packages/SwingSet/src/validate-archive.js b/packages/SwingSet/src/lib-nodejs/validate-archive.js
similarity index 100%
rename from packages/SwingSet/src/validate-archive.js
rename to packages/SwingSet/src/lib-nodejs/validate-archive.js
diff --git a/packages/SwingSet/src/waitUntilQuiescent.js b/packages/SwingSet/src/lib-nodejs/waitUntilQuiescent.js
similarity index 100%
rename from packages/SwingSet/src/waitUntilQuiescent.js
rename to packages/SwingSet/src/lib-nodejs/waitUntilQuiescent.js
diff --git a/packages/SwingSet/src/worker-protocol.js b/packages/SwingSet/src/lib-nodejs/worker-protocol.js
similarity index 100%
rename from packages/SwingSet/src/worker-protocol.js
rename to packages/SwingSet/src/lib-nodejs/worker-protocol.js
diff --git a/packages/SwingSet/src/assertOptions.js b/packages/SwingSet/src/lib/assertOptions.js
similarity index 100%
rename from packages/SwingSet/src/assertOptions.js
rename to packages/SwingSet/src/lib/assertOptions.js
diff --git a/packages/SwingSet/src/capdata.js b/packages/SwingSet/src/lib/capdata.js
similarity index 100%
rename from packages/SwingSet/src/capdata.js
rename to packages/SwingSet/src/lib/capdata.js
diff --git a/packages/SwingSet/src/kernel/djson.js b/packages/SwingSet/src/lib/djson.js
similarity index 100%
rename from packages/SwingSet/src/kernel/djson.js
rename to packages/SwingSet/src/lib/djson.js
diff --git a/packages/SwingSet/src/kernel/id.js b/packages/SwingSet/src/lib/id.js
similarity index 100%
rename from packages/SwingSet/src/kernel/id.js
rename to packages/SwingSet/src/lib/id.js
diff --git a/packages/SwingSet/src/kernel/kdebug.js b/packages/SwingSet/src/lib/kdebug.js
similarity index 100%
rename from packages/SwingSet/src/kernel/kdebug.js
rename to packages/SwingSet/src/lib/kdebug.js
diff --git a/packages/SwingSet/src/makeUndeliverableError.js b/packages/SwingSet/src/lib/makeUndeliverableError.js
similarity index 100%
rename from packages/SwingSet/src/makeUndeliverableError.js
rename to packages/SwingSet/src/lib/makeUndeliverableError.js
diff --git a/packages/SwingSet/src/message.js b/packages/SwingSet/src/lib/message.js
similarity index 100%
rename from packages/SwingSet/src/message.js
rename to packages/SwingSet/src/lib/message.js
diff --git a/packages/SwingSet/src/netstring.js b/packages/SwingSet/src/lib/netstring.js
similarity index 100%
rename from packages/SwingSet/src/netstring.js
rename to packages/SwingSet/src/lib/netstring.js
diff --git a/packages/SwingSet/src/parseVatSlots.js b/packages/SwingSet/src/lib/parseVatSlots.js
similarity index 100%
rename from packages/SwingSet/src/parseVatSlots.js
rename to packages/SwingSet/src/lib/parseVatSlots.js
diff --git a/packages/SwingSet/src/runPolicies.js b/packages/SwingSet/src/lib/runPolicies.js
similarity index 100%
rename from packages/SwingSet/src/runPolicies.js
rename to packages/SwingSet/src/lib/runPolicies.js
diff --git a/packages/SwingSet/src/storageAPI.js b/packages/SwingSet/src/lib/storageAPI.js
similarity index 100%
rename from packages/SwingSet/src/storageAPI.js
rename to packages/SwingSet/src/lib/storageAPI.js
diff --git a/packages/SwingSet/src/kernel/collectionManager.js b/packages/SwingSet/src/liveslots/collectionManager.js
similarity index 100%
rename from packages/SwingSet/src/kernel/collectionManager.js
rename to packages/SwingSet/src/liveslots/collectionManager.js
diff --git a/packages/SwingSet/src/kernel/liveSlots.js b/packages/SwingSet/src/liveslots/liveslots.js
similarity index 100%
rename from packages/SwingSet/src/kernel/liveSlots.js
rename to packages/SwingSet/src/liveslots/liveslots.js
diff --git a/packages/SwingSet/src/kernel/virtualObjectManager.js b/packages/SwingSet/src/liveslots/virtualObjectManager.js
similarity index 100%
rename from packages/SwingSet/src/kernel/virtualObjectManager.js
rename to packages/SwingSet/src/liveslots/virtualObjectManager.js
diff --git a/packages/SwingSet/src/kernel/virtualReferences.js b/packages/SwingSet/src/liveslots/virtualReferences.js
similarity index 100%
rename from packages/SwingSet/src/kernel/virtualReferences.js
rename to packages/SwingSet/src/liveslots/virtualReferences.js
diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-nodeworker.js b/packages/SwingSet/src/supervisors/nodeworker/supervisor-nodeworker.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/supervisor-nodeworker.js
rename to packages/SwingSet/src/supervisors/nodeworker/supervisor-nodeworker.js
diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-node.js b/packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-node.js
rename to packages/SwingSet/src/supervisors/subprocess-node/supervisor-subprocess-node.js
diff --git a/packages/SwingSet/src/kernel/vatManager/lockdown-subprocess-xsnap.js b/packages/SwingSet/src/supervisors/subprocess-xsnap/lockdown-subprocess-xsnap.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/lockdown-subprocess-xsnap.js
rename to packages/SwingSet/src/supervisors/subprocess-xsnap/lockdown-subprocess-xsnap.js
diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js b/packages/SwingSet/src/supervisors/subprocess-xsnap/supervisor-subprocess-xsnap.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/supervisor-subprocess-xsnap.js
rename to packages/SwingSet/src/supervisors/subprocess-xsnap/supervisor-subprocess-xsnap.js
diff --git a/packages/SwingSet/src/kernel/vatManager/supervisor-helper.js b/packages/SwingSet/src/supervisors/supervisor-helper.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatManager/supervisor-helper.js
rename to packages/SwingSet/src/supervisors/supervisor-helper.js
diff --git a/packages/SwingSet/src/vats/timed-iteration.js b/packages/SwingSet/src/vats/timer/timed-iteration.js
similarity index 100%
rename from packages/SwingSet/src/vats/timed-iteration.js
rename to packages/SwingSet/src/vats/timer/timed-iteration.js
diff --git a/packages/SwingSet/src/vats/types.js b/packages/SwingSet/src/vats/timer/types.js
similarity index 100%
rename from packages/SwingSet/src/vats/types.js
rename to packages/SwingSet/src/vats/timer/types.js
diff --git a/packages/SwingSet/src/vats/vat-timerWrapper.js b/packages/SwingSet/src/vats/timer/vat-timer.js
similarity index 100%
rename from packages/SwingSet/src/vats/vat-timerWrapper.js
rename to packages/SwingSet/src/vats/timer/vat-timer.js
diff --git a/packages/SwingSet/src/kernel/vatAdmin/vatAdminWrapper.js b/packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js
similarity index 100%
rename from packages/SwingSet/src/kernel/vatAdmin/vatAdminWrapper.js
rename to packages/SwingSet/src/vats/vat-admin/vat-vat-admin.js
diff --git a/packages/SwingSet/src/vats/vat-tp.js b/packages/SwingSet/src/vats/vattp/vat-vattp.js
similarity index 100%
rename from packages/SwingSet/src/vats/vat-tp.js
rename to packages/SwingSet/src/vats/vattp/vat-vattp.js