diff --git a/keyserver/src/scripts/create-db.js b/keyserver/src/database/setup-db.js
copy from keyserver/src/scripts/create-db.js
copy to keyserver/src/database/setup-db.js
--- a/keyserver/src/scripts/create-db.js
+++ b/keyserver/src/database/setup-db.js
@@ -11,18 +11,11 @@
 import { createThread } from '../creators/thread-creator';
 import { dbQuery, SQL } from '../database/database';
 import { createScriptViewer } from '../session/scripts';
-import { endScript } from './utils';
-
-async function main() {
-  try {
-    await createTables();
-    await createUsers();
-    await createThreads();
-    endScript();
-  } catch (e) {
-    endScript();
-    console.warn(e);
-  }
+
+async function setupDB() {
+  await createTables();
+  await createUsers();
+  await createThreads();
 }
 
 async function createTables() {
@@ -404,4 +397,4 @@
   );
 }
 
-main();
+export { setupDB };
diff --git a/keyserver/src/scripts/create-db.js b/keyserver/src/scripts/create-db.js
--- a/keyserver/src/scripts/create-db.js
+++ b/keyserver/src/scripts/create-db.js
@@ -1,407 +1,6 @@
 // @flow
 
-import ashoat from 'lib/facts/ashoat';
-import bots from 'lib/facts/bots';
-import genesis from 'lib/facts/genesis';
-import { usernameMaxLength } from 'lib/shared/account-utils';
-import { sortIDs } from 'lib/shared/relationship-utils';
-import { undirectedStatus } from 'lib/types/relationship-types';
-import { threadTypes } from 'lib/types/thread-types';
+import { setupDB } from '../database/setup-db';
+import { main } from './utils';
 
