diff --git a/.eslintignore b/.eslintignore
--- a/.eslintignore
+++ b/.eslintignore
@@ -6,17 +6,17 @@
 web/dist
 web/flow-typed
 web/node_modules
-server/app_compiled
-server/landing_compiled
-server/dist
-server/secrets
-server/facts
-server/fonts
-server/flow-typed
-server/node_modules
-server/src/landing
-server/src/lib
-server/src/web
+keyserver/app_compiled
+keyserver/landing_compiled
+keyserver/dist
+keyserver/secrets
+keyserver/facts
+keyserver/fonts
+keyserver/flow-typed
+keyserver/node_modules
+keyserver/src/landing
+keyserver/src/lib
+keyserver/src/web
 native/flow-typed
 native/node_modules
 native/codegen/dist
diff --git a/.eslintrc.json b/.eslintrc.json
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -51,6 +51,6 @@
       "version": "detect"
     },
     "import/ignore": ["react-native"],
-    "import/internal-regex": "^(lib|native|server|web)/"
+    "import/internal-regex": "^(lib|native|keyserver|web)/"
   }
 }
diff --git a/.github/workflows/android_ci.yml b/.github/workflows/android_ci.yml
--- a/.github/workflows/android_ci.yml
+++ b/.github/workflows/android_ci.yml
@@ -7,7 +7,7 @@
       - 'landing/**'
       - 'web/**'
       - 'docs/**'
-      - 'server/**'
+      - 'keyserver/**'
 
 jobs:
   build:
diff --git a/.github/workflows/eslint_flow_jest.yml b/.github/workflows/eslint_flow_jest.yml
--- a/.github/workflows/eslint_flow_jest.yml
+++ b/.github/workflows/eslint_flow_jest.yml
@@ -23,8 +23,8 @@
         working-directory: ./lib
         run: ./node_modules/.bin/flow
 
-      - name: '[server] flow'
-        working-directory: ./server
+      - name: '[keyserver] flow'
+        working-directory: ./keyserver
         run: |
           mkdir secrets
           touch secrets/db_config.json
diff --git a/.github/workflows/ios_ci.yml b/.github/workflows/ios_ci.yml
--- a/.github/workflows/ios_ci.yml
+++ b/.github/workflows/ios_ci.yml
@@ -7,7 +7,7 @@
       - 'landing/**'
       - 'web/**'
       - 'docs/**'
-      - 'server/**'
+      - 'keyserver/**'
 
 jobs:
   build:
diff --git a/.github/workflows/services_ci.yml b/.github/workflows/services_ci.yml
--- a/.github/workflows/services_ci.yml
+++ b/.github/workflows/services_ci.yml
@@ -7,7 +7,7 @@
       - 'landing/**'
       - 'web/**'
       - 'docs/**'
-      - 'server/**'
+      - 'keyserver/**'
 
 jobs:
   build:
diff --git a/.gitignore b/.gitignore
--- a/.gitignore
+++ b/.gitignore
@@ -6,10 +6,10 @@
 native/cpp/CommonCpp/CryptoTools/opaque-ke-cxx/target
 web/node_modules
 web/dist
-server/dist
-server/node_modules
-server/secrets
-server/facts
+keyserver/dist
+keyserver/node_modules
+keyserver/secrets
+keyserver/facts
 services/identity/target
 .eslintcache
 .vscode
diff --git a/.lintstagedrc.js b/.lintstagedrc.js
--- a/.lintstagedrc.js
+++ b/.lintstagedrc.js
@@ -22,8 +22,8 @@
   '{native,lib}/**/*.js': function nativeFlow(files) {
     return 'yarn workspace native flow --quiet';
   },