-import { createThread } from '../creators/thread-creator';
-import { dbQuery, SQL } from '../database/database';
-import { createScriptViewer } from '../session/scripts';
-import { endScript } from './utils';
-
-async function main() {
-  try {
-    await createTables();
-    await createUsers();
-    await createThreads();
-    endScript();
-  } catch (e) {
-    endScript();
-    console.warn(e);
-  }
-}
-
-async function createTables() {
-  await dbQuery(
-    SQL`
-      CREATE TABLE cookies (
-        id bigint(20) NOT NULL,
-        hash char(60) NOT NULL,
-        user bigint(20) DEFAULT NULL,
-        platform varchar(255) DEFAULT NULL,
-        creation_time bigint(20) NOT NULL,
-        last_used bigint(20) NOT NULL,
-        device_token varchar(255) DEFAULT NULL,
-        versions json DEFAULT NULL,
-        \`primary\` TINYINT(1) DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE days (
-        id bigint(20) NOT NULL,
-        date date NOT NULL,
-        thread bigint(20) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE entries (
-        id bigint(20) NOT NULL,
-        day bigint(20) NOT NULL,
-        text mediumtext COLLATE utf8mb4_bin NOT NULL,
-        creator bigint(20) NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        last_update bigint(20) NOT NULL,
-        deleted tinyint(1) UNSIGNED NOT NULL,
-        creation varchar(255) COLLATE utf8mb4_bin DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE focused (
-        user bigint(20) NOT NULL,
-        session bigint(20) NOT NULL,
-        thread bigint(20) NOT NULL,
-        time bigint(20) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE ids (
-        id bigint(20) NOT NULL,
-        table_name varchar(255) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE memberships (
-        thread bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        role bigint(20) NOT NULL,
-        permissions json DEFAULT NULL,
-        permissions_for_children json DEFAULT NULL,
-        creation_time bigint(20) NOT NULL,
-        subscription json NOT NULL,
-        last_message bigint(20) NOT NULL DEFAULT 0,
-        last_read_message bigint(20) NOT NULL DEFAULT 0,
-        sender tinyint(1) UNSIGNED NOT NULL DEFAULT 0
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE messages (
-        id bigint(20) NOT NULL,
-        thread bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        type tinyint(3) UNSIGNED NOT NULL,
-        content mediumtext COLLATE utf8mb4_bin,
-        time bigint(20) NOT NULL,
-        creation varchar(255) COLLATE utf8mb4_bin DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE notifications (
-        id bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        thread bigint(20) DEFAULT NULL,
-        message bigint(20) DEFAULT NULL,
-        collapse_key varchar(255) DEFAULT NULL,
-        delivery json NOT NULL,
-        rescinded tinyint(1) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE reports (
-        id bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        type tinyint(3) UNSIGNED NOT NULL,
-        platform varchar(255) NOT NULL,
-        report json NOT NULL,
-        creation_time bigint(20) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE revisions (
-        id bigint(20) NOT NULL,
-        entry bigint(20) NOT NULL,
-        author bigint(20) NOT NULL,
-        text mediumtext COLLATE utf8mb4_bin NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        session bigint(20) NOT NULL,
-        last_update bigint(20) NOT NULL,
-        deleted tinyint(1) UNSIGNED NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE roles (
-        id bigint(20) NOT NULL,
-        thread bigint(20) NOT NULL,
-        name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL,
-        permissions json NOT NULL,
-        creation_time bigint(20) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE sessions (
-        id bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        cookie bigint(20) NOT NULL,
-        query json NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        last_update bigint(20) NOT NULL,
-        last_validated bigint(20) NOT NULL,
-        public_key char(116) DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE threads (
-        id bigint(20) NOT NULL,
-        type tinyint(3) NOT NULL,
-        name varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
-        description mediumtext COLLATE utf8mb4_bin,
-        parent_thread_id bigint(20) DEFAULT NULL,
-        containing_thread_id bigint(20) DEFAULT NULL,
-        community bigint(20) DEFAULT NULL,
-        depth int UNSIGNED NOT NULL DEFAULT 0,
-        default_role bigint(20) NOT NULL,
-        creator bigint(20) NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        color char(6) COLLATE utf8mb4_bin NOT NULL,
-        source_message bigint(20) DEFAULT NULL UNIQUE,
-        replies_count int UNSIGNED NOT NULL DEFAULT 0
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE updates (
-        id bigint(20) NOT NULL,
-        user bigint(20) NOT NULL,
-        type tinyint(3) UNSIGNED NOT NULL,
-        \`key\` bigint(20) DEFAULT NULL,
-        updater bigint(20) DEFAULT NULL,
-        target bigint(20) DEFAULT NULL,
-        content mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin,
-        time bigint(20) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE uploads (
-        id bigint(20) NOT NULL,
-        uploader bigint(20) NOT NULL,
-        container bigint(20) DEFAULT NULL,
-        type varchar(255) NOT NULL,
-        filename varchar(255) NOT NULL,
-        mime varchar(255) NOT NULL,
-        content longblob NOT NULL,
-        secret varchar(255) NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        extra json DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-      CREATE TABLE users (
-        id bigint(20) NOT NULL,
-        username varchar(${usernameMaxLength}) COLLATE utf8mb4_bin NOT NULL,
-        hash char(60) COLLATE utf8mb4_bin NOT NULL,
-        avatar varchar(191) COLLATE utf8mb4_bin DEFAULT NULL,
-        creation_time bigint(20) NOT NULL,
-        public_key char(116) DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE relationships_undirected (
-        user1 bigint(20) NOT NULL,
-        user2 bigint(20) NOT NULL,
-        status tinyint(1) UNSIGNED NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE relationships_directed (
-        user1 bigint(20) NOT NULL,
-        user2 bigint(20) NOT NULL,
-        status tinyint(1) UNSIGNED NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-      CREATE TABLE versions (
-        id bigint(20) NOT NULL,
-        code_version int(11) NOT NULL,
-        platform varchar(255) NOT NULL,
-        creation_time bigint(20) NOT NULL,
-        deploy_time bigint(20) DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-      CREATE TABLE one_time_keys (
-        session bigint(20) NOT NULL,
-        one_time_key char(43) NOT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-      CREATE TABLE user_messages (
-        recipient bigint(20) NOT NULL,
-        thread bigint(20) NOT NULL,
-        message bigint(20) NOT NULL,
-        time bigint(20) NOT NULL,
-        data mediumtext COLLATE utf8mb4_bin DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE settings (
-        user bigint(20) NOT NULL,
-        name varchar(255) NOT NULL,
-        data mediumtext COLLATE utf8mb4_bin DEFAULT NULL
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin;
-
-      CREATE TABLE metadata (
-        name varchar(255) NOT NULL,
-        data varchar(255)
-      ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
-      ALTER TABLE cookies
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY device_token (device_token),
-        ADD KEY user_device_token (user,device_token);
-
-      ALTER TABLE days
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY date_thread (date,thread) USING BTREE;
-
-      ALTER TABLE entries
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY creator_creation (creator,creation),
-        ADD KEY day (day);
-
-      ALTER TABLE focused
-        ADD UNIQUE KEY user_cookie_thread (user,session,thread),
-        ADD KEY thread_user (thread,user);
-
-      ALTER TABLE ids
-        ADD PRIMARY KEY (id);
-
-      ALTER TABLE memberships
-        ADD UNIQUE KEY thread_user (thread,user) USING BTREE,
-        ADD KEY role (role) USING BTREE;
-
-      ALTER TABLE memberships ADD INDEX user (user);
-
-      ALTER TABLE messages
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY user_creation (user,creation),
-        ADD KEY thread (thread);
-
-      ALTER TABLE notifications
-        ADD PRIMARY KEY (id),
-        ADD KEY rescinded_user_collapse_key (rescinded,user,collapse_key)
-          USING BTREE,
-        ADD KEY thread (thread),
-        ADD KEY rescinded_user_thread_message (rescinded,user,thread,message)
-          USING BTREE;
-
-      ALTER TABLE notifications ADD INDEX user (user);
-
-      ALTER TABLE reports
-        ADD PRIMARY KEY (id);
-
-      ALTER TABLE revisions
-        ADD PRIMARY KEY (id),
-        ADD KEY entry (entry);
-
-      ALTER TABLE roles
-        ADD PRIMARY KEY (id),
-        ADD KEY thread (thread);
-
-      ALTER TABLE sessions
-        ADD PRIMARY KEY (id),
-        ADD KEY user (user),
-        ADD UNIQUE INDEX public_key (public_key);
-
-      ALTER TABLE threads
-        ADD PRIMARY KEY (id),
-        ADD INDEX parent_thread_id (parent_thread_id),
-        ADD INDEX containing_thread_id (containing_thread_id),
-        ADD INDEX community (community);
-
-      ALTER TABLE updates
-        ADD PRIMARY KEY (id),
-        ADD INDEX user_time (user,time),
-        ADD INDEX target_time (target, time),
-        ADD INDEX user_key_target_type_time (user, \`key\`, target, type, time),
-        ADD INDEX user_key_type_time (user, \`key\`, type, time),
-        ADD INDEX user_key_time (user, \`key\`, time);
-
-      ALTER TABLE uploads
-        ADD PRIMARY KEY (id);
-
-      ALTER TABLE users
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY username (username),
-        ADD UNIQUE INDEX public_key (public_key);
-
-      ALTER TABLE relationships_undirected
-        ADD UNIQUE KEY user1_user2 (user1,user2),
-        ADD UNIQUE KEY user2_user1 (user2,user1);
-
-      ALTER TABLE relationships_directed
-        ADD UNIQUE KEY user1_user2 (user1,user2),
-        ADD UNIQUE KEY user2_user1 (user2,user1);
-
-      ALTER TABLE versions
-        ADD PRIMARY KEY (id),
-        ADD UNIQUE KEY code_version_platform (code_version,platform);
-
-      ALTER TABLE one_time_keys
-        ADD PRIMARY KEY (session, one_time_key);
-
-      ALTER TABLE user_messages
-        ADD INDEX recipient_time (recipient, time),
-        ADD INDEX recipient_thread_time (recipient, thread, time),
-        ADD INDEX thread (thread),
-        ADD PRIMARY KEY (recipient, message);
-
-      ALTER TABLE ids
-        MODIFY id bigint(20) NOT NULL AUTO_INCREMENT;
-
-      ALTER TABLE settings
-        ADD PRIMARY KEY (user, name);
-
-      ALTER TABLE metadata
-        ADD PRIMARY KEY (name);
-    `,
-    { multipleStatements: true },
-  );
-}
-
-async function createUsers() {
-  const [user1, user2] = sortIDs(bots.commbot.userID, ashoat.id);
-  await dbQuery(
-    SQL`
-      INSERT INTO ids (id, table_name)
-        VALUES
-          (${bots.commbot.userID}, 'users'),
-          (${ashoat.id}, 'users');
-      INSERT INTO users (id, username, hash, avatar, creation_time)
-        VALUES
-          (${bots.commbot.userID}, 'commbot', '', NULL, 1530049900980),
-          (${ashoat.id}, 'ashoat', '', NULL, 1463588881886);
-      INSERT INTO relationships_undirected (user1, user2, status)
-        VALUES (${user1}, ${user2}, ${undirectedStatus.KNOW_OF});
-    `,
-    { multipleStatements: true },
-  );
-}
-
-const createThreadOptions = { forceAddMembers: true };
-
-async function createThreads() {
-  const insertIDsPromise = dbQuery(SQL`
-    INSERT INTO ids (id, table_name)
-    VALUES
-      (${genesis.id}, 'threads'),
-      (${bots.commbot.staffThreadID}, 'threads')
-  `);
-
-  const ashoatViewer = createScriptViewer(ashoat.id);
-  const createGenesisPromise = createThread(
-    ashoatViewer,
-    {
-      id: genesis.id,
-      type: threadTypes.GENESIS,
-      name: genesis.name,
-      description: genesis.description,
-      initialMemberIDs: [bots.commbot.userID],
-    },
-    createThreadOptions,
-  );
-  await Promise.all([insertIDsPromise, createGenesisPromise]);
-
-  const commbotViewer = createScriptViewer(bots.commbot.userID);
-  await createThread(
-    commbotViewer,
-    {
-      id: bots.commbot.staffThreadID,
-      type: threadTypes.COMMUNITY_SECRET_SUBTHREAD,
-      initialMemberIDs: [ashoat.id],
-    },
-    createThreadOptions,
-  );
-}
-
-main();
+main([setupDB]);