-  '{server,web,lib}/**/*.js': function serverFlow(files) {
-    return 'yarn workspace server flow --quiet';
+  '{keyserver,web,lib}/**/*.js': function keyServerFlow(files) {
+    return 'yarn workspace keyserver flow --quiet';
   },
   '{landing,lib}/**/*.js': function landingFlow(files) {
     return 'yarn workspace landing flow --quiet';
diff --git a/.prettierignore b/.prettierignore
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,17 +3,17 @@
 lib/flow-typed
 web/dist
 web/flow-typed
-server/app_compiled
-server/landing_compiled
-server/dist
-server/secrets
-server/facts
-server/images
-server/fonts
-server/flow-typed
-server/src/landing
-server/src/lib
-server/src/web
+keyserver/app_compiled
+keyserver/landing_compiled
+keyserver/dist
+keyserver/secrets
+keyserver/facts
+keyserver/images
+keyserver/fonts
+keyserver/flow-typed
+keyserver/src/landing
+keyserver/src/lib
+keyserver/src/web
 native/android
 native/flow-typed
 native/ios
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 The whole project is written in Flow-typed Javascript. The code is organized in a monorepo structure using Yarn Workspaces.
 
 - `native` contains the code for the React Native app, which supports both iOS and Android.
-- `server` contains the code for the Node/Express server.
+- `keyserver` contains the code for the Node/Express server.
 - `web` contains the code for the React desktop website.
 - `landing` contains the code for the [Comm landing page](https://comm.app).
 - `lib` contains code that is shared across multiple other workspaces, including most of the Redux stack that is shared across native/web.
diff --git a/docs/dev_environment.md b/docs/dev_environment.md
--- a/docs/dev_environment.md
+++ b/docs/dev_environment.md
@@ -9,7 +9,7 @@
 Why not Windows? (click to expand)
 </summary>
 <p>
-It’s primarily because Apple only supports iOS development using macOS. It’s true that we could support web, server, and Android development on other operating systems, but because of the Apple requirement, all of our active developers currently run macOS. We’d very much welcome a PR to build out support on Windows!
+It’s primarily because Apple only supports iOS development using macOS. It’s true that we could support web, keyserver, and Android development on other operating systems, but because of the Apple requirement, all of our active developers currently run macOS. We’d very much welcome a PR to build out support on Windows!
 </p>
 </details>
 
@@ -77,7 +77,7 @@
 
 ## Node Version Manager
 
-Node Version Manager (nvm) is a tool that ensures we use the same version of Node on our server between prod and dev environments.
+Node Version Manager (nvm) is a tool that ensures we use the same version of Node on our keyserver between prod and dev environments.
 
 ```
 brew install nvm; brew upgrade nvm
@@ -126,7 +126,7 @@
 
 ## Redis
 
-We use Redis on the server side as a message broker.
+We use Redis on the keyserver side as a message broker.
 
 ```
 brew install redis; brew upgrade redis
@@ -471,11 +471,11 @@
 
 ## URLs
 
-The server needs to know some info about paths in order to properly construct URLs.
+The keyserver needs to know some info about paths in order to properly construct URLs.
 
 ```
-mkdir -p server/facts
-vim server/facts/url.json
+mkdir -p keyserver/facts
+vim keyserver/facts/url.json
 ```
 
 Your `url.json` file should look like this:
@@ -489,7 +489,7 @@
 Next, we’ll create files for constructing URLs for the main app.
 
 ```
-vim server/facts/squadcal_url.json
+vim keyserver/facts/squadcal_url.json
 ```
 
 Your `squadcal_url.json` file should look like this:
@@ -512,7 +512,7 @@
 Finally, we’ll create a file for the URLs in the landing page.
 
 ```
-vim server/facts/landing_url.json
+vim keyserver/facts/landing_url.json
 ```
 
 Your `landing_url.json` file should look like this:
@@ -528,10 +528,10 @@
 
 ## MySQL
 
-The server side needs to see some config files before things can work. The first is a config file with MySQL details.
+The keyserver side needs to see some config files before things can work. The first is a config file with MySQL details.
 
 ```
-cd server
+cd keyserver
 mkdir secrets
 vim secrets/db_config.json
 ```
@@ -562,11 +562,11 @@
 The second config file contains some details that the keyserver needs in order to launch Olm sessions to provide E2E encryption.
 
 ```
-cd server
+cd keyserver
 yarn script dist/scripts/generate-olm-config.json
 ```
 
-This script will create the `server/secrets/olm_config.json` config file.
+This script will create the `keyserver/secrets/olm_config.json` config file.
 
 ## Phabricator
 
@@ -627,12 +627,12 @@
 
 This runs the same two processes as the web app, but for the landing page. Note that the `landing.build.cjs` file (similar to the web app’s `app.build.cjs` file) is consumed by the Node server.
 
-## Running server
+## Running keyserver
 
 Open a new terminal and run:
 
 ```
-cd server
+cd keyserver
 yarn dev
 ```
 
@@ -640,7 +640,7 @@
 
 This command runs three processes. The first two are to keep the `dist` folder updated whenever the `src` folder changes. They are “watch” versions of the same Babel and `rsync` commands we used to initially create the `dist` folder (before running the `create-db.js` script above). The final process is `nodemon`, which is similar to `node` except that it restarts whenever any of its source files (in the `dist` directory) changes.
 
-Note that if you run `yarn dev` in `server` right after `yarn cleaninstall`, before Webpack is given a chance to build `app.build.cjs`/`landing.build.cjs` files, then Node will crash when it attempts to import those files. Just make sure to run `yarn dev` (or `yarn prod`) in `web` or `landing` before attempting to load the corresponding webpages.
+Note that if you run `yarn dev` in `keyserver` right after `yarn cleaninstall`, before Webpack is given a chance to build `app.build.cjs`/`landing.build.cjs` files, then Node will crash when it attempts to import those files. Just make sure to run `yarn dev` (or `yarn prod`) in `web` or `landing` before attempting to load the corresponding webpages.
 
 ## Running mobile app on iOS Simulator
 
@@ -720,15 +720,15 @@
 
 You should finally be ready to build and deploy the app in Xcode! Select your physical device from ”run destinations” in the Workspace Toolbar. Then hit the Run button to build and run the project.
 
-If you’re connecting to a local server instance, you’ll want to “Allow Comm to Access” the “Local Network” in your device Settings. This toggle can be found from Settings → Comm. Note that this setting is not enabled by default, and you may have to re-enable it on subsequent build deployments.
+If you’re connecting to a local keyserver instance, you’ll want to “Allow Comm to Access” the “Local Network” in your device Settings. This toggle can be found from Settings → Comm. Note that this setting is not enabled by default, and you may have to re-enable it on subsequent build deployments.
 
-### Connecting to local server
+### Connecting to local keyserver
 
-If you want your custom build of the app to connect to your local instance of the Node.js server (the `server` subdirectory of the repo), you’ll need to do some additional work. First, confirm that your computer and physical iOS device are on the same network. If you’re running a local server instance, you’ll need to be able to reach it with your device. Local servers run on the local IP address at port 8043.
+If you want your custom build of the app to connect to your local instance of the Node.js server (the `keyserver` subdirectory of the repo), you’ll need to do some additional work. First, confirm that your computer and physical iOS device are on the same network. If you’re running a local keyserver instance, you’ll need to be able to reach it with your device. Local keyservers run on the local IP address at port 8043.
 
 To find your machine’s local IP address, navigate to System Preferences → Network, and select the hardware interface you’re currently using to connect to the internet (Wi-Fi, or potentially a Thunderbolt port for ethernet connections). Next, click “Advanced” and go to the “TCP/IP” tab. Your local IP address is listed as the “IPv4 Address”. Try visiting this IP address using a browser on your device. It should display an “It works!” message if your iOS device can reach your machine.
 
-Finally, we need to direct the mobile app to use your local server instance. There are a few different ways to do this, depending on your situation:
+Finally, we need to direct the mobile app to use your local keyserver instance. There are a few different ways to do this, depending on your situation:
 
 - As long as you’re deploying a debug build, this strategy should work for you. You can create a `network.json` file in `native/facts` that will override the default.
 
@@ -763,14 +763,14 @@
 
 ## Running Node scripts
 
-To run one of the scripts in `server/src/scripts`, you should start by making sure that the Node server is running. If you haven’t already, open a new terminal and run:
+To run one of the scripts in `keyserver/src/scripts`, you should start by making sure that the Node server is running. If you haven’t already, open a new terminal and run:
 
 ```
 cd native
 yarn dev
 ```
 
-Then, from the `server` directory, run `yarn script dist/scripts/name.js`, where `name.js` is the file containing the script.
+Then, from the `keyserver` directory, run `yarn script dist/scripts/name.js`, where `name.js` is the file containing the script.
 
 ## Codegen
 
@@ -858,7 +858,7 @@
 
 ## Final notes
 
-When developing, I usually just pop up three terminal windows, one for `yarn dev` in each of server, web, and native.
+When developing, I usually just pop up three terminal windows, one for `yarn dev` in each of keyserver, web, and native.
 
 Note that it’s currently only possible to create a user account using the iOS or Android apps. The website supports logging in, but does not support account creation.
 
diff --git a/server/.eslintrc.json b/keyserver/.eslintrc.json
rename from server/.eslintrc.json
rename to keyserver/.eslintrc.json
diff --git a/server/.flowconfig b/keyserver/.flowconfig
rename from server/.flowconfig
rename to keyserver/.flowconfig
diff --git a/server/.npmrc b/keyserver/.npmrc
rename from server/.npmrc
rename to keyserver/.npmrc
diff --git a/server/.nvmrc b/keyserver/.nvmrc
rename from server/.nvmrc
rename to keyserver/.nvmrc
diff --git a/server/.well-known/apple-app-site-association b/keyserver/.well-known/apple-app-site-association
rename from server/.well-known/apple-app-site-association
rename to keyserver/.well-known/apple-app-site-association
diff --git a/server/.well-known/assetlinks.json b/keyserver/.well-known/assetlinks.json
rename from server/.well-known/assetlinks.json
rename to keyserver/.well-known/assetlinks.json
diff --git a/server/app_compiled b/keyserver/app_compiled
rename from server/app_compiled
rename to keyserver/app_compiled
diff --git a/server/babel.config.cjs b/keyserver/babel.config.cjs
rename from server/babel.config.cjs
rename to keyserver/babel.config.cjs
diff --git a/server/bash/backup_phabricator.sh b/keyserver/bash/backup_phabricator.sh
rename from server/bash/backup_phabricator.sh
rename to keyserver/bash/backup_phabricator.sh
diff --git a/server/bash/deploy.sh b/keyserver/bash/deploy.sh
rename from server/bash/deploy.sh
rename to keyserver/bash/deploy.sh
--- a/server/bash/deploy.sh
+++ b/keyserver/bash/deploy.sh
@@ -24,14 +24,14 @@
 mkdir -p "$CHECKOUT_PATH"
 chown $DAEMON_USER:$DAEMON_USER "$CHECKOUT_PATH"
 su $DAEMON_USER -c "git clone $GIT_CLONE_PARAMS '$CHECKOUT_PATH'"
-su $DAEMON_USER -c "cp -r '$1'/server/secrets '$CHECKOUT_PATH'/server/secrets"
-su $DAEMON_USER -c "cp -r '$1'/server/facts '$CHECKOUT_PATH'/server/facts"
+su $DAEMON_USER -c "cp -r '$1'/keyserver/secrets '$CHECKOUT_PATH'/keyserver/secrets"
+su $DAEMON_USER -c "cp -r '$1'/keyserver/facts '$CHECKOUT_PATH'/keyserver/facts"
 cd "$CHECKOUT_PATH"
-su $DAEMON_USER -c "server/bash/setup.sh"
+su $DAEMON_USER -c "keyserver/bash/setup.sh"
 
 # STEP 2: test if the binary crashes within 60 seconds
 set +e
-su $DAEMON_USER -c "cd server && PORT=3001 timeout 60 bash/run-prod.sh"
+su $DAEMON_USER -c "cd keyserver && PORT=3001 timeout 60 bash/run-prod.sh"
 [[ $? -eq 124 ]] || exit 1
 set -e
 
diff --git a/server/bash/run-prod.sh b/keyserver/bash/run-prod.sh
rename from server/bash/run-prod.sh
rename to keyserver/bash/run-prod.sh
diff --git a/server/bash/setup.sh b/keyserver/bash/setup.sh
rename from server/bash/setup.sh
rename to keyserver/bash/setup.sh
--- a/server/bash/setup.sh
+++ b/keyserver/bash/setup.sh
@@ -8,10 +8,10 @@
 . ~/.nvm/nvm.sh
 
 chmod -R u=rwX,g=rX,o=rX .
-chmod -R u=rwX,g=,o= server/secrets
+chmod -R u=rwX,g=,o= keyserver/secrets
 
 pushd server && nvm install && popd
 yarn cleaninstall
 yarn workspace web prod
 yarn workspace landing prod
-yarn workspace server prod-build
+yarn workspace keyserver prod-build
diff --git a/server/bash/source-nvm.sh b/keyserver/bash/source-nvm.sh
rename from server/bash/source-nvm.sh
rename to keyserver/bash/source-nvm.sh
diff --git a/server/flow-typed/npm/@parse/node-apn_vx.x.x.js b/keyserver/flow-typed/npm/@parse/node-apn_vx.x.x.js
rename from server/flow-typed/npm/@parse/node-apn_vx.x.x.js
rename to keyserver/flow-typed/npm/@parse/node-apn_vx.x.x.js
diff --git a/server/flow-typed/npm/body-parser_v1.x.x.js b/keyserver/flow-typed/npm/body-parser_v1.x.x.js
rename from server/flow-typed/npm/body-parser_v1.x.x.js
rename to keyserver/flow-typed/npm/body-parser_v1.x.x.js
diff --git a/server/flow-typed/npm/buffer-image-size_vx.x.x.js b/keyserver/flow-typed/npm/buffer-image-size_vx.x.x.js
rename from server/flow-typed/npm/buffer-image-size_vx.x.x.js
rename to keyserver/flow-typed/npm/buffer-image-size_vx.x.x.js
diff --git a/server/flow-typed/npm/common-tags_v1.4.x.js b/keyserver/flow-typed/npm/common-tags_v1.4.x.js
rename from server/flow-typed/npm/common-tags_v1.4.x.js
rename to keyserver/flow-typed/npm/common-tags_v1.4.x.js
diff --git a/server/flow-typed/npm/cookie-parser_v1.x.x.js b/keyserver/flow-typed/npm/cookie-parser_v1.x.x.js
rename from server/flow-typed/npm/cookie-parser_v1.x.x.js
rename to keyserver/flow-typed/npm/cookie-parser_v1.x.x.js
diff --git a/server/flow-typed/npm/express_v4.17.x.js b/keyserver/flow-typed/npm/express_v4.17.x.js
rename from server/flow-typed/npm/express_v4.17.x.js
rename to keyserver/flow-typed/npm/express_v4.17.x.js
diff --git a/server/flow-typed/npm/firebase-admin_vx.x.x.js b/keyserver/flow-typed/npm/firebase-admin_vx.x.x.js
rename from server/flow-typed/npm/firebase-admin_vx.x.x.js
rename to keyserver/flow-typed/npm/firebase-admin_vx.x.x.js
diff --git a/server/flow-typed/npm/flow-bin_v0.x.x.js b/keyserver/flow-typed/npm/flow-bin_v0.x.x.js
rename from server/flow-typed/npm/flow-bin_v0.x.x.js
rename to keyserver/flow-typed/npm/flow-bin_v0.x.x.js
diff --git a/server/flow-typed/npm/history_v4.x.x.js b/keyserver/flow-typed/npm/history_v4.x.x.js
rename from server/flow-typed/npm/history_v4.x.x.js
rename to keyserver/flow-typed/npm/history_v4.x.x.js
diff --git a/server/flow-typed/npm/invariant_v2.x.x.js b/keyserver/flow-typed/npm/invariant_v2.x.x.js
rename from server/flow-typed/npm/invariant_v2.x.x.js
rename to keyserver/flow-typed/npm/invariant_v2.x.x.js
diff --git a/server/flow-typed/npm/jest_v26.x.x.js b/keyserver/flow-typed/npm/jest_v26.x.x.js
rename from server/flow-typed/npm/jest_v26.x.x.js
rename to keyserver/flow-typed/npm/jest_v26.x.x.js
diff --git a/server/flow-typed/npm/lodash_v4.x.x.js b/keyserver/flow-typed/npm/lodash_v4.x.x.js
rename from server/flow-typed/npm/lodash_v4.x.x.js
rename to keyserver/flow-typed/npm/lodash_v4.x.x.js
diff --git a/server/flow-typed/npm/mysql_v2.x.x.js b/keyserver/flow-typed/npm/mysql_v2.x.x.js
rename from server/flow-typed/npm/mysql_v2.x.x.js
rename to keyserver/flow-typed/npm/mysql_v2.x.x.js
diff --git a/server/flow-typed/npm/react-redux_v7.x.x.js b/keyserver/flow-typed/npm/react-redux_v7.x.x.js
rename from server/flow-typed/npm/react-redux_v7.x.x.js
rename to keyserver/flow-typed/npm/react-redux_v7.x.x.js
diff --git a/server/flow-typed/npm/react-router-dom_v5.x.x.js b/keyserver/flow-typed/npm/react-router-dom_v5.x.x.js
rename from server/flow-typed/npm/react-router-dom_v5.x.x.js
rename to keyserver/flow-typed/npm/react-router-dom_v5.x.x.js
diff --git a/server/flow-typed/npm/react-router_v5.x.x.js b/keyserver/flow-typed/npm/react-router_v5.x.x.js
rename from server/flow-typed/npm/react-router_v5.x.x.js
rename to keyserver/flow-typed/npm/react-router_v5.x.x.js
diff --git a/server/flow-typed/npm/redis_v2.x.x.js b/keyserver/flow-typed/npm/redis_v2.x.x.js
rename from server/flow-typed/npm/redis_v2.x.x.js
rename to keyserver/flow-typed/npm/redis_v2.x.x.js
diff --git a/server/flow-typed/npm/redux_v4.x.x.js b/keyserver/flow-typed/npm/redux_v4.x.x.js
rename from server/flow-typed/npm/redux_v4.x.x.js
rename to keyserver/flow-typed/npm/redux_v4.x.x.js
diff --git a/server/flow-typed/npm/rereadable-stream_vx.x.x.js b/keyserver/flow-typed/npm/rereadable-stream_vx.x.x.js
rename from server/flow-typed/npm/rereadable-stream_vx.x.x.js
rename to keyserver/flow-typed/npm/rereadable-stream_vx.x.x.js
diff --git a/server/flow-typed/npm/uuid_v3.x.x.js b/keyserver/flow-typed/npm/uuid_v3.x.x.js
rename from server/flow-typed/npm/uuid_v3.x.x.js
rename to keyserver/flow-typed/npm/uuid_v3.x.x.js
diff --git a/server/flow-typed/npm/ws_v7.x.x.js b/keyserver/flow-typed/npm/ws_v7.x.x.js
rename from server/flow-typed/npm/ws_v7.x.x.js
rename to keyserver/flow-typed/npm/ws_v7.x.x.js
diff --git a/server/fonts/IBMPlexMono-Medium.woff2 b/keyserver/fonts/IBMPlexMono-Medium.woff2
rename from server/fonts/IBMPlexMono-Medium.woff2
rename to keyserver/fonts/IBMPlexMono-Medium.woff2
diff --git a/server/fonts/IBMPlexSans-Medium.woff2 b/keyserver/fonts/IBMPlexSans-Medium.woff2
rename from server/fonts/IBMPlexSans-Medium.woff2
rename to keyserver/fonts/IBMPlexSans-Medium.woff2
diff --git a/server/fonts/IBMPlexSans-Regular.woff2 b/keyserver/fonts/IBMPlexSans-Regular.woff2
rename from server/fonts/IBMPlexSans-Regular.woff2
rename to keyserver/fonts/IBMPlexSans-Regular.woff2
diff --git a/server/fonts/anaheim-latin-ext.woff2 b/keyserver/fonts/anaheim-latin-ext.woff2
rename from server/fonts/anaheim-latin-ext.woff2
rename to keyserver/fonts/anaheim-latin-ext.woff2
diff --git a/server/fonts/anaheim-latin.woff2 b/keyserver/fonts/anaheim-latin.woff2
rename from server/fonts/anaheim-latin.woff2
rename to keyserver/fonts/anaheim-latin.woff2
diff --git a/server/fonts/duo.css b/keyserver/fonts/duo.css
rename from server/fonts/duo.css
rename to keyserver/fonts/duo.css
diff --git a/server/fonts/iAWriterDuoS-Bold.woff2 b/keyserver/fonts/iAWriterDuoS-Bold.woff2
rename from server/fonts/iAWriterDuoS-Bold.woff2
rename to keyserver/fonts/iAWriterDuoS-Bold.woff2
diff --git a/server/fonts/iAWriterDuoS-BoldItalic.woff2 b/keyserver/fonts/iAWriterDuoS-BoldItalic.woff2
rename from server/fonts/iAWriterDuoS-BoldItalic.woff2
rename to keyserver/fonts/iAWriterDuoS-BoldItalic.woff2
diff --git a/server/fonts/iAWriterDuoS-Italic.woff2 b/keyserver/fonts/iAWriterDuoS-Italic.woff2
rename from server/fonts/iAWriterDuoS-Italic.woff2
rename to keyserver/fonts/iAWriterDuoS-Italic.woff2
diff --git a/server/fonts/iAWriterDuoS-Regular.woff2 b/keyserver/fonts/iAWriterDuoS-Regular.woff2
rename from server/fonts/iAWriterDuoS-Regular.woff2
rename to keyserver/fonts/iAWriterDuoS-Regular.woff2
diff --git a/server/fonts/iAWriterLICENSE.md b/keyserver/fonts/iAWriterLICENSE.md
rename from server/fonts/iAWriterLICENSE.md
rename to keyserver/fonts/iAWriterLICENSE.md
diff --git a/server/fonts/local-fonts.css b/keyserver/fonts/local-fonts.css
rename from server/fonts/local-fonts.css
rename to keyserver/fonts/local-fonts.css
diff --git a/server/icons/android-chrome-192x192.png b/keyserver/icons/android-chrome-192x192.png
rename from server/icons/android-chrome-192x192.png
rename to keyserver/icons/android-chrome-192x192.png
diff --git a/server/icons/android-chrome-512x512.png b/keyserver/icons/android-chrome-512x512.png
rename from server/icons/android-chrome-512x512.png
rename to keyserver/icons/android-chrome-512x512.png
diff --git a/server/icons/apple-touch-icon.png b/keyserver/icons/apple-touch-icon.png
rename from server/icons/apple-touch-icon.png
rename to keyserver/icons/apple-touch-icon.png
diff --git a/server/icons/browserconfig.xml b/keyserver/icons/browserconfig.xml
rename from server/icons/browserconfig.xml
rename to keyserver/icons/browserconfig.xml
diff --git a/server/icons/favicon-16x16.png b/keyserver/icons/favicon-16x16.png
rename from server/icons/favicon-16x16.png
rename to keyserver/icons/favicon-16x16.png
diff --git a/server/icons/favicon-32x32.png b/keyserver/icons/favicon-32x32.png
rename from server/icons/favicon-32x32.png
rename to keyserver/icons/favicon-32x32.png
diff --git a/server/icons/favicon.ico b/keyserver/icons/favicon.ico
rename from server/icons/favicon.ico
rename to keyserver/icons/favicon.ico
diff --git a/server/icons/mstile-150x150.png b/keyserver/icons/mstile-150x150.png
rename from server/icons/mstile-150x150.png
rename to keyserver/icons/mstile-150x150.png
diff --git a/server/icons/safari-pinned-tab.svg b/keyserver/icons/safari-pinned-tab.svg
rename from server/icons/safari-pinned-tab.svg
rename to keyserver/icons/safari-pinned-tab.svg
diff --git a/server/icons/site.webmanifest b/keyserver/icons/site.webmanifest
rename from server/icons/site.webmanifest
rename to keyserver/icons/site.webmanifest
diff --git a/server/images/animated_cloud.json b/keyserver/images/animated_cloud.json
rename from server/images/animated_cloud.json
rename to keyserver/images/animated_cloud.json
diff --git a/server/images/animated_eye.json b/keyserver/images/animated_eye.json
rename from server/images/animated_eye.json
rename to keyserver/images/animated_eye.json
diff --git a/server/images/corner_arrow.svg b/keyserver/images/corner_arrow.svg
rename from server/images/corner_arrow.svg
rename to keyserver/images/corner_arrow.svg
diff --git a/server/images/hero_illustration.svg b/keyserver/images/hero_illustration.svg
rename from server/images/hero_illustration.svg
rename to keyserver/images/hero_illustration.svg
diff --git a/server/images/placeholder.png b/keyserver/images/placeholder.png
rename from server/images/placeholder.png
rename to keyserver/images/placeholder.png
diff --git a/server/images/server_illustration.svg b/keyserver/images/server_illustration.svg
rename from server/images/server_illustration.svg
rename to keyserver/images/server_illustration.svg
diff --git a/server/images/server_illustration_small.svg b/keyserver/images/server_illustration_small.svg
rename from server/images/server_illustration_small.svg
rename to keyserver/images/server_illustration_small.svg
diff --git a/server/landing_compiled b/keyserver/landing_compiled
rename from server/landing_compiled
rename to keyserver/landing_compiled
diff --git a/server/landing_icons/apple-touch-icon.png b/keyserver/landing_icons/apple-touch-icon.png
rename from server/landing_icons/apple-touch-icon.png
rename to keyserver/landing_icons/apple-touch-icon.png
diff --git a/server/landing_icons/landing-favicon-16x16.png b/keyserver/landing_icons/landing-favicon-16x16.png
rename from server/landing_icons/landing-favicon-16x16.png
rename to keyserver/landing_icons/landing-favicon-16x16.png
diff --git a/server/landing_icons/landing-favicon-32x32.png b/keyserver/landing_icons/landing-favicon-32x32.png
rename from server/landing_icons/landing-favicon-32x32.png
rename to keyserver/landing_icons/landing-favicon-32x32.png
diff --git a/server/loader.mjs b/keyserver/loader.mjs
rename from server/loader.mjs
rename to keyserver/loader.mjs
--- a/server/loader.mjs
+++ b/keyserver/loader.mjs
@@ -1,3 +1,4 @@
+// @flow
 const localPackages = ['landing', 'lib', 'web'];
 
 async function resolve(specifier, context, defaultResolve) {
@@ -7,7 +8,7 @@
   if (localPackages.some(pkg => specifier.startsWith(`${pkg}/`))) {
     const url = defaultResult.url.replace(
       specifier,
-      `server/dist/${specifier}`,
+      `keyserver/dist/${specifier}`,
     );
     return { url };
   }
diff --git a/server/misc/android_privacy_policy.html b/keyserver/misc/android_privacy_policy.html
rename from server/misc/android_privacy_policy.html
rename to keyserver/misc/android_privacy_policy.html
diff --git a/server/package.json b/keyserver/package.json
rename from server/package.json
rename to keyserver/package.json
--- a/server/package.json
+++ b/keyserver/package.json
@@ -1,19 +1,19 @@
 {
-  "name": "server",
+  "name": "keyserver",
   "version": "0.0.1",
   "type": "module",
   "private": true,
   "license": "BSD-3-Clause",
-  "main": "dist/server",
+  "main": "dist/keyserver",
   "scripts": {
     "clean": "rm -rf dist/ && rm -rf node_modules/ && mkdir dist",
     "babel-build": "yarn --silent babel src/ --out-dir dist/ --config-file ./babel.config.cjs --verbose --ignore 'src/landing/flow-typed','src/landing/node_modules','src/landing/package.json','src/lib/flow-typed','src/lib/node_modules','src/lib/package.json','src/web/flow-typed','src/web/node_modules','src/web/package.json','src/web/dist','src/web/webpack.config.js','src/web/account-bar.react.js','src/web/app.react.js','src/web/calendar','src/web/chat','src/web/flow','src/web/loading-indicator.react.js','src/web/modals','src/web/root.js','src/web/router-history.js','src/web/script.js','src/web/selectors/chat-selectors.js','src/web/selectors/entry-selectors.js','src/web/splash','src/web/vector-utils.js','src/web/vectors.react.js'",
     "rsync": "rsync -rLpmuv --exclude '*/package.json' --exclude '*/node_modules/*' --include '*.json' --include '*.cjs' --exclude '*.*' src/ dist/",
     "prod-build": "yarn babel-build && yarn rsync && yarn update-geoip",
     "update-geoip": "yarn script dist/scripts/update-geoip.js",
-    "prod": "node --trace-warnings --experimental-json-modules --loader=./loader.mjs --experimental-specifier-resolution=node dist/server",
+    "prod": "node --trace-warnings --experimental-json-modules --loader=./loader.mjs --experimental-specifier-resolution=node dist/keyserver",
     "dev-rsync": "yarn --silent chokidar --initial --silent -s 'src/**/*.json' 'src/**/*.cjs' -c 'yarn rsync > /dev/null 2>&1'",
-    "dev": "yarn concurrently --names=\"BABEL,RSYNC,NODEM\" -c \"bgBlue.bold,bgMagenta.bold,bgGreen.bold\" \"yarn babel-build --watch\" \"yarn dev-rsync\" \". bash/source-nvm.sh && NODE_ENV=development nodemon -e js,json,cjs --watch dist --experimental-json-modules --loader=./loader.mjs --experimental-specifier-resolution=node dist/server\"",
+    "dev": "yarn concurrently --names=\"BABEL,RSYNC,NODEM\" -c \"bgBlue.bold,bgMagenta.bold,bgGreen.bold\" \"yarn babel-build --watch\" \"yarn dev-rsync\" \". bash/source-nvm.sh && NODE_ENV=development nodemon -e js,json,cjs --watch dist --experimental-json-modules --loader=./loader.mjs --experimental-specifier-resolution=node dist/keyserver\"",
     "script": ". bash/source-nvm.sh && NODE_ENV=development node --experimental-json-modules --loader=./loader.mjs --experimental-specifier-resolution=node",
     "test": "jest"
   },
diff --git a/server/src/bots/commbot.js b/keyserver/src/bots/commbot.js
rename from server/src/bots/commbot.js
rename to keyserver/src/bots/commbot.js
diff --git a/server/src/creators/account-creator.js b/keyserver/src/creators/account-creator.js
rename from server/src/creators/account-creator.js
rename to keyserver/src/creators/account-creator.js
diff --git a/server/src/creators/day-creator.js b/keyserver/src/creators/day-creator.js
rename from server/src/creators/day-creator.js
rename to keyserver/src/creators/day-creator.js
diff --git a/server/src/creators/entry-creator.js b/keyserver/src/creators/entry-creator.js
rename from server/src/creators/entry-creator.js
rename to keyserver/src/creators/entry-creator.js
diff --git a/server/src/creators/id-creator.js b/keyserver/src/creators/id-creator.js
rename from server/src/creators/id-creator.js
rename to keyserver/src/creators/id-creator.js
diff --git a/server/src/creators/message-creator.js b/keyserver/src/creators/message-creator.js
rename from server/src/creators/message-creator.js
rename to keyserver/src/creators/message-creator.js
diff --git a/server/src/creators/one-time-keys-creator.js b/keyserver/src/creators/one-time-keys-creator.js
rename from server/src/creators/one-time-keys-creator.js
rename to keyserver/src/creators/one-time-keys-creator.js
diff --git a/server/src/creators/relationship-creators.js b/keyserver/src/creators/relationship-creators.js
rename from server/src/creators/relationship-creators.js
rename to keyserver/src/creators/relationship-creators.js
diff --git a/server/src/creators/report-creator.js b/keyserver/src/creators/report-creator.js
rename from server/src/creators/report-creator.js
rename to keyserver/src/creators/report-creator.js
diff --git a/server/src/creators/role-creator.js b/keyserver/src/creators/role-creator.js
rename from server/src/creators/role-creator.js
rename to keyserver/src/creators/role-creator.js
diff --git a/server/src/creators/session-creator.js b/keyserver/src/creators/session-creator.js
rename from server/src/creators/session-creator.js
rename to keyserver/src/creators/session-creator.js
diff --git a/server/src/creators/thread-creator.js b/keyserver/src/creators/thread-creator.js
rename from server/src/creators/thread-creator.js
rename to keyserver/src/creators/thread-creator.js
diff --git a/server/src/creators/update-creator.js b/keyserver/src/creators/update-creator.js
rename from server/src/creators/update-creator.js
rename to keyserver/src/creators/update-creator.js
diff --git a/server/src/creators/upload-creator.js b/keyserver/src/creators/upload-creator.js
rename from server/src/creators/upload-creator.js
rename to keyserver/src/creators/upload-creator.js
diff --git a/server/src/cron/backups.js b/keyserver/src/cron/backups.js
rename from server/src/cron/backups.js
rename to keyserver/src/cron/backups.js
diff --git a/server/src/cron/cron.js b/keyserver/src/cron/cron.js
rename from server/src/cron/cron.js
rename to keyserver/src/cron/cron.js
diff --git a/server/src/cron/update-geoip-db.js b/keyserver/src/cron/update-geoip-db.js
rename from server/src/cron/update-geoip-db.js
rename to keyserver/src/cron/update-geoip-db.js
--- a/server/src/cron/update-geoip-db.js
+++ b/keyserver/src/cron/update-geoip-db.js
@@ -28,7 +28,7 @@
 async function updateGeoipDB(): Promise<void> {
   const geoipLicense = await getGeoipLicense();
   if (!geoipLicense) {
-    console.log('no server/secrets/geoip_license.json so skipping update');
+    console.log('no keyserver/secrets/geoip_license.json so skipping update');
     return;
   }
   await spawnUpdater(geoipLicense);
diff --git a/server/src/database/consts.js b/keyserver/src/database/consts.js
rename from server/src/database/consts.js
rename to keyserver/src/database/consts.js
diff --git a/server/src/database/database.js b/keyserver/src/database/database.js
rename from server/src/database/database.js
rename to keyserver/src/database/database.js
diff --git a/server/src/database/migrations.js b/keyserver/src/database/migrations.js
rename from server/src/database/migrations.js
rename to keyserver/src/database/migrations.js
diff --git a/server/src/database/monitor.js b/keyserver/src/database/monitor.js
rename from server/src/database/monitor.js
rename to keyserver/src/database/monitor.js
diff --git a/server/src/database/types.js b/keyserver/src/database/types.js
rename from server/src/database/types.js
rename to keyserver/src/database/types.js
diff --git a/server/src/deleters/account-deleters.js b/keyserver/src/deleters/account-deleters.js
rename from server/src/deleters/account-deleters.js
rename to keyserver/src/deleters/account-deleters.js
diff --git a/server/src/deleters/activity-deleters.js b/keyserver/src/deleters/activity-deleters.js
rename from server/src/deleters/activity-deleters.js
rename to keyserver/src/deleters/activity-deleters.js
diff --git a/server/src/deleters/cookie-deleters.js b/keyserver/src/deleters/cookie-deleters.js
rename from server/src/deleters/cookie-deleters.js
rename to keyserver/src/deleters/cookie-deleters.js
diff --git a/server/src/deleters/day-deleters.js b/keyserver/src/deleters/day-deleters.js
rename from server/src/deleters/day-deleters.js
rename to keyserver/src/deleters/day-deleters.js
diff --git a/server/src/deleters/entry-deleters.js b/keyserver/src/deleters/entry-deleters.js
rename from server/src/deleters/entry-deleters.js
rename to keyserver/src/deleters/entry-deleters.js
diff --git a/server/src/deleters/membership-deleters.js b/keyserver/src/deleters/membership-deleters.js
rename from server/src/deleters/membership-deleters.js
rename to keyserver/src/deleters/membership-deleters.js
diff --git a/server/src/deleters/message-deleters.js b/keyserver/src/deleters/message-deleters.js
rename from server/src/deleters/message-deleters.js
rename to keyserver/src/deleters/message-deleters.js
diff --git a/server/src/deleters/notif-deleters.js b/keyserver/src/deleters/notif-deleters.js
rename from server/src/deleters/notif-deleters.js
rename to keyserver/src/deleters/notif-deleters.js
diff --git a/server/src/deleters/one-time-key-deleters.js b/keyserver/src/deleters/one-time-key-deleters.js
rename from server/src/deleters/one-time-key-deleters.js
rename to keyserver/src/deleters/one-time-key-deleters.js
diff --git a/server/src/deleters/revision-deleters.js b/keyserver/src/deleters/revision-deleters.js
rename from server/src/deleters/revision-deleters.js
rename to keyserver/src/deleters/revision-deleters.js
diff --git a/server/src/deleters/role-deleters.js b/keyserver/src/deleters/role-deleters.js
rename from server/src/deleters/role-deleters.js
rename to keyserver/src/deleters/role-deleters.js
diff --git a/server/src/deleters/session-deleters.js b/keyserver/src/deleters/session-deleters.js
rename from server/src/deleters/session-deleters.js
rename to keyserver/src/deleters/session-deleters.js
diff --git a/server/src/deleters/thread-deleters.js b/keyserver/src/deleters/thread-deleters.js
rename from server/src/deleters/thread-deleters.js
rename to keyserver/src/deleters/thread-deleters.js
diff --git a/server/src/deleters/update-deleters.js b/keyserver/src/deleters/update-deleters.js
rename from server/src/deleters/update-deleters.js
rename to keyserver/src/deleters/update-deleters.js
diff --git a/server/src/deleters/upload-deleters.js b/keyserver/src/deleters/upload-deleters.js
rename from server/src/deleters/upload-deleters.js
rename to keyserver/src/deleters/upload-deleters.js
diff --git a/server/src/emails/access-request.js b/keyserver/src/emails/access-request.js
rename from server/src/emails/access-request.js
rename to keyserver/src/emails/access-request.js
diff --git a/server/src/emails/sendmail.js b/keyserver/src/emails/sendmail.js
rename from server/src/emails/sendmail.js
rename to keyserver/src/emails/sendmail.js
diff --git a/server/src/emails/subscribe-email-updates.js b/keyserver/src/emails/subscribe-email-updates.js
rename from server/src/emails/subscribe-email-updates.js
rename to keyserver/src/emails/subscribe-email-updates.js
diff --git a/server/src/emails/template.react.js b/keyserver/src/emails/template.react.js
rename from server/src/emails/template.react.js
rename to keyserver/src/emails/template.react.js
diff --git a/server/src/endpoints.js b/keyserver/src/endpoints.js
rename from server/src/endpoints.js
rename to keyserver/src/endpoints.js
diff --git a/server/src/fetchers/entry-fetchers.js b/keyserver/src/fetchers/entry-fetchers.js
rename from server/src/fetchers/entry-fetchers.js
rename to keyserver/src/fetchers/entry-fetchers.js
diff --git a/server/src/fetchers/key-fetchers.js b/keyserver/src/fetchers/key-fetchers.js
rename from server/src/fetchers/key-fetchers.js
rename to keyserver/src/fetchers/key-fetchers.js
diff --git a/server/src/fetchers/message-fetchers.js b/keyserver/src/fetchers/message-fetchers.js
rename from server/src/fetchers/message-fetchers.js
rename to keyserver/src/fetchers/message-fetchers.js
diff --git a/server/src/fetchers/relationship-fetchers.js b/keyserver/src/fetchers/relationship-fetchers.js
rename from server/src/fetchers/relationship-fetchers.js
rename to keyserver/src/fetchers/relationship-fetchers.js
diff --git a/server/src/fetchers/report-fetchers.js b/keyserver/src/fetchers/report-fetchers.js
rename from server/src/fetchers/report-fetchers.js
rename to keyserver/src/fetchers/report-fetchers.js
diff --git a/server/src/fetchers/role-fetchers.js b/keyserver/src/fetchers/role-fetchers.js
rename from server/src/fetchers/role-fetchers.js
rename to keyserver/src/fetchers/role-fetchers.js
diff --git a/server/src/fetchers/session-fetchers.js b/keyserver/src/fetchers/session-fetchers.js
rename from server/src/fetchers/session-fetchers.js
rename to keyserver/src/fetchers/session-fetchers.js
diff --git a/server/src/fetchers/thread-fetchers.js b/keyserver/src/fetchers/thread-fetchers.js
rename from server/src/fetchers/thread-fetchers.js
rename to keyserver/src/fetchers/thread-fetchers.js
diff --git a/server/src/fetchers/thread-permission-fetchers.js b/keyserver/src/fetchers/thread-permission-fetchers.js
rename from server/src/fetchers/thread-permission-fetchers.js
rename to keyserver/src/fetchers/thread-permission-fetchers.js
diff --git a/server/src/fetchers/update-fetchers.js b/keyserver/src/fetchers/update-fetchers.js
rename from server/src/fetchers/update-fetchers.js
rename to keyserver/src/fetchers/update-fetchers.js
diff --git a/server/src/fetchers/upload-fetchers.js b/keyserver/src/fetchers/upload-fetchers.js
rename from server/src/fetchers/upload-fetchers.js
rename to keyserver/src/fetchers/upload-fetchers.js
diff --git a/server/src/fetchers/user-fetchers.js b/keyserver/src/fetchers/user-fetchers.js
rename from server/src/fetchers/user-fetchers.js
rename to keyserver/src/fetchers/user-fetchers.js
diff --git a/server/src/server.js b/keyserver/src/keyserver.js
rename from server/src/server.js
rename to keyserver/src/keyserver.js
diff --git a/server/src/landing b/keyserver/src/landing
rename from server/src/landing
rename to keyserver/src/landing
diff --git a/server/src/lib b/keyserver/src/lib
rename from server/src/lib
rename to keyserver/src/lib
diff --git a/server/src/push/providers.js b/keyserver/src/push/providers.js
rename from server/src/push/providers.js
rename to keyserver/src/push/providers.js
diff --git a/server/src/push/rescind.js b/keyserver/src/push/rescind.js
rename from server/src/push/rescind.js
rename to keyserver/src/push/rescind.js
diff --git a/server/src/push/send.js b/keyserver/src/push/send.js
rename from server/src/push/send.js
rename to keyserver/src/push/send.js
diff --git a/server/src/push/utils.js b/keyserver/src/push/utils.js
rename from server/src/push/utils.js
rename to keyserver/src/push/utils.js
--- a/server/src/push/utils.js
+++ b/keyserver/src/push/utils.js
@@ -42,10 +42,10 @@
   const pushProfile = getAPNPushProfileForCodeVersion(codeVersion);
   const apnProvider = await getAPNProvider(pushProfile);
   if (!apnProvider && process.env.NODE_ENV === 'development') {
-    console.log(`no server/secrets/${pushProfile}.json so ignoring notifs`);
+    console.log(`no keyserver/secrets/${pushProfile}.json so ignoring notifs`);
     return { success: true };
   }
-  invariant(apnProvider, `server/secrets/${pushProfile}.json should exist`);
+  invariant(apnProvider, `keyserver/secrets/${pushProfile}.json should exist`);
   const result = await apnProvider.send(notification, deviceTokens);
   const errors = [];
   const invalidTokens = [];
@@ -90,10 +90,10 @@
   const pushProfile = getFCMPushProfileForCodeVersion(codeVersion);
   const fcmProvider = await getFCMProvider(pushProfile);
   if (!fcmProvider && process.env.NODE_ENV === 'development') {
-    console.log(`no server/secrets/${pushProfile}.json so ignoring notifs`);
+    console.log(`no keyserver/secrets/${pushProfile}.json so ignoring notifs`);
     return { success: true };
   }
-  invariant(fcmProvider, `server/secrets/${pushProfile}.json should exist`);
+  invariant(fcmProvider, `keyserver/secrets/${pushProfile}.json should exist`);
   const options: Object = {
     priority: 'high',
   };
diff --git a/server/src/responders/activity-responders.js b/keyserver/src/responders/activity-responders.js
rename from server/src/responders/activity-responders.js
rename to keyserver/src/responders/activity-responders.js
diff --git a/server/src/responders/comm-landing-responders.js b/keyserver/src/responders/comm-landing-responders.js
rename from server/src/responders/comm-landing-responders.js
rename to keyserver/src/responders/comm-landing-responders.js
diff --git a/server/src/responders/device-responders.js b/keyserver/src/responders/device-responders.js
rename from server/src/responders/device-responders.js
rename to keyserver/src/responders/device-responders.js
diff --git a/server/src/responders/entry-responders.js b/keyserver/src/responders/entry-responders.js
rename from server/src/responders/entry-responders.js
rename to keyserver/src/responders/entry-responders.js
diff --git a/server/src/responders/handlers.js b/keyserver/src/responders/handlers.js
rename from server/src/responders/handlers.js
rename to keyserver/src/responders/handlers.js
diff --git a/server/src/responders/keys-responders.js b/keyserver/src/responders/keys-responders.js
rename from server/src/responders/keys-responders.js
rename to keyserver/src/responders/keys-responders.js
diff --git a/server/src/responders/landing-handler.js b/keyserver/src/responders/landing-handler.js
rename from server/src/responders/landing-handler.js
rename to keyserver/src/responders/landing-handler.js
diff --git a/server/src/responders/message-responders.js b/keyserver/src/responders/message-responders.js
rename from server/src/responders/message-responders.js
rename to keyserver/src/responders/message-responders.js
diff --git a/server/src/responders/relationship-responders.js b/keyserver/src/responders/relationship-responders.js
rename from server/src/responders/relationship-responders.js
rename to keyserver/src/responders/relationship-responders.js
diff --git a/server/src/responders/report-responders.js b/keyserver/src/responders/report-responders.js
rename from server/src/responders/report-responders.js
rename to keyserver/src/responders/report-responders.js
diff --git a/server/src/responders/search-responders.js b/keyserver/src/responders/search-responders.js
rename from server/src/responders/search-responders.js
rename to keyserver/src/responders/search-responders.js
diff --git a/server/src/responders/thread-responders.js b/keyserver/src/responders/thread-responders.js
rename from server/src/responders/thread-responders.js
rename to keyserver/src/responders/thread-responders.js
diff --git a/server/src/responders/thread-responders.test.js b/keyserver/src/responders/thread-responders.test.js
rename from server/src/responders/thread-responders.test.js
rename to keyserver/src/responders/thread-responders.test.js
diff --git a/server/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
rename from server/src/responders/user-responders.js
rename to keyserver/src/responders/user-responders.js
diff --git a/server/src/responders/utils.js b/keyserver/src/responders/utils.js
rename from server/src/responders/utils.js
rename to keyserver/src/responders/utils.js
diff --git a/server/src/responders/verification-responders.js b/keyserver/src/responders/verification-responders.js
rename from server/src/responders/verification-responders.js
rename to keyserver/src/responders/verification-responders.js
diff --git a/server/src/responders/version-responders.js b/keyserver/src/responders/version-responders.js
rename from server/src/responders/version-responders.js
rename to keyserver/src/responders/version-responders.js
diff --git a/server/src/responders/website-responders.js b/keyserver/src/responders/website-responders.js
rename from server/src/responders/website-responders.js
rename to keyserver/src/responders/website-responders.js
diff --git a/server/src/scripts/add-edit-thread-detailed-permissions.js b/keyserver/src/scripts/add-edit-thread-detailed-permissions.js
rename from server/src/scripts/add-edit-thread-detailed-permissions.js
rename to keyserver/src/scripts/add-edit-thread-detailed-permissions.js
diff --git a/server/src/scripts/add-indexes-for-account-deletion.js b/keyserver/src/scripts/add-indexes-for-account-deletion.js
rename from server/src/scripts/add-indexes-for-account-deletion.js
rename to keyserver/src/scripts/add-indexes-for-account-deletion.js
diff --git a/server/src/scripts/add-key-column-for-sessions.js b/keyserver/src/scripts/add-key-column-for-sessions.js
rename from server/src/scripts/add-key-column-for-sessions.js
rename to keyserver/src/scripts/add-key-column-for-sessions.js
diff --git a/server/src/scripts/add-key-column-for-users.js b/keyserver/src/scripts/add-key-column-for-users.js
rename from server/src/scripts/add-key-column-for-users.js
rename to keyserver/src/scripts/add-key-column-for-users.js
diff --git a/server/src/scripts/add-leave-thread-permissions.js b/keyserver/src/scripts/add-leave-thread-permissions.js
rename from server/src/scripts/add-leave-thread-permissions.js
rename to keyserver/src/scripts/add-leave-thread-permissions.js
diff --git a/server/src/scripts/add-primary-column-for-cookies.js b/keyserver/src/scripts/add-primary-column-for-cookies.js
rename from server/src/scripts/add-primary-column-for-cookies.js
rename to keyserver/src/scripts/add-primary-column-for-cookies.js
diff --git a/server/src/scripts/add-source-message-column.js b/keyserver/src/scripts/add-source-message-column.js
rename from server/src/scripts/add-source-message-column.js
rename to keyserver/src/scripts/add-source-message-column.js
diff --git a/server/src/scripts/add-staff.js b/keyserver/src/scripts/add-staff.js
rename from server/src/scripts/add-staff.js
rename to keyserver/src/scripts/add-staff.js
diff --git a/server/src/scripts/add-target-time-index-to-updates-table.js b/keyserver/src/scripts/add-target-time-index-to-updates-table.js
rename from server/src/scripts/add-target-time-index-to-updates-table.js
rename to keyserver/src/scripts/add-target-time-index-to-updates-table.js
diff --git a/server/src/scripts/add-thread-ancestry.js b/keyserver/src/scripts/add-thread-ancestry.js
rename from server/src/scripts/add-thread-ancestry.js
rename to keyserver/src/scripts/add-thread-ancestry.js
diff --git a/server/src/scripts/create-db.js b/keyserver/src/scripts/create-db.js
rename from server/src/scripts/create-db.js
rename to keyserver/src/scripts/create-db.js
diff --git a/server/src/scripts/create-friend-relationships.js b/keyserver/src/scripts/create-friend-relationships.js
rename from server/src/scripts/create-friend-relationships.js
rename to keyserver/src/scripts/create-friend-relationships.js
diff --git a/server/src/scripts/create-metadata-table.js b/keyserver/src/scripts/create-metadata-table.js
rename from server/src/scripts/create-metadata-table.js
rename to keyserver/src/scripts/create-metadata-table.js
diff --git a/server/src/scripts/create-one-time-keys-table.js b/keyserver/src/scripts/create-one-time-keys-table.js
rename from server/src/scripts/create-one-time-keys-table.js
rename to keyserver/src/scripts/create-one-time-keys-table.js
diff --git a/server/src/scripts/create-one-time-settings-table.js b/keyserver/src/scripts/create-one-time-settings-table.js
rename from server/src/scripts/create-one-time-settings-table.js
rename to keyserver/src/scripts/create-one-time-settings-table.js
diff --git a/server/src/scripts/create-relationships.js b/keyserver/src/scripts/create-relationships.js
rename from server/src/scripts/create-relationships.js
rename to keyserver/src/scripts/create-relationships.js
diff --git a/server/src/scripts/create-sidebar-permissions.js b/keyserver/src/scripts/create-sidebar-permissions.js
rename from server/src/scripts/create-sidebar-permissions.js
rename to keyserver/src/scripts/create-sidebar-permissions.js
diff --git a/server/src/scripts/create-user-messages-table.js b/keyserver/src/scripts/create-user-messages-table.js
rename from server/src/scripts/create-user-messages-table.js
rename to keyserver/src/scripts/create-user-messages-table.js
diff --git a/server/src/scripts/delete-emails.js b/keyserver/src/scripts/delete-emails.js
rename from server/src/scripts/delete-emails.js
rename to keyserver/src/scripts/delete-emails.js
diff --git a/server/src/scripts/delete-memberships-of-deleted-users.js b/keyserver/src/scripts/delete-memberships-of-deleted-users.js
rename from server/src/scripts/delete-memberships-of-deleted-users.js
rename to keyserver/src/scripts/delete-memberships-of-deleted-users.js
diff --git a/server/src/scripts/delete-unread-column.js b/keyserver/src/scripts/delete-unread-column.js
rename from server/src/scripts/delete-unread-column.js
rename to keyserver/src/scripts/delete-unread-column.js
diff --git a/server/src/scripts/fix-new-thread-types.js b/keyserver/src/scripts/fix-new-thread-types.js
rename from server/src/scripts/fix-new-thread-types.js
rename to keyserver/src/scripts/fix-new-thread-types.js
diff --git a/server/src/scripts/generate-olm-config.js b/keyserver/src/scripts/generate-olm-config.js
rename from server/src/scripts/generate-olm-config.js
rename to keyserver/src/scripts/generate-olm-config.js
--- a/server/src/scripts/generate-olm-config.js
+++ b/keyserver/src/scripts/generate-olm-config.js
@@ -22,8 +22,10 @@
   };
   const scriptWorkingDirectory = path.resolve();
 
-  if (!scriptWorkingDirectory.endsWith('comm/server')) {
-    throw new Error('Script must be run in server directory in comm project.');
+  if (!scriptWorkingDirectory.endsWith('comm/keyserver')) {
+    throw new Error(
+      'Script must be run in keyserver directory in comm project.',
+    );
   }
 
   const olmConfigFilePath = path.join(
diff --git a/server/src/scripts/image-size.js b/keyserver/src/scripts/image-size.js
rename from server/src/scripts/image-size.js
rename to keyserver/src/scripts/image-size.js
diff --git a/server/src/scripts/make-notif-columns-optional.js b/keyserver/src/scripts/make-notif-columns-optional.js
rename from server/src/scripts/make-notif-columns-optional.js
rename to keyserver/src/scripts/make-notif-columns-optional.js
diff --git a/server/src/scripts/make-source-message-unique.js b/keyserver/src/scripts/make-source-message-unique.js
rename from server/src/scripts/make-source-message-unique.js
rename to keyserver/src/scripts/make-source-message-unique.js
diff --git a/server/src/scripts/merge-users.js b/keyserver/src/scripts/merge-users.js
rename from server/src/scripts/merge-users.js
rename to keyserver/src/scripts/merge-users.js
diff --git a/server/src/scripts/rename-sidebar-message-fields.js b/keyserver/src/scripts/rename-sidebar-message-fields.js
rename from server/src/scripts/rename-sidebar-message-fields.js
rename to keyserver/src/scripts/rename-sidebar-message-fields.js
diff --git a/server/src/scripts/rename-user-column-for-one-time-keys.js b/keyserver/src/scripts/rename-user-column-for-one-time-keys.js
rename from server/src/scripts/rename-user-column-for-one-time-keys.js
rename to keyserver/src/scripts/rename-user-column-for-one-time-keys.js
diff --git a/server/src/scripts/rename-user.js b/keyserver/src/scripts/rename-user.js
rename from server/src/scripts/rename-user.js
rename to keyserver/src/scripts/rename-user.js
diff --git a/server/src/scripts/rescind-notifs.js b/keyserver/src/scripts/rescind-notifs.js
rename from server/src/scripts/rescind-notifs.js
rename to keyserver/src/scripts/rescind-notifs.js
diff --git a/server/src/scripts/reset-password.js b/keyserver/src/scripts/reset-password.js
rename from server/src/scripts/reset-password.js
rename to keyserver/src/scripts/reset-password.js
diff --git a/server/src/scripts/script-context.js b/keyserver/src/scripts/script-context.js
rename from server/src/scripts/script-context.js
rename to keyserver/src/scripts/script-context.js
diff --git a/server/src/scripts/set-last-read-messages.js b/keyserver/src/scripts/set-last-read-messages.js
rename from server/src/scripts/set-last-read-messages.js
rename to keyserver/src/scripts/set-last-read-messages.js
diff --git a/server/src/scripts/setup-sidebars.js b/keyserver/src/scripts/setup-sidebars.js
rename from server/src/scripts/setup-sidebars.js
rename to keyserver/src/scripts/setup-sidebars.js
diff --git a/server/src/scripts/sidebar-know-of-migration.js b/keyserver/src/scripts/sidebar-know-of-migration.js
rename from server/src/scripts/sidebar-know-of-migration.js
rename to keyserver/src/scripts/sidebar-know-of-migration.js
diff --git a/server/src/scripts/soft-launch-migration.js b/keyserver/src/scripts/soft-launch-migration.js
rename from server/src/scripts/soft-launch-migration.js
rename to keyserver/src/scripts/soft-launch-migration.js
diff --git a/server/src/scripts/update-geoip.js b/keyserver/src/scripts/update-geoip.js
rename from server/src/scripts/update-geoip.js
rename to keyserver/src/scripts/update-geoip.js
diff --git a/server/src/scripts/utils.js b/keyserver/src/scripts/utils.js
rename from server/src/scripts/utils.js
rename to keyserver/src/scripts/utils.js
diff --git a/server/src/search/users.js b/keyserver/src/search/users.js
rename from server/src/search/users.js
rename to keyserver/src/search/users.js
diff --git a/server/src/session/bots.js b/keyserver/src/session/bots.js
rename from server/src/session/bots.js
rename to keyserver/src/session/bots.js
diff --git a/server/src/session/cookies.js b/keyserver/src/session/cookies.js
rename from server/src/session/cookies.js
rename to keyserver/src/session/cookies.js
diff --git a/server/src/session/scripts.js b/keyserver/src/session/scripts.js
rename from server/src/session/scripts.js
rename to keyserver/src/session/scripts.js
diff --git a/server/src/session/version.js b/keyserver/src/session/version.js
rename from server/src/session/version.js
rename to keyserver/src/session/version.js
diff --git a/server/src/session/viewer.js b/keyserver/src/session/viewer.js
rename from server/src/session/viewer.js
rename to keyserver/src/session/viewer.js
diff --git a/server/src/shared/focused-times.js b/keyserver/src/shared/focused-times.js
rename from server/src/shared/focused-times.js
rename to keyserver/src/shared/focused-times.js
diff --git a/server/src/socket/redis.js b/keyserver/src/socket/redis.js
rename from server/src/socket/redis.js
rename to keyserver/src/socket/redis.js
diff --git a/server/src/socket/session-utils.js b/keyserver/src/socket/session-utils.js
rename from server/src/socket/session-utils.js
rename to keyserver/src/socket/session-utils.js
diff --git a/server/src/socket/socket.js b/keyserver/src/socket/socket.js
rename from server/src/socket/socket.js
rename to keyserver/src/socket/socket.js
diff --git a/server/src/updaters/account-updaters.js b/keyserver/src/updaters/account-updaters.js
rename from server/src/updaters/account-updaters.js
rename to keyserver/src/updaters/account-updaters.js
diff --git a/server/src/updaters/activity-updaters.js b/keyserver/src/updaters/activity-updaters.js
rename from server/src/updaters/activity-updaters.js
rename to keyserver/src/updaters/activity-updaters.js
diff --git a/server/src/updaters/device-token-updaters.js b/keyserver/src/updaters/device-token-updaters.js
rename from server/src/updaters/device-token-updaters.js
rename to keyserver/src/updaters/device-token-updaters.js
diff --git a/server/src/updaters/entry-updaters.js b/keyserver/src/updaters/entry-updaters.js
rename from server/src/updaters/entry-updaters.js
rename to keyserver/src/updaters/entry-updaters.js
diff --git a/server/src/updaters/relationship-updaters.js b/keyserver/src/updaters/relationship-updaters.js
rename from server/src/updaters/relationship-updaters.js
rename to keyserver/src/updaters/relationship-updaters.js
diff --git a/server/src/updaters/role-updaters.js b/keyserver/src/updaters/role-updaters.js
rename from server/src/updaters/role-updaters.js
rename to keyserver/src/updaters/role-updaters.js
diff --git a/server/src/updaters/session-updaters.js b/keyserver/src/updaters/session-updaters.js
rename from server/src/updaters/session-updaters.js
rename to keyserver/src/updaters/session-updaters.js
diff --git a/server/src/updaters/thread-permission-updaters.js b/keyserver/src/updaters/thread-permission-updaters.js
rename from server/src/updaters/thread-permission-updaters.js
rename to keyserver/src/updaters/thread-permission-updaters.js
diff --git a/server/src/updaters/thread-updaters.js b/keyserver/src/updaters/thread-updaters.js
rename from server/src/updaters/thread-updaters.js
rename to keyserver/src/updaters/thread-updaters.js
diff --git a/server/src/updaters/upload-updaters.js b/keyserver/src/updaters/upload-updaters.js
rename from server/src/updaters/upload-updaters.js
rename to keyserver/src/updaters/upload-updaters.js
diff --git a/server/src/updaters/user-subscription-updaters.js b/keyserver/src/updaters/user-subscription-updaters.js
rename from server/src/updaters/user-subscription-updaters.js
rename to keyserver/src/updaters/user-subscription-updaters.js
diff --git a/server/src/uploads/media-utils.js b/keyserver/src/uploads/media-utils.js
rename from server/src/uploads/media-utils.js
rename to keyserver/src/uploads/media-utils.js
diff --git a/server/src/uploads/uploads.js b/keyserver/src/uploads/uploads.js
rename from server/src/uploads/uploads.js
rename to keyserver/src/uploads/uploads.js
diff --git a/server/src/utils/depth-queue.js b/keyserver/src/utils/depth-queue.js
rename from server/src/utils/depth-queue.js
rename to keyserver/src/utils/depth-queue.js
diff --git a/server/src/utils/idempotent.js b/keyserver/src/utils/idempotent.js
rename from server/src/utils/idempotent.js
rename to keyserver/src/utils/idempotent.js
diff --git a/server/src/utils/json-stream.js b/keyserver/src/utils/json-stream.js
rename from server/src/utils/json-stream.js
rename to keyserver/src/utils/json-stream.js
diff --git a/server/src/utils/olm-utils.js b/keyserver/src/utils/olm-utils.js
rename from server/src/utils/olm-utils.js
rename to keyserver/src/utils/olm-utils.js
diff --git a/server/src/utils/relationship-changeset.js b/keyserver/src/utils/relationship-changeset.js
rename from server/src/utils/relationship-changeset.js
rename to keyserver/src/utils/relationship-changeset.js
diff --git a/server/src/utils/security-utils.js b/keyserver/src/utils/security-utils.js
rename from server/src/utils/security-utils.js
rename to keyserver/src/utils/security-utils.js
diff --git a/server/src/utils/urls.js b/keyserver/src/utils/urls.js
rename from server/src/utils/urls.js
rename to keyserver/src/utils/urls.js
diff --git a/server/src/utils/validation-utils.js b/keyserver/src/utils/validation-utils.js
rename from server/src/utils/validation-utils.js
rename to keyserver/src/utils/validation-utils.js
diff --git a/server/src/web b/keyserver/src/web
rename from server/src/web
rename to keyserver/src/web
diff --git a/landing/webpack.config.cjs b/landing/webpack.config.cjs
--- a/landing/webpack.config.cjs
+++ b/landing/webpack.config.cjs
@@ -18,7 +18,7 @@
   },
   resolve: {
     alias: {
-      '../images': path.resolve('../server/images'),
+      '../images': path.resolve('../keyserver/images'),
     },
   },
 };
diff --git a/native/.flowconfig b/native/.flowconfig
--- a/native/.flowconfig
+++ b/native/.flowconfig
@@ -11,7 +11,7 @@
 .*/Libraries/Utilities/LoadingView.js
 
 .*/comm/web/.*
-.*/comm/server/.*
+.*/comm/keyserver/.*
 
 .*/android/app/build/.*
 
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -5,11 +5,11 @@
     "lib",
     "web",
     "native",
-    "server",
+    "keyserver",
     "landing"
   ],
   "scripts": {
-    "clean": "yarn workspace lib clean && yarn workspace web clean && yarn workspace native clean && yarn workspace server clean && yarn workspace landing clean && rm -rf node_modules/",
+    "clean": "yarn workspace lib clean && yarn workspace web clean && yarn workspace native clean && yarn workspace keyserver clean && yarn workspace landing clean && rm -rf node_modules/",
     "cleaninstall": "yarn clean && yarn",
     "eslint": "eslint .",
     "eslint:fix": "eslint --fix .",
diff --git a/web/webpack.config.cjs b/web/webpack.config.cjs
--- a/web/webpack.config.cjs
+++ b/web/webpack.config.cjs
@@ -18,7 +18,7 @@
   },
   resolve: {
     alias: {
-      '../images': path.resolve('../server/images'),
+      '../images': path.resolve('../keyserver/images'),
     },
   },
 };
@@ -52,7 +52,7 @@
 const baseNodeServerRenderingConfig = {
   externals: ['react', 'react-dom', 'react-redux'],
   entry: {
-    server: ['./app.react.js'],
+    keyserver: ['./app.react.js'],
   },
   output: {
     filename: 'app.build.cjs',