diff --git a/.gitignore b/.gitignore
index b2408ff..97ff4e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,24 @@
-/buildtools
\ No newline at end of file
+# dependencies
+/node_modules
+/.pnp
+.pnp.js
+
+# testing
+/coverage
+
+# production
+/build
+
+# Generated protocol buffers files
+/src/proto
+
+# misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
\ No newline at end of file
diff --git a/.idea/hexmap.iml b/.idea/hexmap.iml
index 1accc2b..37aa69b 100644
--- a/.idea/hexmap.iml
+++ b/.idea/hexmap.iml
@@ -13,6 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/mage" />
       <excludeFolder url="file://$MODULE_DIR$/buildtools" />
+      <excludeFolder url="file://$MODULE_DIR$/client/coverage" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/.idea/protoeditor.xml b/.idea/protoeditor.xml
index 8af70d2..d2a93c6 100644
--- a/.idea/protoeditor.xml
+++ b/.idea/protoeditor.xml
@@ -5,7 +5,7 @@
     <option name="importPathEntries">
       <list>
         <ImportPathEntry>
-          <option name="location" value="jar://$APPLICATION_PLUGINS_DIR$/protobuf-editor.jar!/include" />
+          <option name="location" value="jar://$APPLICATION_PLUGINS_DIR$/protoeditor/lib/protoeditor.jar!/protobuf" />
         </ImportPathEntry>
         <ImportPathEntry>
           <option name="location" value="file://$PROJECT_DIR$/proto" />
diff --git a/client/README.md b/README.md
similarity index 100%
rename from client/README.md
rename to README.md
diff --git a/build/build.go b/build/build.go
deleted file mode 100644
index 4fc9ef6..0000000
--- a/build/build.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package build
-
-import (
-	"context"
-	"github.com/magefile/mage/mg"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-const ToolsDir = "buildtools"
-
-func HasExecutableInTools(name string) (bool, error) {
-	info, err := os.Stat(filepath.Join(ToolsDir, name))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		} else {
-			return false, err
-		}
-	}
-	if info.Mode()&0100 != 0 {
-		return true, nil
-	} else {
-		return false, nil
-	}
-}
-
-func InstallGoExecutable(ctx context.Context, packageNameWithVersion string) error {
-	tooldir, err := filepath.Abs(ToolsDir)
-	if err != nil {
-		return err
-	}
-	cmd := exec.CommandContext(ctx, "go", "install", packageNameWithVersion)
-	cmd.Env = append(os.Environ(), "GOBIN="+tooldir)
-	cmd.Stderr = os.Stderr
-	if mg.Verbose() {
-		cmd.Stdout = os.Stdout
-	}
-	return cmd.Run()
-}
diff --git a/client/.gitignore b/client/.gitignore
deleted file mode 100644
index e314dd4..0000000
--- a/client/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# testing
-/coverage
-
-# production
-/build
-
-# Generated protocol buffers files
-/src/proto
-
-# misc
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/client/magefile.go b/client/magefile.go
deleted file mode 100644
index 0f9b681..0000000
--- a/client/magefile.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package client
-
-import (
-	"context"
-	"git.reya.zone/reya/hexmap/build"
-	"git.reya.zone/reya/hexmap/proto"
-	"github.com/magefile/mage/mg"
-	"github.com/magefile/mage/target"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-func NPMInstall(ctx context.Context) error {
-	var packageLockOutOfDate, nodeModulesOutOfDate bool
-	var err error
-	if packageLockOutOfDate, err = target.Path("client/package-lock.json", "client/package-lock.json"); err != nil {
-		return err
-	}
-	if nodeModulesOutOfDate, err = target.Dir("client/node_modules", "client/package.json"); err != nil {
-		return err
-	}
-	if !(packageLockOutOfDate || nodeModulesOutOfDate) {
-		return nil
-	}
-	cmd := exec.CommandContext(ctx, "npm", "install")
-	cmd.Dir, err = filepath.Abs("client")
-	if err != nil {
-		return err
-	}
-	cmd.Stderr = os.Stderr
-	if mg.Verbose() {
-		cmd.Stdout = os.Stdout
-	}
-	return nil
-}
-
-func ProtocFlags() ([]string, error) {
-	buildPath, err := filepath.Abs(filepath.Join(build.ToolsDir, "protoc-gen-ts_proto"))
-	if err != nil {
-		return nil, err
-	}
-	return []string{
-		"--plugin=" + buildPath,
-		"--ts_proto_out=client/src/proto/",
-		"--ts_proto_opt=env=browser",
-		"--ts_proto_opt=esModuleInterop=true",
-	}, nil
-}
-
-type Protobuf mg.Namespace
-
-const TSPluginNPMLocation = "client/node_modules/.bin/protoc-gen-ts_proto"
-
-func (Protobuf) InstallTSPlugin(ctx context.Context) error {
-	mg.CtxDeps(ctx, NPMInstall)
-	buildPath, err := filepath.Abs(filepath.Join(build.ToolsDir, "protoc-gen-ts_proto"))
-	if err != nil {
-		return err
-	}
-	sourcePath, err := filepath.Abs(TSPluginNPMLocation)
-	if err != nil {
-		return err
-	}
-	// Errors here just mean we move on to the next step - this could not exist or not be a link, we don't care.
-	// The important part is the later parts.
-	if linkPath, err := os.Readlink(buildPath); err == nil && linkPath == sourcePath {
-		return nil
-	}
-	// Remove whatever's in the way, if necessary.
-	err = os.Remove(buildPath)
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	err = os.Symlink(sourcePath, buildPath)
-	if err != nil && !os.IsExist(err) {
-		return err
-	}
-	return nil
-}
-
-func (Protobuf) MakeProtoDir() error {
-	if err := os.Mkdir("client/src/proto", 0755); err != nil && !os.IsExist(err) {
-		return err
-	}
-	return nil
-}
-
-func (Protobuf) InstallPlugins(ctx context.Context) error {
-	mg.CtxDeps(ctx, Protobuf.InstallTSPlugin, Protobuf.MakeProtoDir)
-	return nil
-}
-
-func (Protobuf) Build(ctx context.Context) error {
-	mg.SerialCtxDeps(ctx, Protobuf.Clean, Protobuf.InstallPlugins)
-	return proto.Compile(ctx, []proto.ProtocFlagsFunc{ProtocFlags})
-}
-
-func (Protobuf) Clean() error {
-	err := os.RemoveAll("client/src/proto")
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// TODO: Build
-// TODO: Clean
-// TODO: Serve
diff --git a/client/src/index.tsx b/client/src/index.tsx
deleted file mode 100644
index ef2edf8..0000000
--- a/client/src/index.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom';
-import './index.css';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
-
-ReactDOM.render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-  document.getElementById('root')
-);
-
-// If you want to start measuring performance in your app, pass a function
-// to log results (for example: reportWebVitals(console.log))
-// or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
diff --git a/go.mod b/go.mod
deleted file mode 100644
index 6d20048..0000000
--- a/go.mod
+++ /dev/null
@@ -1,12 +0,0 @@
-module git.reya.zone/reya/hexmap
-
-go 1.16
-
-require (
-	github.com/gorilla/websocket v1.4.2
-	github.com/magefile/mage v1.11.0
-	github.com/rs/xid v1.3.0
-	go.uber.org/zap v1.18.1
-	golang.org/x/tools v0.0.0-20210106214847-113979e3529a // indirect
-	google.golang.org/protobuf v1.27.1
-)
diff --git a/go.sum b/go.sum
deleted file mode 100644
index 72e0f0b..0000000
--- a/go.sum
+++ /dev/null
@@ -1,74 +0,0 @@
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
-github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
-github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/magefile/mage v1.11.0 h1:C/55Ywp9BpgVVclD3lRnSYCwXTYxmSppIgLeDYlNuls=
-github.com/magefile/mage v1.11.0/go.mod h1:z5UZb/iS3GoOSn0JgWuiw7dxlurVYTu+/jHXqQg881A=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
-go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.18.1 h1:CSUJ2mjFszzEWt4CdKISEuChVIXGBn3lAPwkRGyVrc4=
-go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/mage.sh b/mage.sh
deleted file mode 100755
index 2d4a567..0000000
--- a/mage.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eux
-
-PATH=${GOROOT}/bin:${PATH}
-SCRIPTPATH=$(readlink -e "${BASH_SOURCE[0]}")
-MAINPATH=${SCRIPTPATH%/*}
-BUILDTOOLSPATH=${MAINPATH}/buildtools
-MAGEPATH=${BUILDTOOLSPATH}/mage
-if [[ ! -x "$MAGEPATH" ]]; then
-  echo "go install-ing mage..."
-  mkdir -p "$BUILDTOOLSPATH"
-  GOBIN="$BUILDTOOLSPATH" go install github.com/magefile/mage@latest
-fi
-
-exec "$MAGEPATH" -d "$MAINPATH" -w "$MAINPATH" "$@"
diff --git a/magefile.go b/magefile.go
deleted file mode 100644
index 6b51256..0000000
--- a/magefile.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build mage
-
-package main
-
-import (
-	"context"
-	"git.reya.zone/reya/hexmap/proto"
-
-	// mage:import server
-	"git.reya.zone/reya/hexmap/server"
-	"github.com/magefile/mage/mg"
-
-	// mage:import client
-	"git.reya.zone/reya/hexmap/client"
-)
-
-type Protobuf mg.Namespace
-
-func (Protobuf) InstallPlugins(ctx context.Context) error {
-	mg.CtxDeps(ctx, server.Protobuf.InstallPlugins, client.Protobuf.InstallPlugins)
-	return nil
-}
-
-func (Protobuf) Build(ctx context.Context) error {
-	mg.SerialCtxDeps(ctx, Protobuf.Clean, Protobuf.InstallPlugins)
-	return proto.Compile(ctx, []proto.ProtocFlagsFunc{server.ProtocFlags, client.ProtocFlags})
-}
-
-func (Protobuf) Clean(ctx context.Context) error {
-	mg.CtxDeps(ctx, server.Protobuf.Clean, client.Protobuf.Clean)
-	return nil
-}
diff --git a/client/package-lock.json b/package-lock.json
similarity index 98%
rename from client/package-lock.json
rename to package-lock.json
index c0db8d1..f8a4af8 100644
--- a/client/package-lock.json
+++ b/package-lock.json
@@ -5,7 +5,6 @@
   "requires": true,
   "packages": {
     "": {
-      "name": "hexmap",
       "version": "0.1.0",
       "dependencies": {
         "@testing-library/jest-dom": "^5.14.1",
@@ -18,6 +17,7 @@
         "@types/react-dom": "^17.0.8",
         "base64-arraybuffer": "^0.2.0",
         "protobufjs": "^6.11.2",
+        "protoc-tools": "^3.11.3",
         "react": "^17.0.2",
         "react-color": "^2.19.3",
         "react-dom": "^17.0.2",
@@ -4464,6 +4464,14 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
+    "node_modules/asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "dependencies": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
     "node_modules/asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -4489,6 +4497,14 @@
         "util": "0.10.3"
       }
     },
+    "node_modules/assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/assert/node_modules/inherits": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
@@ -4586,6 +4602,19 @@
         "url": "https://tidelift.com/funding/github/npm/autoprefixer"
       }
     },
+    "node_modules/aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+    },
     "node_modules/axe-core": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.3.tgz",
@@ -5243,6 +5272,14 @@
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
     },
+    "node_modules/bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "dependencies": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
     "node_modules/bfj": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
@@ -5257,6 +5294,14 @@
         "node": ">= 8.0.0"
       }
     },
+    "node_modules/big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
     "node_modules/big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
@@ -5265,6 +5310,18 @@
         "node": "*"
       }
     },
+    "node_modules/binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "dependencies": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -5531,11 +5588,27 @@
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
     },
+    "node_modules/buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
     },
+    "node_modules/buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "engines": {
+        "node": ">=0.2.0"
+      }
+    },
     "node_modules/builtin-modules": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
@@ -5726,6 +5799,22 @@
         "node": ">=4"
       }
     },
+    "node_modules/caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "node_modules/chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "dependencies": {
+        "traverse": ">=0.3.0 <0.4"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -6775,6 +6864,17 @@
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
       "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw=="
     },
+    "node_modules/dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
     "node_modules/data-urls": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -7354,6 +7454,14 @@
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
     },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "node_modules/duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -7365,6 +7473,15 @@
         "stream-shift": "^1.0.0"
       }
     },
+    "node_modules/ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "dependencies": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
     "node_modules/ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -8798,6 +8915,11 @@
       "resolved": "https://registry.npmjs.org/type/-/type-2.5.0.tgz",
       "integrity": "sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw=="
     },
+    "node_modules/extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
     "node_modules/extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -8858,6 +8980,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "engines": [
+        "node >=0.6.0"
+      ]
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -9158,6 +9288,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/fork-ts-checker-webpack-plugin": {
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
@@ -9408,6 +9546,31 @@
         "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
+    "node_modules/fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "dependencies": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/fstream/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -9482,6 +9645,14 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dependencies": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "node_modules/glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -9610,6 +9781,27 @@
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
     },
+    "node_modules/har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "deprecated": "this library is no longer supported",
+      "dependencies": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
     "node_modules/harmony-reflect": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
@@ -10118,6 +10310,20 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      },
+      "engines": {
+        "node": ">=0.8",
+        "npm": ">=1.3.7"
+      }
+    },
     "node_modules/https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -10821,6 +11027,11 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
@@ -12859,6 +13070,11 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
     "node_modules/jsdom": {
       "version": "16.6.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
@@ -12936,6 +13152,11 @@
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
+    "node_modules/json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -12946,6 +13167,11 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
     "node_modules/json3": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
@@ -12976,6 +13202,20 @@
         "graceful-fs": "^4.1.6"
       }
     },
+    "node_modules/jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
     "node_modules/jsx-ast-utils": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
@@ -13064,6 +13304,11 @@
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
     },
+    "node_modules/listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc="
+    },
     "node_modules/load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -13921,6 +14166,14 @@
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
     },
+    "node_modules/oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -16132,6 +16385,29 @@
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.2.tgz",
       "integrity": "sha512-jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="
     },
+    "node_modules/protoc-tools": {
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/protoc-tools/-/protoc-tools-3.11.3.tgz",
+      "integrity": "sha512-BQVe4YT41eAvaJPhyyZD5hhJaivMaqYJRPj1oMEaRW/0+L2uNSKKYXnsZPIb+6QRw/fmproy72CD7zhqWJN3KQ==",
+      "cpu": [
+        "x64",
+        "x32",
+        "ia32"
+      ],
+      "hasInstallScript": true,
+      "os": [
+        "darwin",
+        "linux"
+      ],
+      "dependencies": {
+        "request": "^2.88.0",
+        "request-promise": "^4.2.5",
+        "unzipper": "^0.10.8"
+      },
+      "bin": {
+        "protoc": "tools/protoc-tools/bin/protoc"
+      }
+    },
     "node_modules/proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -17023,6 +17299,123 @@
         "node": ">=0.10"
       }
     },
+    "node_modules/request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "deprecated": "request has been deprecated, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/request-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
+      "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
+      "deprecated": "request-promise has been deprecated because it extends the now deprecated request package, see https://github.com/request/request/issues/3142",
+      "dependencies": {
+        "bluebird": "^3.5.0",
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "dependencies": {
+        "lodash": "^4.17.19"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "request": "^2.34"
+      }
+    },
+    "node_modules/request-promise/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/request/node_modules/form-data": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+      "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.6",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 0.12"
+      }
+    },
+    "node_modules/request/node_modules/qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "engines": {
+        "node": ">=0.6"
+      }
+    },
+    "node_modules/request/node_modules/tough-cookie": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+      "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+      "dependencies": {
+        "psl": "^1.1.28",
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/request/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "bin": {
+        "uuid": "bin/uuid"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -18442,6 +18835,30 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
+    "node_modules/sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "dependencies": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      },
+      "bin": {
+        "sshpk-conv": "bin/sshpk-conv",
+        "sshpk-sign": "bin/sshpk-sign",
+        "sshpk-verify": "bin/sshpk-verify"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -18578,6 +18995,14 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -19436,6 +19861,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -19541,6 +19974,22 @@
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
     },
+    "node_modules/tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dependencies": {
+        "safe-buffer": "^5.0.1"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
     "node_modules/type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
@@ -19787,6 +20236,28 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/unzipper": {
+      "version": "0.10.11",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+      "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+      "dependencies": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      }
+    },
+    "node_modules/unzipper/node_modules/bluebird": {
+      "version": "3.4.7",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+      "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM="
+    },
     "node_modules/upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -19994,6 +20465,19 @@
         "url": "https://github.com/sponsors/wooorm"
       }
     },
+    "node_modules/verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "engines": [
+        "node >=0.6.0"
+      ],
+      "dependencies": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
@@ -25061,6 +25545,14 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
     },
+    "asn1": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+      "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+      "requires": {
+        "safer-buffer": "~2.1.0"
+      }
+    },
     "asn1.js": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz",
@@ -25103,6 +25595,11 @@
         }
       }
     },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
+    },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
@@ -25165,6 +25662,16 @@
         "postcss-value-parser": "^4.1.0"
       }
     },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg="
+    },
+    "aws4": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
+      "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
+    },
     "axe-core": {
       "version": "4.2.3",
       "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.2.3.tgz",
@@ -25691,6 +26198,14 @@
       "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
       "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY="
     },
+    "bcrypt-pbkdf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+      "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+      "requires": {
+        "tweetnacl": "^0.14.3"
+      }
+    },
     "bfj": {
       "version": "7.0.2",
       "resolved": "https://registry.npmjs.org/bfj/-/bfj-7.0.2.tgz",
@@ -25702,11 +26217,25 @@
         "tryer": "^1.0.1"
       }
     },
+    "big-integer": {
+      "version": "1.6.48",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.48.tgz",
+      "integrity": "sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w=="
+    },
     "big.js": {
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
       "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ=="
     },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "requires": {
+        "buffers": "~0.1.1",
+        "chainsaw": "~0.1.0"
+      }
+    },
     "binary-extensions": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
@@ -25938,11 +26467,21 @@
       "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
       "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
     },
+    "buffer-indexof-polyfill": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-indexof-polyfill/-/buffer-indexof-polyfill-1.0.2.tgz",
+      "integrity": "sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A=="
+    },
     "buffer-xor": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
       "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk="
     },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s="
+    },
     "builtin-modules": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz",
@@ -26085,6 +26624,19 @@
       "resolved": "https://registry.npmjs.org/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz",
       "integrity": "sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ=="
     },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "requires": {
+        "traverse": ">=0.3.0 <0.4"
+      }
+    },
     "chalk": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -26928,6 +27480,14 @@
       "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz",
       "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw=="
     },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "data-urls": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
@@ -27379,6 +27939,14 @@
       "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
     },
+    "duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=",
+      "requires": {
+        "readable-stream": "^2.0.2"
+      }
+    },
     "duplexify": {
       "version": "3.7.1",
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
@@ -27390,6 +27958,15 @@
         "stream-shift": "^1.0.0"
       }
     },
+    "ecc-jsbn": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+      "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+      "requires": {
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.1.0"
+      }
+    },
     "ee-first": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -28453,6 +29030,11 @@
         }
       }
     },
+    "extend": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+      "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
+    },
     "extend-shallow": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
@@ -28500,6 +29082,11 @@
         }
       }
     },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -28730,6 +29317,11 @@
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA="
     },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE="
+    },
     "fork-ts-checker-webpack-plugin": {
       "version": "4.1.6",
       "resolved": "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz",
@@ -28929,6 +29521,27 @@
       "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
       "optional": true
     },
+    "fstream": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.12.tgz",
+      "integrity": "sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==",
+      "requires": {
+        "graceful-fs": "^4.1.2",
+        "inherits": "~2.0.0",
+        "mkdirp": ">=0.5 0",
+        "rimraf": "2"
+      },
+      "dependencies": {
+        "rimraf": {
+          "version": "2.7.1",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+          "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+          "requires": {
+            "glob": "^7.1.3"
+          }
+        }
+      }
+    },
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -28982,6 +29595,14 @@
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg="
     },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "requires": {
+        "assert-plus": "^1.0.0"
+      }
+    },
     "glob": {
       "version": "7.1.7",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.7.tgz",
@@ -29081,6 +29702,20 @@
       "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
       "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
     },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI="
+    },
+    "har-validator": {
+      "version": "5.1.5",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz",
+      "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==",
+      "requires": {
+        "ajv": "^6.12.3",
+        "har-schema": "^2.0.0"
+      }
+    },
     "harmony-reflect": {
       "version": "1.6.2",
       "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.2.tgz",
@@ -29484,6 +30119,16 @@
         }
       }
     },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "jsprim": "^1.2.2",
+        "sshpk": "^1.7.0"
+      }
+    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -29968,6 +30613,11 @@
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8="
     },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo="
+    },
     "istanbul-lib-coverage": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
@@ -31469,6 +32119,11 @@
         "esprima": "^4.0.0"
       }
     },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM="
+    },
     "jsdom": {
       "version": "16.6.0",
       "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.6.0.tgz",
@@ -31525,6 +32180,11 @@
       "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
       "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM="
+    },
     "json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
@@ -31535,6 +32195,11 @@
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE="
     },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
     "json3": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
@@ -31557,6 +32222,17 @@
         "universalify": "^2.0.0"
       }
     },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
     "jsx-ast-utils": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz",
@@ -31627,6 +32303,11 @@
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz",
       "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA="
     },
+    "listenercount": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/listenercount/-/listenercount-1.0.1.tgz",
+      "integrity": "sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc="
+    },
     "load-json-file": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -32328,6 +33009,11 @@
       "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz",
       "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ=="
     },
+    "oauth-sign": {
+      "version": "0.9.0",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+      "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ=="
+    },
     "object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
@@ -34069,6 +34755,16 @@
         }
       }
     },
+    "protoc-tools": {
+      "version": "3.11.3",
+      "resolved": "https://registry.npmjs.org/protoc-tools/-/protoc-tools-3.11.3.tgz",
+      "integrity": "sha512-BQVe4YT41eAvaJPhyyZD5hhJaivMaqYJRPj1oMEaRW/0+L2uNSKKYXnsZPIb+6QRw/fmproy72CD7zhqWJN3KQ==",
+      "requires": {
+        "request": "^2.88.0",
+        "request-promise": "^4.2.5",
+        "unzipper": "^0.10.8"
+      }
+    },
     "proxy-addr": {
       "version": "2.0.7",
       "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -34775,6 +35471,94 @@
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
+    "request": {
+      "version": "2.88.2",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz",
+      "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==",
+      "requires": {
+        "aws-sign2": "~0.7.0",
+        "aws4": "^1.8.0",
+        "caseless": "~0.12.0",
+        "combined-stream": "~1.0.6",
+        "extend": "~3.0.2",
+        "forever-agent": "~0.6.1",
+        "form-data": "~2.3.2",
+        "har-validator": "~5.1.3",
+        "http-signature": "~1.2.0",
+        "is-typedarray": "~1.0.0",
+        "isstream": "~0.1.2",
+        "json-stringify-safe": "~5.0.1",
+        "mime-types": "~2.1.19",
+        "oauth-sign": "~0.9.0",
+        "performance-now": "^2.1.0",
+        "qs": "~6.5.2",
+        "safe-buffer": "^5.1.2",
+        "tough-cookie": "~2.5.0",
+        "tunnel-agent": "^0.6.0",
+        "uuid": "^3.3.2"
+      },
+      "dependencies": {
+        "form-data": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+          "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+          "requires": {
+            "asynckit": "^0.4.0",
+            "combined-stream": "^1.0.6",
+            "mime-types": "^2.1.12"
+          }
+        },
+        "qs": {
+          "version": "6.5.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+          "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA=="
+        },
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        },
+        "uuid": {
+          "version": "3.4.0",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+          "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="
+        }
+      }
+    },
+    "request-promise": {
+      "version": "4.2.6",
+      "resolved": "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz",
+      "integrity": "sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==",
+      "requires": {
+        "bluebird": "^3.5.0",
+        "request-promise-core": "1.1.4",
+        "stealthy-require": "^1.1.1",
+        "tough-cookie": "^2.3.3"
+      },
+      "dependencies": {
+        "tough-cookie": {
+          "version": "2.5.0",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
+          "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==",
+          "requires": {
+            "psl": "^1.1.28",
+            "punycode": "^2.1.1"
+          }
+        }
+      }
+    },
+    "request-promise-core": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz",
+      "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==",
+      "requires": {
+        "lodash": "^4.17.19"
+      }
+    },
     "require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -35926,6 +36710,22 @@
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
     },
+    "sshpk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+      "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+      "requires": {
+        "asn1": "~0.2.3",
+        "assert-plus": "^1.0.0",
+        "bcrypt-pbkdf": "^1.0.0",
+        "dashdash": "^1.12.0",
+        "ecc-jsbn": "~0.1.1",
+        "getpass": "^0.1.1",
+        "jsbn": "~0.1.0",
+        "safer-buffer": "^2.0.2",
+        "tweetnacl": "~0.14.0"
+      }
+    },
     "ssri": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
@@ -36034,6 +36834,11 @@
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
       "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow="
     },
+    "stealthy-require": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz",
+      "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks="
+    },
     "stream-browserify": {
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
@@ -36689,6 +37494,11 @@
         "punycode": "^2.1.1"
       }
     },
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
+    },
     "tryer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz",
@@ -36780,6 +37590,19 @@
       "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
       "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY="
     },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "requires": {
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q="
+    },
     "type": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/type/-/type-1.2.0.tgz",
@@ -36968,6 +37791,30 @@
         }
       }
     },
+    "unzipper": {
+      "version": "0.10.11",
+      "resolved": "https://registry.npmjs.org/unzipper/-/unzipper-0.10.11.tgz",
+      "integrity": "sha512-+BrAq2oFqWod5IESRjL3S8baohbevGcVA+teAIOYWM3pDVdseogqbzhhvvmiyQrUNKFUnDMtELW3X8ykbyDCJw==",
+      "requires": {
+        "big-integer": "^1.6.17",
+        "binary": "~0.3.0",
+        "bluebird": "~3.4.1",
+        "buffer-indexof-polyfill": "~1.0.0",
+        "duplexer2": "~0.1.4",
+        "fstream": "^1.0.12",
+        "graceful-fs": "^4.2.2",
+        "listenercount": "~1.0.1",
+        "readable-stream": "~2.3.6",
+        "setimmediate": "~1.0.4"
+      },
+      "dependencies": {
+        "bluebird": {
+          "version": "3.4.7",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.7.tgz",
+          "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM="
+        }
+      }
+    },
     "upath": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
@@ -37129,6 +37976,16 @@
       "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.4.tgz",
       "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="
     },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "requires": {
+        "assert-plus": "^1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "^1.2.0"
+      }
+    },
     "vm-browserify": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
diff --git a/client/package.json b/package.json
similarity index 79%
rename from client/package.json
rename to package.json
index da35f80..f18f66e 100644
--- a/client/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "@types/react-dom": "^17.0.8",
     "base64-arraybuffer": "^0.2.0",
     "protobufjs": "^6.11.2",
+    "protoc-tools": "^3.11.3",
     "react": "^17.0.2",
     "react-color": "^2.19.3",
     "react-dom": "^17.0.2",
@@ -22,8 +23,9 @@
     "web-vitals": "^1.1.2"
   },
   "scripts": {
+    "protoc": "mkdir -p src/proto && protoc -I=proto --plugin=node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=src/proto --ts_proto_opt=env=both --ts_proto_opt=esModuleInterop=true proto/*.proto",
     "start": "react-scripts start",
-    "build": "react-scripts build",
+    "build": "npm run protoc && react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
diff --git a/proto/action.proto b/proto/action.proto
index 52d6aca..ca283bf 100644
--- a/proto/action.proto
+++ b/proto/action.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 
 import "coords.proto";
 
-option go_package = "git.reya.zone/reya/hexmap/server/action";
-
 message CellSetColorPB {
   fixed32 color = 1;
   StorageCoordinatesPB at = 2;
diff --git a/proto/client.proto b/proto/client.proto
index 12ca311..56e2917 100644
--- a/proto/client.proto
+++ b/proto/client.proto
@@ -2,8 +2,6 @@ syntax = "proto3";
 
 import "action.proto";
 
-option go_package = "git.reya.zone/reya/hexmap/server/ws";
-
 message ClientHelloPB {
   uint32 version = 1;
 }
diff --git a/proto/coords.proto b/proto/coords.proto
index 78d2410..b8e5e2e 100644
--- a/proto/coords.proto
+++ b/proto/coords.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-option go_package = "git.reya.zone/reya/hexmap/server/state";
-
 message StorageCoordinatesPB {
   uint32 line = 1;
   uint32 cell = 2;
diff --git a/proto/magefile.go b/proto/magefile.go
deleted file mode 100644
index 96de9f6..0000000
--- a/proto/magefile.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package proto
-
-import (
-	"context"
-	"github.com/magefile/mage/mg"
-	"io/fs"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func BaseProtocFlags() ([]string, error) {
-	return []string{"-I=proto"}, nil
-}
-
-type ProtocFlagsFunc func() ([]string, error)
-
-func Sources() ([]string, error) {
-	result := []string(nil)
-	err := filepath.WalkDir("proto", func(path string, d fs.DirEntry, err error) error {
-		if err != nil {
-			return err
-		}
-		if !d.IsDir() && strings.HasSuffix(path, ".proto") {
-			result = append(result, path)
-		}
-		return nil
-	})
-	return result, err
-}
-
-func Compile(ctx context.Context, withPlugins []ProtocFlagsFunc) error {
-	flags, err := BaseProtocFlags()
-	if err != nil {
-		return err
-	}
-	for _, flagsFunc := range withPlugins {
-		pluginFlags, err := flagsFunc()
-		if err != nil {
-			return err
-		}
-		flags = append(flags, pluginFlags...)
-	}
-	protoFiles, err := Sources()
-	if err != nil {
-		return err
-	}
-	args := append(flags, protoFiles...)
-	cmd := exec.CommandContext(ctx, "protoc", args...)
-	cmd.Stderr = os.Stderr
-	if mg.Verbose() {
-		cmd.Stdout = os.Stdout
-	}
-	return cmd.Run()
-}
diff --git a/proto/map.proto b/proto/map.proto
index 0d89838..6f34a03 100644
--- a/proto/map.proto
+++ b/proto/map.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-option go_package = "git.reya.zone/reya/hexmap/server/state";
-
 message HexCellPB {
   fixed32 color = 1;
 }
diff --git a/proto/server.proto b/proto/server.proto
index 2cc3d0e..28b3501 100644
--- a/proto/server.proto
+++ b/proto/server.proto
@@ -3,8 +3,6 @@ syntax = "proto3";
 import "action.proto";
 import "state.proto";
 
-option go_package = "git.reya.zone/reya/hexmap/server/ws";
-
 message ServerHelloPB {
   uint32 version = 1;
   SyncableStatePB state = 2;
diff --git a/proto/state.proto b/proto/state.proto
index f7320b7..d4b8dff 100644
--- a/proto/state.proto
+++ b/proto/state.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-option go_package = "git.reya.zone/reya/hexmap/server/state";
-
 import "map.proto";
 import "user.proto";
 
diff --git a/proto/user.proto b/proto/user.proto
index 6939c98..0bbd253 100644
--- a/proto/user.proto
+++ b/proto/user.proto
@@ -1,7 +1,5 @@
 syntax = "proto3";
 
-option go_package = "git.reya.zone/reya/hexmap/server/state";
-
 message UserStatePB {
   fixed32 color = 1;
 }
\ No newline at end of file
diff --git a/client/public/favicon.ico b/public/favicon.ico
similarity index 100%
rename from client/public/favicon.ico
rename to public/favicon.ico
diff --git a/client/public/index.html b/public/index.html
similarity index 100%
rename from client/public/index.html
rename to public/index.html
diff --git a/client/public/logo192.png b/public/logo192.png
similarity index 100%
rename from client/public/logo192.png
rename to public/logo192.png
diff --git a/client/public/logo512.png b/public/logo512.png
similarity index 100%
rename from client/public/logo512.png
rename to public/logo512.png
diff --git a/client/public/manifest.json b/public/manifest.json
similarity index 100%
rename from client/public/manifest.json
rename to public/manifest.json
diff --git a/client/public/robots.txt b/public/robots.txt
similarity index 100%
rename from client/public/robots.txt
rename to public/robots.txt
diff --git a/server/.gitignore b/server/.gitignore
deleted file mode 100644
index 8374028..0000000
--- a/server/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pb.go
-proto/
\ No newline at end of file
diff --git a/server/action/action.go b/server/action/action.go
deleted file mode 100644
index 52d3bd8..0000000
--- a/server/action/action.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package action
-
-import (
-	"errors"
-	"git.reya.zone/reya/hexmap/server/state"
-	"go.uber.org/zap/zapcore"
-)
-
-var (
-	// ErrNoOp is returned when an action has no effect.
-	ErrNoOp = errors.New("action's effects were already applied, or it's an empty action")
-	// ErrNoTransparentColors is returned when a user tries to set their active color or a cell color to transparent.
-	// Transparent here is defined as having an alpha component of less than 15 (0xF).
-	ErrNoTransparentColors = errors.New("transparent colors not allowed")
-)
-
-// Action is the interface for actions that can be shared between clients, or between the server and a client.
-type Action interface {
-	zapcore.ObjectMarshaler
-	// Apply causes the action's effects to be applied to s, mutating it in place.
-	// All Actions must conform to the standard that if an action can't be correctly applied, or if it would
-	// have no effect, it returns an error without changing s.
-	// If an action can be correctly applied but would have no effect, it should return ErrNoOp.
-	// If an action is correctly applied and has an effect, it should return nil.
-	Apply(s *state.Synced) error
-}
-
-type Client interface {
-	Server
-	// ToClientPB converts the action into a client action protocol buffer.
-	ToClientPB() *ClientActionPB
-}
-
-type Server interface {
-	Action
-	// ToServerPB converts the action into a server action protocol buffer.
-	ToServerPB() *ServerActionPB
-}
-
-func serverPBFromClient(c Client) *ServerActionPB {
-	return &ServerActionPB{
-		Action: &ServerActionPB_Client{Client: c.ToClientPB()},
-	}
-}
-
-type ServerSlice []Server
-
-func (s ServerSlice) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	var finalErr error = nil
-	for _, a := range s {
-		err := encoder.AppendObject(a)
-		if err != nil && finalErr == nil {
-			finalErr = err
-		}
-	}
-	return finalErr
-}
-
-// CellColor is the action sent when a cell of the map has been colored a different color.
-type CellColor struct {
-	// At is the location of the cell in storage coordinates.
-	At state.StorageCoordinates `json:"at"`
-	// Color is the color the cell has been changed to.
-	Color state.Color `json:"color"`
-}
-
-func (c CellColor) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "CellColor")
-	err := encoder.AddObject("at", c.At)
-	encoder.AddString("color", c.Color.String())
-	return err
-}
-
-// Apply sets the target cell's color, or returns ErrNoOp if it can't.
-func (c CellColor) Apply(s *state.Synced) error {
-	if c.Color.A < 0xF {
-		return ErrNoTransparentColors
-	}
-	cell, err := s.Map.Layer.GetCellAt(c.At)
-	if err != nil {
-		return err
-	}
-	if cell.Color == c.Color {
-		return ErrNoOp
-	}
-	cell.Color = c.Color
-	return nil
-}
-
-// UserActiveColor is the action sent when the user's current color, the one being painted with, changes.
-type UserActiveColor struct {
-	// Color is the color that is now active.
-	Color state.Color `json:"color"`
-}
-
-func (c UserActiveColor) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "UserActiveColor")
-	encoder.AddString("color", c.Color.String())
-	return nil
-}
-
-// Apply sets the user's active color, or returns ErrNoOp if it can't.
-func (c UserActiveColor) Apply(s *state.Synced) error {
-	if c.Color.A < 0xF {
-		return ErrNoTransparentColors
-	}
-	if s.User.ActiveColor == c.Color {
-		return ErrNoOp
-	}
-	s.User.ActiveColor = c.Color
-	return nil
-}
-
-// IDed contains a pair of ID and Action, as sent by the client.
-type IDed struct {
-	// ID contains the arbitrary ID that was sent by the client, for identifying the action in future messages.
-	ID uint32 `json:"id"`
-	// Action contains the action that was actually being sent.
-	Action Client `json:"action"`
-}
-
-func (i IDed) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddUint32("id", i.ID)
-	return encoder.AddObject("action", i.Action)
-}
diff --git a/server/action/action.pbconv.go b/server/action/action.pbconv.go
deleted file mode 100644
index 3315d9e..0000000
--- a/server/action/action.pbconv.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package action
-
-import (
-	"git.reya.zone/reya/hexmap/server/state"
-)
-
-func (x *ServerActionPB) ToGo() (Server, error) {
-	switch action := x.Action.(type) {
-	case nil:
-		return nil, state.ErrOneofNotSet
-	case *ServerActionPB_Client:
-		return action.Client.ToGo()
-	default:
-		panic("A case was missed in ServerActionPB.ToGo!")
-	}
-}
-
-func (x *ClientActionPB) ToGo() (Client, error) {
-	if x == nil {
-		return nil, nil
-	}
-	switch action := x.Action.(type) {
-	case nil:
-		return nil, state.ErrOneofNotSet
-	case *ClientActionPB_CellSetColor:
-		return action.CellSetColor.ToGo()
-	case *ClientActionPB_UserSetActiveColor:
-		return action.UserSetActiveColor.ToGo(), nil
-	default:
-		panic("A case was missed in ClientActionPB.ToGo!")
-	}
-}
-
-func (x *CellSetColorPB) ToGo() (*CellColor, error) {
-	at, err := x.At.ToGo()
-	if err != nil {
-		return nil, err
-	}
-	return &CellColor{
-		At:    at,
-		Color: state.ColorFromRGBA8888(x.Color),
-	}, nil
-}
-
-func (c CellColor) ToServerPB() *ServerActionPB {
-	return serverPBFromClient(c)
-}
-
-func (c CellColor) ToClientPB() *ClientActionPB {
-	return &ClientActionPB{
-		Action: &ClientActionPB_CellSetColor{
-			CellSetColor: &CellSetColorPB{
-				Color: c.Color.ToRGBA8888(),
-				At:    c.At.ToPB(),
-			},
-		},
-	}
-}
-
-func (x *UserSetActiveColorPB) ToGo() *UserActiveColor {
-	return &UserActiveColor{
-		Color: state.ColorFromRGBA8888(x.Color),
-	}
-}
-
-func (c UserActiveColor) ToServerPB() *ServerActionPB {
-	return serverPBFromClient(c)
-}
-
-func (c UserActiveColor) ToClientPB() *ClientActionPB {
-	return &ClientActionPB{
-		Action: &ClientActionPB_UserSetActiveColor{
-			UserSetActiveColor: &UserSetActiveColorPB{
-				Color: c.Color.ToRGBA8888(),
-			},
-		},
-	}
-}
diff --git a/server/action/action.pbconv_test.go b/server/action/action.pbconv_test.go
deleted file mode 100644
index d1b0483..0000000
--- a/server/action/action.pbconv_test.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package action
-
-import (
-	"git.reya.zone/reya/hexmap/server/state"
-	"google.golang.org/protobuf/runtime/protoimpl"
-	"reflect"
-	"testing"
-)
-
-func TestCellColor_ToClientPB(t *testing.T) {
-	type fields struct {
-		At    state.StorageCoordinates
-		Color state.Color
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   *ClientActionPB
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := CellColor{
-				At:    tt.fields.At,
-				Color: tt.fields.Color,
-			}
-			if got := c.ToClientPB(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToClientPB() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestCellColor_ToServerPB(t *testing.T) {
-	type fields struct {
-		At    state.StorageCoordinates
-		Color state.Color
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   *ServerActionPB
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := CellColor{
-				At:    tt.fields.At,
-				Color: tt.fields.Color,
-			}
-			if got := c.ToServerPB(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToServerPB() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestCellSetColorPB_ToGo(t *testing.T) {
-	type fields struct {
-		state         protoimpl.MessageState
-		sizeCache     protoimpl.SizeCache
-		unknownFields protoimpl.UnknownFields
-		Color         uint32
-		At            *state.StorageCoordinatesPB
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		want    *CellColor
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			x := &CellSetColorPB{
-				state:         tt.fields.state,
-				sizeCache:     tt.fields.sizeCache,
-				unknownFields: tt.fields.unknownFields,
-				Color:         tt.fields.Color,
-				At:            tt.fields.At,
-			}
-			got, err := x.ToGo()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ToGo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToGo() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestClientActionPB_ToGo(t *testing.T) {
-	type fields struct {
-		state         protoimpl.MessageState
-		sizeCache     protoimpl.SizeCache
-		unknownFields protoimpl.UnknownFields
-		Action        isClientActionPB_Action
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		want    Client
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			x := &ClientActionPB{
-				state:         tt.fields.state,
-				sizeCache:     tt.fields.sizeCache,
-				unknownFields: tt.fields.unknownFields,
-				Action:        tt.fields.Action,
-			}
-			got, err := x.ToGo()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ToGo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToGo() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestServerActionPB_ToGo(t *testing.T) {
-	type fields struct {
-		state         protoimpl.MessageState
-		sizeCache     protoimpl.SizeCache
-		unknownFields protoimpl.UnknownFields
-		Action        isServerActionPB_Action
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		want    Server
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			x := &ServerActionPB{
-				state:         tt.fields.state,
-				sizeCache:     tt.fields.sizeCache,
-				unknownFields: tt.fields.unknownFields,
-				Action:        tt.fields.Action,
-			}
-			got, err := x.ToGo()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("ToGo() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToGo() got = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestUserActiveColor_ToClientPB(t *testing.T) {
-	type fields struct {
-		Color state.Color
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   *ClientActionPB
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := UserActiveColor{
-				Color: tt.fields.Color,
-			}
-			if got := c.ToClientPB(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToClientPB() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestUserActiveColor_ToServerPB(t *testing.T) {
-	type fields struct {
-		Color state.Color
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   *ServerActionPB
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := UserActiveColor{
-				Color: tt.fields.Color,
-			}
-			if got := c.ToServerPB(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToServerPB() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
-func TestUserSetActiveColorPB_ToGo(t *testing.T) {
-	type fields struct {
-		state         protoimpl.MessageState
-		sizeCache     protoimpl.SizeCache
-		unknownFields protoimpl.UnknownFields
-		Color         uint32
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   *UserActiveColor
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			x := &UserSetActiveColorPB{
-				state:         tt.fields.state,
-				sizeCache:     tt.fields.sizeCache,
-				unknownFields: tt.fields.unknownFields,
-				Color:         tt.fields.Color,
-			}
-			if got := x.ToGo(); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("ToGo() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/server/action/action_test.go b/server/action/action_test.go
deleted file mode 100644
index 466b30b..0000000
--- a/server/action/action_test.go
+++ /dev/null
@@ -1,190 +0,0 @@
-package action
-
-import (
-	"git.reya.zone/reya/hexmap/server/state"
-	"go.uber.org/zap/zapcore"
-	"reflect"
-	"testing"
-)
-
-func TestCellColor_Apply(t *testing.T) {
-	type fields struct {
-		At    state.StorageCoordinates
-		Color state.Color
-	}
-	type args struct {
-		s *state.Synced
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := CellColor{
-				At:    tt.fields.At,
-				Color: tt.fields.Color,
-			}
-			if err := c.Apply(tt.args.s); (err != nil) != tt.wantErr {
-				t.Errorf("Apply() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestCellColor_MarshalLogObject(t *testing.T) {
-	type fields struct {
-		At    state.StorageCoordinates
-		Color state.Color
-	}
-	type args struct {
-		encoder zapcore.ObjectEncoder
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := CellColor{
-				At:    tt.fields.At,
-				Color: tt.fields.Color,
-			}
-			if err := c.MarshalLogObject(tt.args.encoder); (err != nil) != tt.wantErr {
-				t.Errorf("MarshalLogObject() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestIDed_MarshalLogObject(t *testing.T) {
-	type fields struct {
-		ID     uint32
-		Action Client
-	}
-	type args struct {
-		encoder zapcore.ObjectEncoder
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			i := IDed{
-				ID:     tt.fields.ID,
-				Action: tt.fields.Action,
-			}
-			if err := i.MarshalLogObject(tt.args.encoder); (err != nil) != tt.wantErr {
-				t.Errorf("MarshalLogObject() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestServerSlice_MarshalLogArray(t *testing.T) {
-	type args struct {
-		encoder zapcore.ArrayEncoder
-	}
-	tests := []struct {
-		name    string
-		s       ServerSlice
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if err := tt.s.MarshalLogArray(tt.args.encoder); (err != nil) != tt.wantErr {
-				t.Errorf("MarshalLogArray() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestUserActiveColor_Apply(t *testing.T) {
-	type fields struct {
-		Color state.Color
-	}
-	type args struct {
-		s *state.Synced
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := UserActiveColor{
-				Color: tt.fields.Color,
-			}
-			if err := c.Apply(tt.args.s); (err != nil) != tt.wantErr {
-				t.Errorf("Apply() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func TestUserActiveColor_MarshalLogObject(t *testing.T) {
-	type fields struct {
-		Color state.Color
-	}
-	type args struct {
-		encoder zapcore.ObjectEncoder
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		wantErr bool
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c := UserActiveColor{
-				Color: tt.fields.Color,
-			}
-			if err := c.MarshalLogObject(tt.args.encoder); (err != nil) != tt.wantErr {
-				t.Errorf("MarshalLogObject() error = %v, wantErr %v", err, tt.wantErr)
-			}
-		})
-	}
-}
-
-func Test_serverPBFromClient(t *testing.T) {
-	type args struct {
-		c Client
-	}
-	tests := []struct {
-		name string
-		args args
-		want *ServerActionPB
-	}{
-		// TODO: Add test cases.
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if got := serverPBFromClient(tt.args.c); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("serverPBFromClient() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/server/host/HttpServer.go b/server/host/HttpServer.go
deleted file mode 100644
index 8469e86..0000000
--- a/server/host/HttpServer.go
+++ /dev/null
@@ -1,193 +0,0 @@
-package main
-
-import (
-	"context"
-	"git.reya.zone/reya/hexmap/server/room"
-	"git.reya.zone/reya/hexmap/server/state"
-	"git.reya.zone/reya/hexmap/server/ws"
-	"github.com/gorilla/websocket"
-	"go.uber.org/zap"
-	"google.golang.org/protobuf/proto"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"time"
-)
-
-const SaveDir = "/home/reya/hexmaps"
-
-func save(m state.HexMap, l *zap.Logger) error {
-	filename := filepath.Join(SaveDir, "map."+strconv.FormatInt(time.Now().Unix(), 16))
-	l.Debug("Saving to file", zap.String("filename", filename))
-	marshaled, err := proto.Marshal(m.ToPB())
-	l.Debug("Marshaled proto")
-	if err != nil {
-		return err
-	}
-	l.Debug("Opening file")
-	file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0x644)
-	if err != nil {
-		return err
-	}
-	l.Debug("Writing to file")
-	_, err = file.Write(marshaled)
-	if err != nil {
-		return err
-	}
-	l.Debug("Closing file")
-	err = file.Close()
-	if err != nil {
-		return err
-	}
-	l.Info("Saved to file", zap.String("filename", filename))
-	return nil
-}
-
-func load(l *zap.Logger) (*state.HexMap, error) {
-	filename := filepath.Join(SaveDir, "map.LOAD")
-	l.Debug("Loading from file", zap.String("filename", filename))
-	file, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	l.Debug("Reading file")
-	marshaled, err := ioutil.ReadAll(file)
-	if err != nil {
-		return nil, err
-	}
-	pb := &state.HexMapPB{}
-	l.Debug("Extracting protobuf from file")
-	err = proto.Unmarshal(marshaled, pb)
-	if err != nil {
-		return nil, err
-	}
-	l.Debug("Closing file")
-	err = file.Close()
-	if err != nil {
-		return nil, err
-	}
-	m, err := pb.ToGo()
-	if err != nil {
-		return nil, err
-	}
-	l.Info("Loaded from file", zap.String("filename", filename))
-	return &m, nil
-}
-
-func BackupMap(client *room.Client, l *zap.Logger) {
-	var err error
-	myState := &state.Synced{}
-	l.Info("Starting backup system")
-	for {
-		msg := <-client.IncomingChannel()
-		switch typedMsg := msg.(type) {
-		case *room.JoinResponse:
-			myState = typedMsg.CurrentState()
-			err := save(myState.Map, l)
-			if err != nil {
-				l.Error("Failed saving during join response", zap.Error(err))
-			}
-		case *room.ActionBroadcast:
-			err = typedMsg.Action().Apply(myState)
-			if err == nil {
-				err = save(myState.Map, l)
-				if err != nil {
-					l.Error("Failed saving during action broadcast", zap.Error(err))
-				}
-			}
-		case *room.ShutdownRequest:
-			client.OutgoingChannel() <- client.AcknowledgeShutdown()
-			return
-		}
-	}
-}
-
-func ServeWS(logger *zap.Logger) (err error) {
-	m := http.NewServeMux()
-	httpLogger := logger.Named("HTTP")
-	hexes, err := load(logger)
-	if err != nil {
-		hexes = state.NewHexMap(state.Layout{
-			Orientation:   state.PointyTop,
-			IndentedLines: state.EvenLines,
-		}, 25, 10)
-	}
-	rm := room.New(room.NewOptions{
-		BaseLogger: logger.Named("Room"),
-		StartingState: &state.Synced{
-			Map: *hexes,
-			User: state.UserState{
-				ActiveColor: state.Color{
-					R: 0,
-					G: 0,
-					B: 0,
-					A: 255,
-				},
-			},
-		},
-		StartingClientOptions: room.NewClientOptions{
-			IncomingChannel:      nil,
-			AcceptBroadcasts:     true,
-			RequestStartingState: true,
-		},
-	})
-	go BackupMap(rm, logger.Named("BackupMap"))
-	m.Handle("/map", &ws.HTTPHandler{
-		Upgrader: websocket.Upgrader{
-			Subprotocols: []string{"v1.hexmap.deliciousreya.net"},
-			CheckOrigin: func(r *http.Request) bool {
-				return r.Header.Get("Origin") == "https://hexmap.deliciousreya.net"
-			},
-		},
-		Logger: logger.Named("WS"),
-		Room:   rm,
-	})
-	srv := http.Server{
-		Addr:     "127.0.0.1:5238",
-		Handler:  m,
-		ErrorLog: zap.NewStdLog(httpLogger),
-	}
-	m.HandleFunc("/exit", func(writer http.ResponseWriter, request *http.Request) {
-		// Some light dissuasion of accidental probing.
-		// To keep good people out.
-		if request.FormValue("superSecretPassword") != "Gesture/Retrial5/Untrained/Countable/Extrude/Jeep/Cheese/Carbon" {
-			writer.WriteHeader(403)
-			_, err = writer.Write([]byte("... What are you trying to pull?"))
-			return
-		}
-		writer.WriteHeader(200)
-		_, err := writer.Write([]byte("OK, shutting down, bye!"))
-		if err != nil {
-			logger.Warn("Error while writing goodbye response", zap.Error(err))
-		}
-		time.AfterFunc(500*time.Millisecond, func() {
-			err := srv.Shutdown(context.Background())
-			if err != nil {
-				logger.Error("Error while shutting down the server", zap.Error(err))
-			}
-		})
-	})
-	err = srv.ListenAndServe()
-	if err != nil && err != http.ErrServerClosed {
-		return err
-	}
-	rm.OutgoingChannel() <- rm.Stop()
-	for {
-		msg := <-rm.IncomingChannel()
-		switch msg.(type) {
-		case *room.ShutdownRequest:
-			rm.OutgoingChannel() <- rm.AcknowledgeShutdown()
-			return nil
-		}
-	}
-}
-
-func main() {
-	logger, err := zap.NewDevelopment()
-	err = ServeWS(logger)
-	if err != nil {
-		logger.Fatal("Error while serving HTTP", zap.Error(err))
-	}
-}
diff --git a/server/magefile.go b/server/magefile.go
deleted file mode 100644
index fcdcf89..0000000
--- a/server/magefile.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package server
-
-import (
-	"context"
-	"fmt"
-	"git.reya.zone/reya/hexmap/build"
-	"git.reya.zone/reya/hexmap/proto"
-	"github.com/magefile/mage/mg"
-	"io/fs"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-// TODO: GoGet
-// TODO: Build
-// TODO: Clean
-
-type Protobuf mg.Namespace
-
-func (Protobuf) InstallGoPlugin(ctx context.Context) error {
-	alreadyDone, err := build.HasExecutableInTools("protoc-gen-go")
-	if err != nil {
-		return err
-	}
-	if alreadyDone {
-		return nil
-	}
-	return build.InstallGoExecutable(ctx, "google.golang.org/protobuf/cmd/protoc-gen-go@v1.27.1")
-}
-
-func (Protobuf) InstallPlugins(ctx context.Context) {
-	mg.CtxDeps(ctx, Protobuf.InstallGoPlugin)
-}
-
-func ProtocFlags() ([]string, error) {
-	buildPath, err := filepath.Abs(filepath.Join(build.ToolsDir, "protoc-gen-go"))
-	if err != nil {
-		return nil, err
-	}
-	return []string{"--plugin=" + buildPath, "--go_out=.", "--go_opt=module=git.reya.zone/reya/hexmap"}, nil
-}
-
-func (Protobuf) Build(ctx context.Context) error {
-	mg.SerialCtxDeps(ctx, Protobuf.Clean, Protobuf.InstallPlugins)
-	return proto.Compile(ctx, []proto.ProtocFlagsFunc{ProtocFlags})
-}
-
-func (Protobuf) Clean(ctx context.Context) error {
-	return filepath.WalkDir("server", func(path string, d fs.DirEntry, dirErr error) error {
-		if ctx.Err() != nil {
-			return ctx.Err()
-		}
-		if dirErr != nil {
-			return dirErr
-		}
-		if strings.HasSuffix(path, ".pb.go") && !d.IsDir() {
-			if mg.Verbose() {
-				fmt.Printf("Removing generated protobuf code at %s\n", path)
-			}
-			err := os.Remove(path)
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
diff --git a/server/persistence/persistence.go b/server/persistence/persistence.go
deleted file mode 100644
index dc7cf83..0000000
--- a/server/persistence/persistence.go
+++ /dev/null
@@ -1 +0,0 @@
-package persistence
diff --git a/server/room/actor.go b/server/room/actor.go
deleted file mode 100644
index 828b58b..0000000
--- a/server/room/actor.go
+++ /dev/null
@@ -1,273 +0,0 @@
-package room
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"git.reya.zone/reya/hexmap/server/state"
-	"github.com/rs/xid"
-	"go.uber.org/zap"
-)
-
-// act is the meat and potatoes of the room - it's responsible for actually running the room.
-// It will gracefully remove all clients before shutting down.
-func (r *room) act() {
-	defer r.gracefulShutdown()
-	r.logger.Info("Room starting up, listening for incoming actions")
-	for {
-		raw := <-r.incomingChannel
-		client := raw.ClientID()
-		msgLogger := r.logger.With(zap.Stringer("client", client))
-		msgLogger.Debug("Message received, handling", zap.Object("message", raw))
-		switch msg := raw.(type) {
-		case *JoinRequest:
-			r.addClient(msg.id, msg.returnChannel, msg.broadcast, msg.privateChannel)
-			r.acknowledgeJoin(msg.id, msg.wantCurrentState)
-		case *RefreshRequest:
-			r.sendRefresh(msg.id)
-		case *ApplyRequest:
-			msgLogger.Debug("Received action to apply from client", zap.Uint32("actionId", msg.action.ID))
-			result := r.applyAction(msg.action.Action)
-			if result == nil {
-				r.broadcastAction(client, msg.action.ID, msg.action.Action)
-			}
-			r.acknowledgeAction(client, msg.action.ID, result)
-		case *LeaveRequest:
-			// So long, then. We can close immediately here; they promised not to send any more messages after this
-			// unless we were shutting down, which we're not.
-			r.acknowledgeLeave(client)
-			r.closeClient(client)
-		case *StopRequest:
-			// As requested, we shut down. Our deferred gracefulShutdown will catch us as we fall.
-			msgLogger.Info("Received StopRequest from client, shutting down")
-			return
-		case *ShutdownResponse:
-			// Uh... thank... you. I'm not... Never mind. I guess this means you're leaving?
-			msgLogger.Error("Received unexpected ShutdownResponse from client while not shutting down")
-			r.closeClient(client)
-		default:
-			msgLogger.Warn("Ignoring unhandled message", zap.Object("message", msg))
-		}
-		msgLogger.Debug("Message handled, resuming listening")
-	}
-}
-
-// addClient records a client's presence in the client map.
-func (r *room) addClient(id xid.ID, returnChannel chan<- Message, broadcast bool, privateChannel bool) {
-	logger := r.logger.With(zap.Stringer("client", id))
-	logger.Debug("Adding client")
-	if client, ok := r.clients[id]; ok {
-		if client.outgoingChannel == returnChannel {
-			if broadcast == client.broadcast && privateChannel == client.privateChannel {
-				logger.Warn("Already have client when adding client")
-			} else {
-				logger.Error("Already have client but with different settings when adding client")
-			}
-		} else {
-			logger.Error("Already have a different client with the same id when adding client")
-		}
-		return
-	}
-	r.clients[id] = internalClient{
-		id:              id,
-		outgoingChannel: returnChannel,
-		broadcast:       broadcast,
-		privateChannel:  privateChannel,
-	}
-}
-
-// stateCopy creates and returns a fresh copy of the current state.
-// This avoids concurrent modification of the state while clients are reading it.
-func (r *room) stateCopy() *state.Synced {
-	s := r.currentState.Copy()
-	return &s
-}
-
-// acknowledgeJoin composes and sends a JoinResponse to the given client.
-func (r *room) acknowledgeJoin(id xid.ID, includeState bool) {
-	logger := r.logger.With(zap.Stringer("client", id))
-	client, ok := r.clients[id]
-	if !ok {
-		logger.Error("No such client when acknowledging join")
-		return
-	}
-	var s *state.Synced = nil
-	if includeState {
-		logger.Debug("Preparing state copy for client")
-		s = r.stateCopy()
-	}
-	logger.Debug("Sending JoinResponse to client")
-	client.outgoingChannel <- &JoinResponse{
-		id:           r.id,
-		currentState: s,
-	}
-}
-
-// sendRefresh composes and sends a RefreshResponse to the given client.
-func (r *room) sendRefresh(id xid.ID) {
-	logger := r.logger.With(zap.Stringer("client", id))
-	client, ok := r.clients[id]
-	if !ok {
-		logger.Error("No such client when sending refresh")
-		return
-	}
-	var s *state.Synced = nil
-	logger.Debug("Preparing state copy for client")
-	s = r.stateCopy()
-	logger.Debug("Sending RefreshResponse to client")
-	client.outgoingChannel <- &RefreshResponse{
-		id:           r.id,
-		currentState: s,
-	}
-}
-
-// applyAction applies an action to the state and returns the result of it.
-func (r *room) applyAction(action action.Action) error {
-	r.logger.Debug("Applying action", zap.Object("action", action))
-	return action.Apply(&r.currentState)
-}
-
-// broadcastAction sends an action to everyone other than the original client which requested it.
-func (r *room) broadcastAction(originalClientID xid.ID, originalActionID uint32, action action.Server) {
-	logger := r.logger.With(zap.Stringer("originalClient", originalClientID), zap.Uint32("actionID", originalActionID), zap.Object("action", action))
-	broadcast := ActionBroadcast{
-		id:               r.id,
-		originalClientID: originalClientID,
-		originalActionID: originalActionID,
-		action:           action,
-	}
-	logger.Debug("Broadcasting action to all clients")
-	for id, client := range r.clients {
-		if id.Compare(originalClientID) != 0 {
-			logger.Debug("Sending ActionBroadcast to client", zap.Stringer("client", id))
-			client.outgoingChannel <- &broadcast
-		}
-	}
-}
-
-// acknowledgeAction sends a response to the original client which requested an action.
-func (r *room) acknowledgeAction(id xid.ID, actionID uint32, error error) {
-	logger := r.logger.With(zap.Stringer("id", id), zap.Uint32("actionId", actionID), zap.Error(error))
-	logger.Debug("Responding to client with the status of its action")
-	client, ok := r.clients[id]
-	if !ok {
-		logger.Error("No such client when acknowledging action")
-		return
-	}
-	logger.Debug("Sending ApplyResponse to client")
-	client.outgoingChannel <- &ApplyResponse{
-		id:       id,
-		actionID: actionID,
-		result:   error,
-	}
-}
-
-// acknowledgeLeave causes the room to signal to the client that it has received and acknowledged the client's LeaveRequest,
-// and will not send any further messages.
-func (r *room) acknowledgeLeave(id xid.ID) {
-	logger := r.logger.With(zap.Stringer("client", id))
-	logger.Debug("Acknowledging client's leave request")
-	client, ok := r.clients[id]
-	if !ok {
-		logger.Error("No such client when acknowledging leave request")
-		return
-	}
-	logger.Debug("Sending LeaveResponse to client")
-	client.outgoingChannel <- &LeaveResponse{id: r.id}
-}
-
-// closeClient causes the room to remove the client with the given id from its clients.
-// This should only be used after a shutdown handshake between this client and the room has taken place.
-func (r *room) closeClient(id xid.ID) {
-	logger := r.logger.With(zap.Stringer("client", id))
-	logger.Debug("Closing client")
-	client, ok := r.clients[id]
-	if !ok {
-		logger.Error("Attempted to close a client that didn't exist")
-		return
-	}
-	if client.privateChannel {
-		logger.Debug("Closing outgoingChannel, as client has a privateChannel")
-		close(client.outgoingChannel)
-	}
-	delete(r.clients, id)
-}
-
-// gracefulShutdown causes the room to shut down cleanly, making sure that all clients have been removed.
-func (r *room) gracefulShutdown() {
-	defer r.finalShutdown()
-	if len(r.clients) == 0 {
-		// Nothing to do, we've already won.
-		r.logger.Debug("No remaining clients, so just shutting down")
-		return
-	}
-	r.requestShutdown()
-	for len(r.clients) > 0 {
-		raw := <-r.incomingChannel
-		client := raw.ClientID()
-		msgLogger := r.logger.With(zap.Stringer("client", client))
-		msgLogger.Debug("Post-shutdown message received, handling", zap.Object("message", raw))
-		switch msg := raw.(type) {
-		case *JoinRequest:
-			// Don't you hate it when someone comes to the desk right as you're getting ready to pack up?
-			// Can't ignore them - they have our channel, and they might be sending things to it. We have to add them
-			// and then immediately send them a ShutdownRequest and wait for them to answer it.
-			msgLogger.Debug("Received join request from client while shutting down")
-			r.addClient(msg.id, msg.returnChannel, msg.broadcast, msg.privateChannel)
-			r.requestShutdownFrom(client)
-		case *RefreshRequest:
-			// Ugh, seriously, now? Fine. You can have this - you might be our friend the persistence actor.
-			r.sendRefresh(client)
-		case *LeaveRequest:
-			// We sent them a shutdown already, so unfortunately, we can't close them immediately. We have to wait for
-			// them to tell us they've heard that we're shutting down.
-			msgLogger.Debug("Received leave request from client while shutting down")
-			r.acknowledgeLeave(client)
-		case *StopRequest:
-			// Yes. We're doing that. Check your inbox, I already sent you the shutdown.
-			msgLogger.Debug("Received stop request from client while shutting down")
-		case *ShutdownResponse:
-			// The only way we would be getting one of these is if the client knows it doesn't have to send us anything
-			// else. Therefore, we can remove them now.
-			// Similarly, we know that they'll receive the LeaveResponse they need and shut down.
-			// Like us, even if it sent a LeaveRequest before realizing we were shutting down, it would have gotten our
-			// ShutdownRequest and sent this before it could read the LeaveResponse, but it will wait for the
-			// LeaveResponse regardless.
-			msgLogger.Debug("Received shutdown confirmation from client")
-			r.closeClient(client)
-		default:
-			msgLogger.Debug("Ignoring irrelevant message from client while shutting down", zap.Object("message", raw))
-		}
-		msgLogger.Debug("Message handled, resuming listening and waiting to be safe to shut down", zap.Int("clientsLeft", len(r.clients)))
-	}
-	r.logger.Debug("All clients have acknowledged the ShutdownRequest, now shutting down")
-}
-
-// requestShutdown produces a ShutdownRequest and sends it to all clients to indicate that the room is shutting down.
-func (r *room) requestShutdown() {
-	r.logger.Debug("Alerting clients that shutdown is in progress", zap.Int("clientsLeft", len(r.clients)))
-	for id := range r.clients {
-		r.requestShutdownFrom(id)
-	}
-}
-
-// requestShutdownFrom produces a ShutdownRequest and sends it to the client with id to indicate that the room is
-// shutting down.
-func (r *room) requestShutdownFrom(id xid.ID) {
-	clientField := zap.Stringer("client", id)
-	r.logger.Debug("Alerting client that shutdown is in progress", clientField)
-	shutdown := ShutdownRequest{
-		id: r.id,
-	}
-	client, ok := r.clients[id]
-	if !ok {
-		r.logger.Error("No such client when requesting shutdown from client", clientField)
-	}
-	client.outgoingChannel <- &shutdown
-}
-
-// finalShutdown causes the room to do any final cleanup not involving its clients before stopping.
-// Use gracefulShutdown instead, which calls this once it's safe to do so.
-func (r *room) finalShutdown() {
-	r.logger.Debug("Closing incoming channel")
-	close(r.incomingChannel)
-	r.logger.Info("Shut down")
-}
diff --git a/server/room/client.go b/server/room/client.go
deleted file mode 100644
index 2afeeb6..0000000
--- a/server/room/client.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package room
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"github.com/rs/xid"
-)
-
-// internalClient is used by the room itself to track information about a client.
-type internalClient struct {
-	// id is the id that the client identifies itself with in all clientMessage instances it sends.
-	id xid.ID
-	// outgoingChannel is a channel that the room can send messages to the client on.
-	outgoingChannel chan<- Message
-	// privateChannel is true iff the room can close the outgoingChannel when the client and room have completed their
-	// close handshake.
-	privateChannel bool
-	// broadcast is true iff the client requested to be included on broadcasts on creation.
-	broadcast bool
-}
-
-type NewClientOptions struct {
-	// IncomingChannel is the channel to use as the room's channel to send messages to - the new Client's IncomingChannel.
-	// If this is non-nil, the room will not automatically close the IncomingChannel after a shutdown is negotiated.
-	// If this is nil, a new channel will be allocated on join and closed on shutdown.
-	IncomingChannel chan Message
-	// If AcceptBroadcasts is true, the room will send all broadcasts originating from other clients to this client.
-	AcceptBroadcasts bool
-	// If RequestStartingState is true, the room will send a copy of the current state as of when the JoinRequest was
-	// received in the JoinResponse that will be the first message the Client receives.
-	RequestStartingState bool
-}
-
-// Client is the structure used by clients external to the Room package to communicate with the Room.
-// It is not expected to be parallel-safe; to run it in parallel, use the NewClient method and send the new client to
-// the new goroutine.
-type Client struct {
-	// id is the ClientID used by the client for all communications.
-	id xid.ID
-	// roomId is the unique ID of the room (not its map).
-	roomId xid.ID
-	// incomingChannel is the channel that this client receives messages on.
-	incomingChannel <-chan Message
-	// outgoingChannel is the channel that this client sends messages on.
-	// Becomes nil if the client has been completely shut down.
-	outgoingChannel chan<- ClientMessage
-	// Once Leave or AcknowledgeShutdown have been triggered, this flag is set, preventing use of other messages.
-	shuttingDown bool
-}
-
-// ID is the ID used by this client to identify itself to the Room.
-func (c *Client) ID() xid.ID {
-	return c.id
-}
-
-// RoomID is the ID used by the room to differentiate itself from other rooms.
-// It is not the map's internal ID.
-func (c *Client) RoomID() xid.ID {
-	return c.id
-}
-
-// IncomingChannel is the channel the client can listen on for messages from the room.
-func (c *Client) IncomingChannel() <-chan Message {
-	return c.incomingChannel
-}
-
-// OutgoingChannel is the channel the client can send messages to the room on.
-func (c *Client) OutgoingChannel() chan<- ClientMessage {
-	if c.outgoingChannel == nil {
-		panic("Already finished shutting down; no new messages should be sent")
-	}
-	return c.outgoingChannel
-}
-
-// newClientForRoom uses the necessary parameters to create and join a Client for the given room.
-func newClientForRoom(roomId xid.ID, outgoingChannel chan<- ClientMessage, opts NewClientOptions) *Client {
-	var privateChannel bool
-	var incomingChannel chan Message
-	if opts.IncomingChannel != nil {
-		incomingChannel = opts.IncomingChannel
-		privateChannel = false
-	} else {
-		incomingChannel = make(chan Message, 1)
-		privateChannel = true
-	}
-	result := Client{
-		id:              xid.New(),
-		roomId:          roomId,
-		incomingChannel: incomingChannel,
-		outgoingChannel: outgoingChannel,
-		shuttingDown:    false,
-	}
-	result.outgoingChannel <- &JoinRequest{
-		id:               result.id,
-		returnChannel:    incomingChannel,
-		privateChannel:   privateChannel,
-		broadcast:        opts.AcceptBroadcasts,
-		wantCurrentState: opts.RequestStartingState,
-	}
-	return &result
-}
-
-// NewClient creates a new client belonging to the same room as this client with a random ID.
-// The new client will be automatically joined to the channel.
-func (c *Client) NewClient(opts NewClientOptions) *Client {
-	if c.shuttingDown {
-		panic("Already started shutting down; no new messages should be sent")
-	}
-	return newClientForRoom(c.roomId, c.outgoingChannel, opts)
-}
-
-// Refresh creates a message which causes the client to request a fresh copy of the state.
-func (c *Client) Refresh() *RefreshRequest {
-	if c.shuttingDown {
-		panic("Already started shutting down; no new messages should be sent")
-	}
-	return &RefreshRequest{
-		id: c.id,
-	}
-}
-
-func (c *Client) Apply(a action.IDed) *ApplyRequest {
-	if c.shuttingDown {
-		panic("Already started shutting down; no new messages should be sent")
-	}
-	return &ApplyRequest{
-		id:     c.id,
-		action: a,
-	}
-}
-
-// Leave creates a message which causes the local client to signal that it is shutting down.
-// It is important to Leave to avoid dangling clients having messages sent to nothing.
-// After sending Leave, the client must confirm that it has been removed by waiting for a LeaveResponse, accompanied by
-// the closing of the Client's IncomingChannel if it was a private channel.
-// No further messages should be sent after Leave except AcknowledgeShutdown if Leave and requestShutdown crossed paths in midair.
-func (c *Client) Leave() *LeaveRequest {
-	if c.shuttingDown {
-		panic("Already started shutting down; no new messages should be sent")
-	}
-	c.shuttingDown = true
-	return &LeaveRequest{
-		id: c.id,
-	}
-}
-
-// Stop creates a message which causes the local client to signal that it is shutting down.
-// It is important to Stop when the room needs to be shut down.
-// After sending Stop, the client must confirm that it has been removed by waiting for a ShutdownRequest, which should
-// be handled normally.
-// No further messages should be sent after Stop except AcknowledgeShutdown.
-func (c *Client) Stop() *StopRequest {
-	if c.shuttingDown {
-		panic("Already started shutting down; no new messages should be sent")
-	}
-	c.shuttingDown = true
-	return &StopRequest{
-		id: c.id,
-	}
-}
-
-// AcknowledgeShutdown causes the local client to signal that it has acknowledged that the room is shutting down.
-// No further messages can be sent after AcknowledgeShutdown; attempting to do so will block forever, as the
-// OutgoingChannel has become nil.
-func (c *Client) AcknowledgeShutdown() *ShutdownResponse {
-	if c.outgoingChannel == nil {
-		panic("Already finished shutting down; no new messages should be sent")
-	}
-	c.shuttingDown = true
-	c.outgoingChannel = nil
-	return &ShutdownResponse{
-		id: c.id,
-	}
-}
diff --git a/server/room/clientmessage.go b/server/room/clientmessage.go
deleted file mode 100644
index e1e670b..0000000
--- a/server/room/clientmessage.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package room
-
-import (
-	action2 "git.reya.zone/reya/hexmap/server/action"
-	"github.com/rs/xid"
-	"go.uber.org/zap/zapcore"
-)
-
-// ClientMessage marks messages coming from clients to the room.
-type ClientMessage interface {
-	zapcore.ObjectMarshaler
-	// ClientID is the id of the client sending the message.
-	ClientID() xid.ID
-}
-
-// JoinRequest is the message sent on the room's IncomingChannel by a new client joining the room.
-type JoinRequest struct {
-	// id is the SourceID the client will use to identify itself in future messages.
-	id xid.ID
-	// returnChannel is a buffered channel the client is ready to receive messages from the room on.
-	// This becomes the Client's OutgoingChannel.
-	returnChannel chan<- Message
-	// privateChannel is true iff the room can close returnChannel after completing a shutdown handshake.
-	// This permits extra safety by causing channels that somehow leak into other contexts to become noticeable by
-	// causing panics.
-	privateChannel bool
-	// broadcast is true iff the room should send action.Syncable from other clients to this one.
-	broadcast bool
-	// wantCurrentState indicates that the client would like the room to include a copy of the current state of the room
-	// when it joins.
-	wantCurrentState bool
-}
-
-func (j *JoinRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "JoinRequest")
-	encoder.AddString("id", j.id.String())
-	encoder.AddBool("broadcast", j.broadcast)
-	encoder.AddBool("wantCurrentState", j.wantCurrentState)
-	return nil
-}
-
-func (j *JoinRequest) ClientID() xid.ID {
-	return j.id
-}
-
-// RefreshRequest is the message sent on the room's IncomingChannel by a client which needs the current value.
-type RefreshRequest struct {
-	id xid.ID
-}
-
-func (r *RefreshRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "RefreshRequest")
-	encoder.AddString("id", r.id.String())
-	return nil
-}
-
-func (r *RefreshRequest) ClientID() xid.ID {
-	return r.id
-}
-
-// ApplyRequest is the message sent on the room's IncomingChannel by a client which has received an action from the
-// ws.
-type ApplyRequest struct {
-	id     xid.ID
-	action action2.IDed
-}
-
-func (f *ApplyRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "ApplyRequest")
-	encoder.AddString("id", f.id.String())
-	return encoder.AddObject("action", f.action)
-}
-
-func (f *ApplyRequest) ClientID() xid.ID {
-	return f.id
-}
-
-// LeaveRequest is the message sent on the room's IncomingChannel by a client which is shutting down.
-// The client is indicating that it will send no messages except a possible ShutdownResponse, in the event that a
-// LeaveRequest and a ShutdownRequest cross paths midflight.
-type LeaveRequest struct {
-	id xid.ID
-}
-
-func (l *LeaveRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "LeaveRequest")
-	encoder.AddString("id", l.id.String())
-	return nil
-}
-
-func (l *LeaveRequest) ClientID() xid.ID {
-	return l.id
-}
-
-// StopRequest is the message sent on the room's IncomingChannel by a client which wants to make the room shut down.
-// The response to a StopRequest is a ShutdownRequest, which should be handled as normal.
-type StopRequest struct {
-	id xid.ID
-}
-
-func (s *StopRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "StopRequest")
-	encoder.AddString("id", s.id.String())
-	return nil
-}
-
-func (s *StopRequest) ClientID() xid.ID {
-	return s.id
-}
-
-// ShutdownResponse is the message sent on the room's IncomingChannel by a client which has accepted the room's ShutdownRequest.
-type ShutdownResponse struct {
-	id xid.ID
-}
-
-func (s *ShutdownResponse) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "ShutdownResponse")
-	encoder.AddString("id", s.id.String())
-	return nil
-}
-
-func (s *ShutdownResponse) ClientID() xid.ID {
-	return s.id
-}
diff --git a/server/room/message.go b/server/room/message.go
deleted file mode 100644
index 0d1026c..0000000
--- a/server/room/message.go
+++ /dev/null
@@ -1,160 +0,0 @@
-package room
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"git.reya.zone/reya/hexmap/server/state"
-	"github.com/rs/xid"
-	"go.uber.org/zap/zapcore"
-)
-
-// Message marks messages going to clients from the room.
-type Message interface {
-	zapcore.ObjectMarshaler
-	// RoomID marks the ID of the room this Message originated from, in case the Client has a shared IncomingChannel.
-	RoomID() xid.ID
-}
-
-// JoinResponse is the message sent by the room on a new client's IncomingChannel after it joins.
-type JoinResponse struct {
-	id xid.ID
-	// currentState is a pointer to a copy of the room's current state.
-	// If the client refused the room state in its join message, this will be a nil pointer instead.
-	currentState *state.Synced
-}
-
-func (j *JoinResponse) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "JoinResponse")
-	encoder.AddString("id", j.id.String())
-	return encoder.AddObject("currentState", j.currentState)
-}
-
-func (j *JoinResponse) RoomID() xid.ID {
-	return j.id
-}
-
-// CurrentState returns the state of the room as of when the JoinRequest was processed.
-func (j *JoinResponse) CurrentState() *state.Synced {
-	return j.currentState
-}
-
-// RefreshResponse is the message sent by the room after a client requests it, or immediately on join.
-type RefreshResponse struct {
-	id xid.ID
-	// currentState is a pointer to a copy of the room's current state.
-	currentState *state.Synced
-}
-
-func (r *RefreshResponse) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "JoinResponse")
-	encoder.AddString("id", r.id.String())
-	return encoder.AddObject("currentState", r.currentState)
-}
-
-func (r *RefreshResponse) RoomID() xid.ID {
-	return r.id
-}
-
-// CurrentState returns the state of the room as of when the RefreshRequest was processed.
-func (r *RefreshResponse) CurrentState() *state.Synced {
-	return r.currentState
-}
-
-// ApplyResponse returns the result of an action to _only_ the one that sent the ApplyRequest.
-type ApplyResponse struct {
-	id xid.ID
-	// actionID is the ID of the action that completed or failed.
-	actionID uint32
-	// result is nil if the action was completed, or an error if it failed.
-	result error
-}
-
-func (a *ApplyResponse) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "ApplyResponse")
-	encoder.AddString("id", a.id.String())
-	encoder.AddUint32("actionId", a.actionID)
-	encoder.AddBool("success", a.result == nil)
-	if a.result != nil {
-		encoder.AddString("failure", a.result.Error())
-	}
-	return nil
-}
-
-func (a *ApplyResponse) RoomID() xid.ID {
-	return a.id
-}
-
-func (a *ApplyResponse) ActionID() uint32 {
-	return a.actionID
-}
-
-// Success returns true if the action succeeded, false if it failed.
-func (a *ApplyResponse) Success() bool {
-	return a.result == nil
-}
-
-// Failure returns the error if the action failed, or nil if it succeeded.
-func (a *ApplyResponse) Failure() error {
-	return a.result
-}
-
-// ActionBroadcast is sent to all clients _other_ than the one that sent the ApplyRequest when an action succeeds.
-type ActionBroadcast struct {
-	id xid.ID
-	// originalClientID is the client that sent the action in the first place.
-	originalClientID xid.ID
-	// originalActionID is the ID that the client that sent the action sent.
-	originalActionID uint32
-	// action is the action that succeeded.
-	action action.Server
-}
-
-func (a *ActionBroadcast) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "ActionBroadcast")
-	encoder.AddString("id", a.id.String())
-	encoder.AddString("originalClientId", a.originalClientID.String())
-	encoder.AddUint32("originalActionId", a.originalActionID)
-	return encoder.AddObject("action", a.action)
-}
-
-func (a *ActionBroadcast) RoomID() xid.ID {
-	return a.id
-}
-func (a *ActionBroadcast) OriginalClientID() xid.ID {
-	return a.originalClientID
-}
-func (a *ActionBroadcast) OriginalActionID() uint32 {
-	return a.originalActionID
-}
-func (a *ActionBroadcast) Action() action.Server {
-	return a.action
-}
-
-// LeaveResponse is the message sent by the room when it has accepted that a client has left, and will send it no further messages.
-type LeaveResponse struct {
-	id xid.ID
-}
-
-func (l *LeaveResponse) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "LeaveResponse")
-	encoder.AddString("id", l.id.String())
-	return nil
-}
-
-func (l *LeaveResponse) RoomID() xid.ID {
-	return l.id
-}
-
-// ShutdownRequest is the message sent by the room when something causes it to shut down. It will send the client no further messages except a possible LeaveResponse.
-type ShutdownRequest struct {
-	id xid.ID
-}
-
-func (s *ShutdownRequest) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "ShutdownRequest")
-	encoder.AddString("id", s.id.String())
-	return nil
-}
-
-func (s *ShutdownRequest) RoomID() xid.ID {
-	return s.id
-}
diff --git a/server/room/room.go b/server/room/room.go
deleted file mode 100644
index 6c4b42d..0000000
--- a/server/room/room.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package room
-
-import (
-	"git.reya.zone/reya/hexmap/server/state"
-	"github.com/rs/xid"
-	"go.uber.org/zap"
-)
-
-// NewOptions is the set of information used to control what a room starts with.
-type NewOptions struct {
-	// BaseLogger is the logger that the room should attach its data to.
-	BaseLogger *zap.Logger
-	// StartingState is a state.Synced that defines the state of the room on creation.
-	StartingState *state.Synced
-	// StartingClientOptions sets the configuration of the first client to be created, the one that will be returned
-	// from New.
-	StartingClientOptions NewClientOptions
-}
-
-// room is a room as seen from within - the information needed for the room process to do its duties.
-type room struct {
-	// id is the room's internal ID - not to be confused with the ID of the map it is serving.
-	id xid.ID
-	// incomingChannel is the channel the room uses to receive messages. The room itself owns this channel,
-	// so when the clients map is empty, it can be closed.
-	incomingChannel chan ClientMessage
-	// clients contains the map of active clients, each of which is known to have a reference to this room.
-	clients map[xid.ID]internalClient
-	// currentState contains the active state being used by actions right now.
-	currentState state.Synced
-	// logger is the logger that this room will use. It contains context fields for the room's important fields.
-	logger *zap.Logger
-}
-
-// New creates and starts up a new room, joins a new client to it and returns that client.
-func New(opts NewOptions) *Client {
-	logger := opts.BaseLogger.Named("Room")
-	id := xid.New()
-	r := room{
-		id:              id,
-		incomingChannel: make(chan ClientMessage),
-		clients:         make(map[xid.ID]internalClient),
-		currentState:    *opts.StartingState,
-		logger:          logger,
-	}
-	go r.act()
-	return r.newClient(opts.StartingClientOptions)
-}
-
-// newClient creates a new client belonging to this room with a random ID.
-// The new client will be automatically joined to the channel.
-func (r *room) newClient(opts NewClientOptions) *Client {
-	return newClientForRoom(r.id, r.incomingChannel, opts)
-}
diff --git a/server/state/color.go b/server/state/color.go
deleted file mode 100644
index 1261406..0000000
--- a/server/state/color.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package state
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// Color is an internal representation of an RGBA8888 color.
-type Color struct {
-	// R is the red component of the color.
-	R uint8
-	// G is the green component of the color.
-	G uint8
-	// B is the blue component of the color.
-	B uint8
-	// A is the alpha component of the color.
-	A uint8
-}
-
-var TransparentColor = Color{R: 0, G: 0, B: 0, A: 0}
-var ErrInvalidColorString = errors.New("color strings must start with # and be followed by 3, 4, 6, or 8 hex digits")
-
-func ColorFromString(s string) (Color, error) {
-	if !strings.HasPrefix(s, "#") {
-		return TransparentColor, ErrInvalidColorString
-	}
-	hex := s[1:]
-	v, err := strconv.ParseUint(hex, 16, 64)
-	if err != nil {
-		return TransparentColor, ErrInvalidColorString
-	}
-	switch len(hex) {
-	case 3:
-		return ColorFromRGBA4444(uint16(v<<4 | 0xF)), nil
-	case 4:
-		return ColorFromRGBA4444(uint16(v)), nil
-	case 6:
-		return ColorFromRGBA8888(uint32(v<<8 | 0xFF)), nil
-	case 8:
-		return ColorFromRGBA8888(uint32(v)), nil
-	default:
-		return TransparentColor, ErrInvalidColorString
-	}
-}
-
-// String prints the Color in an abbreviated notation.
-// Specifically, short form is used when possible (i.e., when all components are evenly divisible by 0x11).
-// The alpha component is left out if it's 0xFF.
-func (c Color) String() string {
-	if c.R%0x11 == 0 && c.G%0x11 == 0 && c.B%0x11 == 0 && c.A%0x11 == 0 {
-		// Short form works.
-		if c.A == 0xFF {
-			// It's great when it's easy!
-			return fmt.Sprintf("#%01X%01X%01X", c.R/0x11, c.G/0x11, c.B/0x11)
-		} else {
-			// Just need to add the alpha.
-			return fmt.Sprintf("#%01X%01X%01X%01X", c.R/0x11, c.G/0x11, c.B/0x11, c.A/0x11)
-		}
-	} else {
-		// Gotta use long form.
-		if c.A == 0xFF {
-			// Can skip the alpha channel, though.
-			return fmt.Sprintf("#%02X%02X%02X", c.R, c.G, c.B)
-		} else {
-			// Doing things the hard way.
-			return fmt.Sprintf("#%02X%02X%02X%02X", c.R, c.G, c.B, c.A)
-		}
-	}
-}
diff --git a/server/state/color.pbconv.go b/server/state/color.pbconv.go
deleted file mode 100644
index 8c38889..0000000
--- a/server/state/color.pbconv.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package state
-
-// ColorFromRGBA8888 decodes a packed uint32 (RGBA8888) into a hex color.
-func ColorFromRGBA8888(value uint32) Color {
-	return Color{
-		R: uint8((value >> 24) & 0xFF),
-		G: uint8((value >> 16) & 0xFF),
-		B: uint8((value >> 8) & 0xFF),
-		A: uint8((value >> 0) & 0xFF),
-	}
-}
-
-// ColorFromRGBA4444 decodes a packed uint16 (RGBA4444) into a hex color.
-func ColorFromRGBA4444(value uint16) Color {
-	return Color{
-		R: uint8((value>>12)&0xF) * 0x11,
-		G: uint8((value>>8)&0xF) * 0x11,
-		B: uint8((value>>4)&0xF) * 0x11,
-		A: uint8((value>>0)&0xF) * 0x11,
-	}
-}
-
-// ToRGBA8888 packs a hex color into a uint32 as RGBA8888.
-func (c Color) ToRGBA8888() uint32 {
-	return uint32(c.R)<<24 | uint32(c.G)<<16 | uint32(c.B)<<8 | uint32(c.A)
-}
-
-// ToRGBA4444 packs a hex color into a uint16 as RGBA4444.
-func (c Color) ToRGBA4444() uint16 {
-	return uint16((c.R>>4)&0xF)<<12 | uint16((c.G>>4)&0xF)<<8 | uint16((c.B>>4)&0xF)<<4 | uint16((c.A>>4)&0xF)
-}
diff --git a/server/state/coords.go b/server/state/coords.go
deleted file mode 100644
index a22a28b..0000000
--- a/server/state/coords.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package state
-
-import (
-	"go.uber.org/zap/zapcore"
-)
-
-// StorageCoordinates gives the coordinates of a cell in a form optimized for storage.
-type StorageCoordinates struct {
-	// Line is the index from 0 to Lines - 1 of the HexLine in the HexLayer.
-	Line uint8 `json:"line"`
-	// Cell is the index from 0 to CellsPerLine - 1 of the HexCell in the HexLine.
-	Cell uint8 `json:"cell"`
-}
-
-func (s StorageCoordinates) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddUint8("line", s.Line)
-	encoder.AddUint8("cell", s.Cell)
-	return nil
-}
diff --git a/server/state/coords.pbconv.go b/server/state/coords.pbconv.go
deleted file mode 100644
index a8e8f47..0000000
--- a/server/state/coords.pbconv.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package state
-
-import (
-	"errors"
-	"math"
-)
-
-var ErrOutOfBounds = errors.New("coordinate was out of bounds")
-
-func (x *StorageCoordinatesPB) ToGo() (StorageCoordinates, error) {
-	if x.Line > math.MaxUint8 || x.Cell > math.MaxUint8 {
-		return StorageCoordinates{}, ErrOutOfBounds
-	}
-	return StorageCoordinates{
-		Line: uint8(x.Line),
-		Cell: uint8(x.Cell),
-	}, nil
-}
-
-func (s StorageCoordinates) ToPB() *StorageCoordinatesPB {
-	return &StorageCoordinatesPB{
-		Line: uint32(s.Line),
-		Cell: uint32(s.Cell),
-	}
-}
diff --git a/server/state/map.go b/server/state/map.go
deleted file mode 100644
index 33244c2..0000000
--- a/server/state/map.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package state
-
-import (
-	"fmt"
-	"github.com/rs/xid"
-	"go.uber.org/zap/zapcore"
-)
-
-// HexOrientation is the enum for the direction hexes are facing.
-type HexOrientation uint8
-
-const (
-	// UnknownOrientation indicates that an invalid orientation was specified.
-	UnknownOrientation HexOrientation = 0
-	// PointyTop indicates hexes that have a pair of sides on either side in the horizontal direction,
-	// and points on the top and bottom in the vertical direction.
-	PointyTop HexOrientation = 1
-	// FlatTop indicates hexes that have a pair of points on either side in the horizontal direction,
-	// and sides on the top and bottom in the vertical direction.
-	FlatTop HexOrientation = 2
-)
-
-// String returns the equivalent JavaScript constant name.
-func (o HexOrientation) String() string {
-	switch o {
-	case PointyTop:
-		return "POINTY_TOP"
-	case FlatTop:
-		return "FLAT_TOP"
-	default:
-		return fmt.Sprintf("[unknown HexOrientation %d]", o)
-	}
-}
-
-// LineParity indicates whether odd or even lines are indented.
-type LineParity uint8
-
-const (
-	// UnknownParity indicates that parity was not specified or unknown.
-	UnknownParity LineParity = 0
-	// OddLines indicates that odd lines - 1, 3, 5... - are indented by 1/2 cell.
-	OddLines LineParity = 1
-	// EvenLines indicates that even lines - 0, 2, 4... - are indented by 1/2 cell.
-	EvenLines LineParity = 2
-)
-
-// String returns the equivalent JavaScript constant name.
-func (o LineParity) String() string {
-	switch o {
-	case OddLines:
-		return "ODD_LINES"
-	case EvenLines:
-		return "EVEN_LINES"
-	default:
-		return fmt.Sprintf("[unknown LineParity %d]", o)
-	}
-}
-
-// Layout combines HexOrientation and LineParity to represent a map's display mode.
-type Layout struct {
-	Orientation   HexOrientation `json:"orientation"`
-	IndentedLines LineParity     `json:"indentedLines"`
-}
-
-func (l Layout) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("orientation", l.Orientation.String())
-	encoder.AddString("indentedLines", l.IndentedLines.String())
-	return nil
-}
-
-// HexCell contains data for a single cell of the map.
-type HexCell struct {
-	// Color contains the color of the cell, in hex notation.
-	Color Color `json:"color"`
-}
-
-func (h HexCell) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("color", h.Color.String())
-	return nil
-}
-
-// HexLine is a line of cells which are adjacent by flat sides in a vertical or horizontal direction.
-type HexLine []HexCell
-
-func (l HexLine) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	var finalErr error
-	for _, cell := range l {
-		err := encoder.AppendObject(cell)
-		if err != nil && finalErr == nil {
-			finalErr = err
-		}
-	}
-	return finalErr
-}
-
-// Copy creates a deep copy of this HexLine.
-func (l HexLine) Copy() HexLine {
-	duplicate := make(HexLine, len(l))
-	for index, value := range l {
-		duplicate[index] = value
-	}
-	return duplicate
-}
-
-// HexLayer is a two-dimensional plane of cells which are arranged into lines.
-type HexLayer []HexLine
-
-func (l HexLayer) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	var finalErr error
-	for _, line := range l {
-		err := encoder.AppendArray(line)
-		if err != nil && finalErr == nil {
-			finalErr = err
-		}
-	}
-	return finalErr
-}
-
-// GetCellAt returns a reference to the cell at the given coordinates.
-// If the coordinates are out of bounds for this map, an error will be returned.
-func (l HexLayer) GetCellAt(c StorageCoordinates) (*HexCell, error) {
-	if int(c.Line) >= len(l) {
-		return nil, fmt.Errorf("line %d out of bounds (%d)", c.Line, len(l))
-	}
-	line := l[c.Line]
-	if int(c.Cell) >= len(line) {
-		return nil, fmt.Errorf("cell %d out of bounds (%d)", c.Cell, len(line))
-	}
-	return &(line[c.Cell]), nil
-}
-
-// Copy creates a deep copy of this HexLayer.
-func (l HexLayer) Copy() HexLayer {
-	duplicate := make(HexLayer, len(l))
-	for index, value := range l {
-		duplicate[index] = value.Copy()
-	}
-	return duplicate
-}
-
-// HexMap contains the data for a map instance.
-type HexMap struct {
-	// XID is the unique id of the HexMap, used to encourage clients not to blindly interact with a different map.
-	XID xid.ID `json:"xid"`
-	// Lines is the rough number of rows (in PointyTop orientation) or columns (in FlatTop orientation) in the map.
-	// Because different lines will be staggered, it's somewhat hard to see.
-	Lines uint8 `json:"lines"`
-	// CellsPerLine is the rough number of columns (in PointyTop orientation) or rows (in FlatTop orientation).
-	// This is the number of cells joined together, flat-edge to flat-edge, in each line.
-	CellsPerLine uint8 `json:"cellsPerLine"`
-	// Layout is the orientation and line parity used to display the map.
-	Layout Layout `json:"layout"`
-	// Layer contains the actual map data.
-	// Layer itself is a slice with Lines elements, each of which is a line;
-	// each of those lines is a slice of CellsPerLine cells.
-	Layer HexLayer `json:"layer"`
-}
-
-func NewHexMap(layout Layout, lines uint8, cellsPerLine uint8) *HexMap {
-	layer := make(HexLayer, lines)
-	for index := range layer {
-		line := make(HexLine, cellsPerLine)
-		for index := range line {
-			line[index] = HexCell{
-				Color: Color{
-					R: 255,
-					G: 255,
-					B: 255,
-					A: 255,
-				},
-			}
-		}
-		layer[index] = line
-	}
-	return &HexMap{
-		XID:          xid.New(),
-		Layout:       layout,
-		Lines:        lines,
-		CellsPerLine: cellsPerLine,
-		Layer:        layer,
-	}
-}
-
-func (m HexMap) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("id", m.XID.String())
-	encoder.AddUint8("lines", m.Lines)
-	encoder.AddUint8("cellsPerLine", m.CellsPerLine)
-	displayModeErr := encoder.AddObject("layout", m.Layout)
-	lineCellsErr := encoder.AddArray("lineCells", m.Layer)
-	if displayModeErr != nil {
-		return displayModeErr
-	} else {
-		return lineCellsErr
-	}
-}
-
-// Copy creates a deep copy of this HexMap.
-func (m HexMap) Copy() HexMap {
-	return HexMap{
-		XID:          m.XID,
-		Lines:        m.Lines,
-		CellsPerLine: m.CellsPerLine,
-		Layout:       m.Layout,
-		Layer:        m.Layer.Copy(),
-	}
-}
diff --git a/server/state/map.pbconv.go b/server/state/map.pbconv.go
deleted file mode 100644
index 9c55190..0000000
--- a/server/state/map.pbconv.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package state
-
-import (
-	"github.com/rs/xid"
-	"math"
-)
-
-func (x HexMapPB_Layout_Orientation) ToGo() HexOrientation {
-	switch x {
-	case HexMapPB_Layout_POINTY_TOP:
-		return PointyTop
-	case HexMapPB_Layout_FLAT_TOP:
-		return FlatTop
-	default:
-		return UnknownOrientation
-	}
-}
-
-func (o HexOrientation) ToPB() HexMapPB_Layout_Orientation {
-	switch o {
-	case PointyTop:
-		return HexMapPB_Layout_POINTY_TOP
-	case FlatTop:
-		return HexMapPB_Layout_FLAT_TOP
-	default:
-		return HexMapPB_Layout_UNKNOWN_ORIENTATION
-	}
-}
-
-func (x HexMapPB_Layout_LineParity) ToGo() LineParity {
-	switch x {
-	case HexMapPB_Layout_EVEN:
-		return EvenLines
-	case HexMapPB_Layout_ODD:
-		return OddLines
-	default:
-		return UnknownParity
-	}
-}
-
-func (o LineParity) ToPB() HexMapPB_Layout_LineParity {
-	switch o {
-	case OddLines:
-		return HexMapPB_Layout_ODD
-	case EvenLines:
-		return HexMapPB_Layout_EVEN
-	default:
-		return HexMapPB_Layout_UNKNOWN_LINE
-	}
-}
-
-func (x *HexMapPB_Layout) ToGo() Layout {
-	return Layout{
-		Orientation:   x.Orientation.ToGo(),
-		IndentedLines: x.IndentedLines.ToGo(),
-	}
-}
-
-func (l Layout) ToPB() *HexMapPB_Layout {
-	return &HexMapPB_Layout{
-		Orientation:   l.Orientation.ToPB(),
-		IndentedLines: l.IndentedLines.ToPB(),
-	}
-}
-
-func (x *HexCellPB) ToGo() HexCell {
-	return HexCell{
-		Color: ColorFromRGBA8888(x.Color),
-	}
-}
-
-func (h HexCell) ToPB() *HexCellPB {
-	return &HexCellPB{
-		Color: h.Color.ToRGBA8888(),
-	}
-}
-
-func (x *HexLinePB) ToGo() HexLine {
-	r := make(HexLine, len(x.Cells))
-	for index, cell := range x.Cells {
-		r[index] = cell.ToGo()
-	}
-	return r
-}
-
-func (l HexLine) ToPB() *HexLinePB {
-	cells := make([]*HexCellPB, len(l))
-	for index, cell := range l {
-		cells[index] = cell.ToPB()
-	}
-	return &HexLinePB{
-		Cells: cells,
-	}
-}
-
-func (x *HexLayerPB) ToGo() HexLayer {
-	r := make(HexLayer, len(x.Lines))
-	for index, line := range x.Lines {
-		r[index] = line.ToGo()
-	}
-	return r
-}
-
-func (l HexLayer) ToPB() *HexLayerPB {
-	lines := make([]*HexLinePB, len(l))
-	for index, line := range l {
-		lines[index] = line.ToPB()
-	}
-	return &HexLayerPB{
-		Lines: lines,
-	}
-}
-
-func (x *HexMapPB) ToGo() (HexMap, error) {
-	pbId, err := xid.FromBytes(x.Xid)
-	if err != nil {
-		return HexMap{}, err
-	}
-	if x.Lines > math.MaxUint8 {
-		return HexMap{}, ErrOutOfBounds
-	}
-	if x.CellsPerLine > math.MaxUint8 {
-		return HexMap{}, ErrOutOfBounds
-	}
-	return HexMap{
-		XID:          pbId,
-		Lines:        uint8(x.Lines),
-		CellsPerLine: uint8(x.CellsPerLine),
-		Layout:       x.Layout.ToGo(),
-		Layer:        x.Layer.ToGo(),
-	}, nil
-}
-
-func (m HexMap) ToPB() *HexMapPB {
-	return &HexMapPB{
-		Xid:          m.XID.Bytes(),
-		Lines:        uint32(m.Lines),
-		CellsPerLine: uint32(m.CellsPerLine),
-		Layout:       m.Layout.ToPB(),
-		Layer:        m.Layer.ToPB(),
-	}
-}
diff --git a/server/state/protobuf.go b/server/state/protobuf.go
deleted file mode 100644
index 05b322c..0000000
--- a/server/state/protobuf.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package state
-
-import "errors"
-
-var ErrOneofNotSet = errors.New("no value was given for a oneof")
diff --git a/server/state/state.go b/server/state/state.go
deleted file mode 100644
index b28e69a..0000000
--- a/server/state/state.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package state
-
-import (
-	"go.uber.org/zap/zapcore"
-)
-
-// Synced contains all state that is synced between the server and its clients.
-type Synced struct {
-	Map  HexMap    `json:"map"`
-	User UserState `json:"user"`
-}
-
-func (s *Synced) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	mapErr := encoder.AddObject("map", s.Map)
-	userErr := encoder.AddObject("user", s.User)
-	if mapErr != nil {
-		return mapErr
-	} else {
-		return userErr
-	}
-}
-
-// Copy creates a deep copy of this Synced instance.
-func (s *Synced) Copy() Synced {
-	return Synced{
-		Map:  s.Map.Copy(),
-		User: s.User.Copy(),
-	}
-}
diff --git a/server/state/state.pbconv.go b/server/state/state.pbconv.go
deleted file mode 100644
index 62c7f91..0000000
--- a/server/state/state.pbconv.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package state
-
-func (x *SyncableStatePB) ToGo() (Synced, error) {
-	pbMap, err := x.Map.ToGo()
-	if err != nil {
-		return Synced{}, err
-	}
-	user := x.User.ToGo()
-	return Synced{
-		Map:  pbMap,
-		User: user,
-	}, nil
-}
-
-func (s Synced) ToPB() *SyncableStatePB {
-	return &SyncableStatePB{
-		Map:  s.Map.ToPB(),
-		User: s.User.ToPB(),
-	}
-}
diff --git a/server/state/user.go b/server/state/user.go
deleted file mode 100644
index 6a6d103..0000000
--- a/server/state/user.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package state
-
-import "go.uber.org/zap/zapcore"
-
-// UserState contains data about clients that is synced between client and server.
-// Unlike the map, UserState is not persisted to disk, and all UserState is lost on shutdown.
-type UserState struct {
-	ActiveColor Color `json:"activeColor"`
-}
-
-func (u UserState) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("activeColor", u.ActiveColor.String())
-	return nil
-}
-
-// Copy creates a deep copy of this UserState.
-func (u UserState) Copy() UserState {
-	return UserState{
-		ActiveColor: u.ActiveColor,
-	}
-}
diff --git a/server/state/user.pbconv.go b/server/state/user.pbconv.go
deleted file mode 100644
index 0450dbb..0000000
--- a/server/state/user.pbconv.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package state
-
-func (x *UserStatePB) ToGo() UserState {
-	return UserState{
-		ActiveColor: ColorFromRGBA8888(x.Color),
-	}
-}
-
-func (u UserState) ToPB() *UserStatePB {
-	return &UserStatePB{
-		Color: u.ActiveColor.ToRGBA8888(),
-	}
-}
diff --git a/server/ws/client.go b/server/ws/client.go
deleted file mode 100644
index 6fe8943..0000000
--- a/server/ws/client.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package ws
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"go.uber.org/zap/zapcore"
-)
-
-// ClientCommandType is an enum type for the client's protocol messages.
-type ClientCommandType string
-
-// ClientCommand s are those sent by the client.
-type ClientCommand interface {
-	zapcore.ObjectMarshaler
-	// ToClientPB converts the command to a client protocol buffer which will be sent on the wire.
-	ToClientPB() *ClientCommandPB
-}
-
-// ClientHello is the command sent by the client when it first establishes the connection.
-type ClientHello struct {
-	// Version is the protocol version the client is running.
-	Version uint32 `json:"version"`
-}
-
-func (c ClientHello) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Hello")
-	encoder.AddUint32("version", c.Version)
-	return nil
-}
-
-// ClientRefresh is the command sent by the client when it needs the full state re-sent.
-type ClientRefresh struct {
-}
-
-func (c ClientRefresh) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Refresh")
-	return nil
-}
-
-type IDPairs []action.IDed
-
-func (a IDPairs) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	var finalErr error = nil
-	for _, v := range a {
-		err := encoder.AppendObject(v)
-		if err != nil && finalErr == nil {
-			finalErr = err
-		}
-	}
-	return finalErr
-}
-
-// ClientAct is a command sent in order to deliver one or more Action actions to the server.
-type ClientAct struct {
-	// Actions contains the actions the client wants to apply, in the order they should be applied.
-	Actions IDPairs `json:"actions"`
-}
-
-func (c ClientAct) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Act")
-	return encoder.AddArray("actions", c.Actions)
-}
-
-// ClientMalformed is synthesized by the reader when it has read a command that does not appear to match the
-// protocol.
-type ClientMalformed struct {
-	// Error is the error in parse that caused the reader to be unable to read the message.
-	Error error
-}
-
-func (c ClientMalformed) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "(malformed command)")
-	encoder.AddString("error", c.Error.Error())
-	return nil
-}
diff --git a/server/ws/client.pbconv.go b/server/ws/client.pbconv.go
deleted file mode 100644
index 3159de7..0000000
--- a/server/ws/client.pbconv.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package ws
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"git.reya.zone/reya/hexmap/server/state"
-)
-
-func (x *ClientCommandPB) ToGo() (ClientCommand, error) {
-	switch msg := x.Command.(type) {
-	case nil:
-		return nil, state.ErrOneofNotSet
-	case *ClientCommandPB_Hello:
-		return msg.Hello.ToGo(), nil
-	case *ClientCommandPB_Refresh:
-		return msg.Refresh.ToGo(), nil
-	case *ClientCommandPB_Act:
-		return msg.Act.ToGo()
-	default:
-		panic("A case was missed in ClientCommandPB.ToGo!")
-	}
-}
-
-func (x *ClientHelloPB) ToGo() *ClientHello {
-	return &ClientHello{
-		Version: x.Version,
-	}
-}
-
-func (c *ClientHello) ToClientPB() *ClientCommandPB {
-	return &ClientCommandPB{
-		Command: &ClientCommandPB_Hello{
-			Hello: &ClientHelloPB{
-				Version: c.Version,
-			},
-		},
-	}
-}
-
-func (*ClientRefreshPB) ToGo() *ClientRefresh {
-	return &ClientRefresh{}
-}
-
-func (c *ClientRefresh) ToClientPB() *ClientCommandPB {
-	return &ClientCommandPB{
-		Command: &ClientCommandPB_Refresh{
-			Refresh: &ClientRefreshPB{},
-		},
-	}
-}
-
-func (x *ClientActPB_IDed) ToGo() (action.IDed, error) {
-	act, err := x.Action.ToGo()
-	if err != nil {
-		return action.IDed{}, nil
-	}
-	return action.IDed{
-		ID:     x.Id,
-		Action: act,
-	}, nil
-}
-
-func (x *ClientActPB) ToGo() (*ClientAct, error) {
-	actions := make(IDPairs, len(x.Actions))
-	for index, ided := range x.Actions {
-		action, err := ided.ToGo()
-		if err != nil {
-			return nil, err
-		}
-		actions[index] = action
-	}
-	return &ClientAct{
-		Actions: actions,
-	}, nil
-}
-
-func (c *ClientAct) ToClientPB() *ClientCommandPB {
-	actions := make([]*ClientActPB_IDed, len(c.Actions))
-	for index, ided := range c.Actions {
-		actions[index] = &ClientActPB_IDed{
-			Id:     ided.ID,
-			Action: ided.Action.ToClientPB(),
-		}
-	}
-	return &ClientCommandPB{
-		Command: &ClientCommandPB_Act{
-			Act: &ClientActPB{
-				Actions: actions,
-			},
-		},
-	}
-}
-
-func (*ClientMalformed) ToClientPB() *ClientCommandPB {
-	return nil
-}
-
-func (*SocketClosed) ToClientPB() *ClientCommandPB {
-	return nil
-}
diff --git a/server/ws/connection.go b/server/ws/connection.go
deleted file mode 100644
index 4d9da6b..0000000
--- a/server/ws/connection.go
+++ /dev/null
@@ -1,276 +0,0 @@
-package ws
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"git.reya.zone/reya/hexmap/server/room"
-	"github.com/gorilla/websocket"
-	"go.uber.org/zap"
-	"net/http"
-	"time"
-)
-
-const (
-	// ReadTimeLimit is the maximum time the server is willing to wait after receiving a message before receiving another one.
-	ReadTimeLimit = 60 * time.Second
-	// WriteTimeLimit is the maximum time the server is willing to wait to send a message.
-	WriteTimeLimit = 10 * time.Second
-	// ControlTimeLimit is the maximum time the server is willing to wait to send a control message like Ping or Close.
-	ControlTimeLimit = (WriteTimeLimit * 5) / 10
-	// PingDelay is the time between pings.
-	// It must be less than ReadTimeLimit to account for latency and delays on either side.
-	PingDelay = (ReadTimeLimit * 7) / 10
-)
-
-type HTTPHandler struct {
-	Upgrader websocket.Upgrader
-	Logger   *zap.Logger
-	Room     *room.Client
-}
-
-func destroyBadProtocolSocket(c *websocket.Conn, logger *zap.Logger) {
-	err := c.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(websocket.CloseProtocolError, "Invalid subprotocols"), time.Now().Add(ControlTimeLimit))
-	if err != nil {
-		logger.Error("Failed to write close message")
-	}
-	err = c.SetReadDeadline(time.Now().Add(ControlTimeLimit))
-	if err != nil {
-		logger.Error("Failed to set read deadline")
-	}
-	for {
-		_, _, err := c.ReadMessage()
-		if err != nil {
-			if !websocket.IsCloseError(err, websocket.CloseProtocolError) {
-				logger.Error("Websocket connection shut down ignominiously", zap.Error(err))
-			}
-			return
-		}
-	}
-}
-
-func (h *HTTPHandler) ServeHTTP(responseWriter http.ResponseWriter, request *http.Request) {
-	c, err := h.Upgrader.Upgrade(responseWriter, request, http.Header{})
-	if err != nil {
-		h.Logger.Error("Failed to upgrade ws connection", zap.Error(err))
-		return
-	}
-	if c.Subprotocol() == "" {
-		h.Logger.Error("No matching subprotocol", zap.String("clientProtocols", request.Header.Get("Sec-Websocket-Protocol")))
-		go destroyBadProtocolSocket(c, h.Logger)
-		return
-	}
-	result := NewConnection(c, h.Logger.Named("Connection"))
-	exchange(result, h.Logger.Named("Link"), func(o room.NewClientOptions) *room.Client {
-		return h.Room.NewClient(o)
-	})
-}
-
-func exchange(c *Connection, l *zap.Logger, clientMaker func(options room.NewClientOptions) *room.Client) {
-	wsr := c.ReadChannel()
-	wsw := c.WriteChannel()
-
-	l.Info("Connection established")
-	closeWith := &SocketClosed{
-		Code: websocket.CloseAbnormalClosure,
-		Text: "I don't know what happened. But goodbye!",
-	}
-	defer func() {
-		l.Info("Shutting down")
-		// Wait for the websocket connection to shut down.
-		wsw <- closeWith
-		if wsr != nil {
-			for {
-				msg := <-wsr
-				switch msg.(type) {
-				case *SocketClosed:
-					return
-				}
-			}
-		}
-	}()
-	// State 1: Waiting for a hello.
-	// Anything else is death.
-	cmd := <-wsr
-	switch typedCmd := cmd.(type) {
-	case *ClientHello:
-		if typedCmd.Version != ProtocolVersion {
-			l.Warn("Bad Hello version")
-			// Disgusting. I can't even look at you.
-			closeWith = &SocketClosed{
-				Code: websocket.CloseProtocolError,
-				Text: "Wrong protocol version",
-			}
-			return
-		}
-		l.Info("Got Hello")
-	default:
-		l.Warn("Got NON-hello")
-		closeWith = &SocketClosed{
-			Code: websocket.CloseProtocolError,
-			Text: "You don't even say hello?",
-		}
-		return
-	}
-	l.Info("Waiting for room.")
-	// State 2: Waiting for the room to notice us.
-	rm := clientMaker(room.NewClientOptions{
-		AcceptBroadcasts:     true,
-		RequestStartingState: true,
-	})
-	rmr := rm.IncomingChannel()
-	rmw := rm.OutgoingChannel()
-	var leaveWith room.ClientMessage = nil
-	defer func() {
-		l.Info("Leaving room")
-		if leaveWith == nil {
-			leaveWith = rm.Leave()
-		}
-		rmw <- leaveWith
-		if _, ok := leaveWith.(*room.ShutdownResponse); ok {
-			// The room was already shutting down.
-			return
-		}
-		for {
-			msg := <-rmr
-			switch msg.(type) {
-			case *room.LeaveResponse:
-				return
-			case *room.ShutdownRequest:
-				rmw <- rm.AcknowledgeShutdown()
-				return
-			}
-		}
-	}()
-	l.Info("Waiting for JoinResponse")
-	msg := <-rmr
-	switch typedMsg := msg.(type) {
-	case *room.JoinResponse:
-		l.Info("Got JoinResponse")
-		wsw <- &ServerHello{
-			Version: ProtocolVersion,
-			State:   typedMsg.CurrentState(),
-		}
-	case *room.ShutdownRequest:
-		l.Info("Got ShutdownRequest")
-		// Room was shutting down when we joined, oops!
-		closeWith = &SocketClosed{
-			Code: websocket.CloseGoingAway,
-			Text: "Shutting down right as you joined. Sorry!",
-		}
-		return
-	default:
-		l.Info("Got non-JoinResponse/ShutdownRequest")
-		// Uh. That's concerning. We don't have anything to send our client.
-		// Let's just give up.
-		return
-	}
-	l.Info("Waiting for messages")
-	for {
-		select {
-		case cmd := <-wsr:
-			switch typedCmd := cmd.(type) {
-			case *ClientHello:
-				l.Info("Got unnecessary ClientHello")
-				// Huh???
-				closeWith = &SocketClosed{
-					Code: websocket.CloseProtocolError,
-					Text: "Enough hellos. Goodbye.",
-				}
-				return
-			case *ClientRefresh:
-				l.Info("Got ClientRefresh")
-				rmw <- rm.Refresh()
-			case *ClientAct:
-				l.Info("Got ClientAct")
-				for _, act := range typedCmd.Actions {
-					rmw <- rm.Apply(act)
-				}
-			case *SocketClosed:
-				l.Info("Got SocketClosed", zap.Object("close", typedCmd))
-				closeWith = typedCmd
-				return
-			case *ClientMalformed:
-				l.Warn("Got ClientMalformed")
-				return
-			}
-		case msg := <-rmr:
-			switch typedMsg := msg.(type) {
-			case *room.JoinResponse:
-				// Huh????
-				l.Info("Got unnecesary JoinResponse")
-				return
-			case *room.RefreshResponse:
-				l.Info("Got RefreshResponse")
-				wsw <- &ServerRefresh{
-					State: typedMsg.CurrentState(),
-				}
-			case *room.ApplyResponse:
-				l.Info("Got ApplyResponse")
-				if typedMsg.Success() {
-					wsw <- &ServerOK{
-						IDs: []uint32{typedMsg.ActionID()},
-					}
-				} else {
-					wsw <- &ServerFailed{
-						IDs:   []uint32{typedMsg.ActionID()},
-						Error: typedMsg.Failure().Error(),
-					}
-				}
-			case *room.ActionBroadcast:
-				l.Info("Got ActionBroadcast")
-				wsw <- &ServerAct{
-					Actions: action.ServerSlice{typedMsg.Action()},
-				}
-			case *room.LeaveResponse:
-				l.Info("Got odd LeaveResponse")
-				// Oh. u_u I wasn't- okay.
-				return
-			case *room.ShutdownRequest:
-				// Oh. Oh! Okay! Sorry!
-				l.Info("Got ShutdownRequest")
-				leaveWith = rm.AcknowledgeShutdown()
-				return
-			}
-		}
-	}
-}
-
-// A Connection corresponds to a pair of actors.
-type Connection struct {
-	r reader
-	w writer
-}
-
-func NewConnection(conn *websocket.Conn, logger *zap.Logger) *Connection {
-	readChan := make(chan time.Time)
-	out := &Connection{
-		r: reader{
-			conn:              conn,
-			channel:           make(chan ClientCommand),
-			readNotifications: readChan,
-			logger:            logger.Named("reader"),
-		},
-		w: writer{
-			conn:              conn,
-			channel:           make(chan ServerCommand),
-			readNotifications: readChan,
-			timer:             nil,
-			nextPingAt:        time.Time{},
-			logger:            logger.Named("writer"),
-		},
-	}
-	go out.r.act()
-	go out.w.act()
-	return out
-}
-
-// ReadChannel returns the channel that can be used to read client messages from the connection.
-// After receiving SocketClosed, the reader will close its channel.
-func (c *Connection) ReadChannel() <-chan ClientCommand {
-	return c.r.channel
-}
-
-// WriteChannel returns the channel that can be used to send server messages on the connection.
-// After sending SocketClosed, the writer will close its channel; do not send any further messages on the channel.
-func (c *Connection) WriteChannel() chan<- ServerCommand {
-	return c.w.channel
-}
diff --git a/server/ws/reader.go b/server/ws/reader.go
deleted file mode 100644
index b557489..0000000
--- a/server/ws/reader.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package ws
-
-import (
-	"fmt"
-	"github.com/gorilla/websocket"
-	"go.uber.org/zap"
-	"google.golang.org/protobuf/proto"
-	"time"
-)
-
-type reader struct {
-	// conn is the connection to the client read from by the reader.
-	conn *websocket.Conn
-	// channel is the channel that the reader sends messages it has received on.
-	channel chan ClientCommand
-	// readNotifications is the channel that alerts are sent to the writer on, to let it know to
-	readNotifications chan<- time.Time
-	// logger is the logger used to record the state of the reader, primarily in Debug level.
-	logger *zap.Logger
-}
-
-// InvalidMessageType is placed in ClientMalformed when the type of the WebSocket message was incorrect.
-type InvalidMessageType struct {
-	MessageType int
-}
-
-func (i InvalidMessageType) Error() string {
-	return fmt.Sprintf("invalid message type %d", i.MessageType)
-}
-
-// act contains the main read loop of the reader.
-func (r *reader) act() {
-	defer r.shutdown()
-	// Our first deadline starts immediately, so let the writer know.
-	r.updateDeadlines()
-	// The reader should not automatically respond with close messages.
-	// It should simply let the close message be returned as an error.
-	r.conn.SetCloseHandler(func(code int, text string) error {
-		return nil
-	})
-	r.conn.SetPongHandler(func(appData string) error {
-		r.logger.Debug("Received pong, extending read deadline")
-		r.updateDeadlines()
-		if appData != PingData {
-			r.logger.Warn("Got unexpected data in the pong", zap.String("appData", appData))
-		}
-		return nil
-	})
-	for {
-		messageType, messageData, err := r.conn.ReadMessage()
-		if err != nil {
-			var closure *SocketClosed
-			if websocket.IsCloseError(err, StandardClientCloseTypes...) {
-				typedErr := err.(*websocket.CloseError)
-				r.logger.Debug("Received normal close message, shutting down", zap.Int("code", typedErr.Code), zap.String("text", typedErr.Text))
-				closure = &SocketClosed{Code: typedErr.Code, Text: typedErr.Text}
-			} else if websocket.IsUnexpectedCloseError(err, StandardClientCloseTypes...) {
-				typedErr := err.(*websocket.CloseError)
-				r.logger.Warn("Received unexpected close message, shutting down", zap.Int("code", typedErr.Code), zap.String("text", typedErr.Text))
-				closure = &SocketClosed{Code: typedErr.Code, Text: typedErr.Text}
-			} else {
-				r.logger.Error("Error while reading message, shutting down", zap.Error(err))
-				closure = &SocketClosed{Error: err}
-			}
-			r.logger.Debug("Sending close message to reader", zap.Object("closeMessage", closure))
-			r.channel <- closure
-			// We must exit now - errors from this method are permanent, after all.
-			// We'll do the shutdown we deferred.
-			return
-		}
-		r.updateDeadlines()
-		r.channel <- r.parseCommand(messageType, messageData)
-	}
-}
-
-// parseCommand attempts to parse the incoming message
-func (r *reader) parseCommand(socketType int, data []byte) ClientCommand {
-	if socketType != websocket.BinaryMessage {
-		err := &InvalidMessageType{
-			MessageType: socketType,
-		}
-		r.logger.Error("Received command with unknown WebSocket message type", zap.Error(err))
-		return &ClientMalformed{
-			Error: err,
-		}
-	}
-	r.logger.Debug("Received command, parsing")
-	var cmdPb ClientCommandPB
-	err := proto.Unmarshal(data, &cmdPb)
-	if err != nil {
-		return &ClientMalformed{
-			Error: err,
-		}
-	}
-	cmd, err := (&cmdPb).ToGo()
-	if err != nil {
-		return &ClientMalformed{Error: err}
-	}
-	return cmd
-}
-
-// updateDeadlines extends the time limit for pongs, and instructs the writer to hold off on sending a ping for the next PingDelay.
-func (r *reader) updateDeadlines() {
-	receivedAt := time.Now()
-	r.logger.Debug("Alerting writer to extend ping timer", zap.Time("receivedAt", receivedAt))
-	r.readNotifications <- receivedAt
-	newDeadline := receivedAt.Add(ReadTimeLimit)
-	r.logger.Debug("Extending read deadline", zap.Time("newDeadline", newDeadline))
-	err := r.conn.SetReadDeadline(newDeadline)
-	if err != nil {
-		r.logger.Error("Error while extending read deadline", zap.Error(err))
-	}
-	r.logger.Debug("Read deadline extended")
-}
-
-// shutdown closes all resources associated with the reader (the channel and readNotifications) but leaves its conn running.
-func (r *reader) shutdown() {
-	close(r.channel)
-	r.channel = nil
-	close(r.readNotifications)
-	r.readNotifications = nil
-	r.conn = nil
-}
diff --git a/server/ws/server.go b/server/ws/server.go
deleted file mode 100644
index 5207288..0000000
--- a/server/ws/server.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package ws
-
-import (
-	"git.reya.zone/reya/hexmap/server/action"
-	"git.reya.zone/reya/hexmap/server/state"
-	"go.uber.org/zap/zapcore"
-)
-
-// ServerMessageType is an enum type for the server's messages.
-type ServerMessageType string
-
-// ServerCommand s are sent by the server to the client.
-type ServerCommand interface {
-	zapcore.ObjectMarshaler
-	// ToServerPB converts the command to a server protocol buffer which will be sent on the wire.
-	ToServerPB() *ServerCommandPB
-}
-
-// ServerHello is the command sent to establish the current state of the server when a new client connects.
-type ServerHello struct {
-	// Version is the protocol version the server is running.
-	Version uint32 `json:"version"`
-	// State is the complete state of the server as of when the client joined.
-	State *state.Synced `json:"state"`
-}
-
-func (s ServerHello) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Hello")
-	encoder.AddUint32("version", s.Version)
-	return encoder.AddObject("state", s.State)
-}
-
-// ServerRefresh is the command sent to reestablish the current state of the server in response to ClientRefresh.
-type ServerRefresh struct {
-	// State is the complete state of the server as of when the corresponding ClientRefresh was processed.
-	State *state.Synced `json:"state"`
-}
-
-func (s ServerRefresh) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Refresh")
-	return encoder.AddObject("state", s.State)
-}
-
-type IDSlice []uint32
-
-func (i IDSlice) MarshalLogArray(encoder zapcore.ArrayEncoder) error {
-	for _, v := range i {
-		encoder.AppendUint32(v)
-	}
-	return nil
-}
-
-// ServerOK is the command sent when one or more client actions have been accepted and applied.
-type ServerOK struct {
-	// IDs contains the IDs of the actions which were accepted and applied, in the order they were accepted and applied.
-	// This is the same as the order they were received, though other actions may have been between these that were
-	// rejected.
-	IDs IDSlice `json:"ids"`
-}
-
-func (s ServerOK) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "OK")
-	return encoder.AddArray("ids", s.IDs)
-}
-
-// ServerFailed is the command sent when one or more client actions have been rejected.
-type ServerFailed struct {
-	// IDs contains the IDs of the actions which were rejected, in the order they were rejected.
-	// This is the same as the order they were received, though other actions may have been between these that were
-	// accepted and applied.
-	IDs IDSlice `json:"ids"`
-	// Error contains the error text sent from the server about why these actions failed.
-	Error string `json:"error"`
-}
-
-func (s ServerFailed) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Failed")
-	err := encoder.AddArray("ids", s.IDs)
-	encoder.AddString("error", s.Error)
-	return err
-}
-
-// ServerAct is the command sent when one or more client actions from other clients have been accepted and applied.
-// The client's own actions will never be included in this command.
-type ServerAct struct {
-	// Actions contains the actions that are now being applied.
-	Actions action.ServerSlice `json:"actions"`
-}
-
-func (s ServerAct) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "Act")
-	return encoder.AddArray("actions", s.Actions)
-}
diff --git a/server/ws/server.pbconv.go b/server/ws/server.pbconv.go
deleted file mode 100644
index f0116ec..0000000
--- a/server/ws/server.pbconv.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package ws
-
-import "git.reya.zone/reya/hexmap/server/action"
-
-func (x *ServerCommandPB) ToGo() (ServerCommand, error) {
-	switch msg := x.Command.(type) {
-	case *ServerCommandPB_Hello:
-		return msg.Hello.ToGo()
-	case *ServerCommandPB_Refresh:
-		return msg.Refresh.ToGo()
-	case *ServerCommandPB_Ok:
-		return msg.Ok.ToGo(), nil
-	case *ServerCommandPB_Failed:
-		return msg.Failed.ToGo(), nil
-	case *ServerCommandPB_Act:
-		return msg.Act.ToGo()
-	default:
-		panic("A case was missed in ServerCommandPB.ToGo!")
-	}
-}
-
-func (x *ServerHelloPB) ToGo() (*ServerHello, error) {
-	state, err := x.State.ToGo()
-	if err != nil {
-		return nil, err
-	}
-	return &ServerHello{
-		Version: x.Version,
-		State:   &state,
-	}, nil
-}
-
-func (s *ServerHello) ToServerPB() *ServerCommandPB {
-	return &ServerCommandPB{
-		Command: &ServerCommandPB_Hello{
-			Hello: &ServerHelloPB{
-				Version: s.Version,
-				State:   s.State.ToPB(),
-			},
-		},
-	}
-}
-
-func (x *ServerRefreshPB) ToGo() (*ServerRefresh, error) {
-	state, err := x.State.ToGo()
-	if err != nil {
-		return nil, err
-	}
-	return &ServerRefresh{
-		State: &state,
-	}, nil
-}
-
-func (s *ServerRefresh) ToServerPB() *ServerCommandPB {
-	return &ServerCommandPB{
-		Command: &ServerCommandPB_Refresh{
-			Refresh: &ServerRefreshPB{
-				State: s.State.ToPB(),
-			},
-		},
-	}
-}
-
-func (x *ServerOKPB) ToGo() *ServerOK {
-	ids := make(IDSlice, len(x.Ids))
-	copy(ids, x.Ids)
-	return &ServerOK{
-		IDs: ids,
-	}
-}
-
-func (s *ServerOK) ToServerPB() *ServerCommandPB {
-	ids := make([]uint32, len(s.IDs))
-	copy(ids, s.IDs)
-	return &ServerCommandPB{
-		Command: &ServerCommandPB_Ok{
-			Ok: &ServerOKPB{
-				Ids: ids,
-			},
-		},
-	}
-}
-
-func (x *ServerFailedPB) ToGo() *ServerFailed {
-	ids := make(IDSlice, len(x.Ids))
-	copy(ids, x.Ids)
-	return &ServerFailed{
-		IDs:   ids,
-		Error: x.Error,
-	}
-}
-
-func (s *ServerFailed) ToServerPB() *ServerCommandPB {
-	ids := make([]uint32, len(s.IDs))
-	copy(ids, s.IDs)
-	return &ServerCommandPB{
-		Command: &ServerCommandPB_Failed{
-			Failed: &ServerFailedPB{
-				Ids:   ids,
-				Error: s.Error,
-			},
-		},
-	}
-}
-
-func (x *ServerActPB) ToGo() (*ServerAct, error) {
-	actions := make(action.ServerSlice, len(x.Actions))
-	for index, act := range x.Actions {
-		convertedAct, err := act.ToGo()
-		if err != nil {
-			return nil, err
-		}
-		actions[index] = convertedAct
-	}
-	return &ServerAct{
-		Actions: actions,
-	}, nil
-}
-
-func (s *ServerAct) ToServerPB() *ServerCommandPB {
-	actions := make([]*action.ServerActionPB, len(s.Actions))
-	for index, act := range s.Actions {
-		actions[index] = act.ToServerPB()
-	}
-	return &ServerCommandPB{
-		Command: &ServerCommandPB_Act{
-			Act: &ServerActPB{
-				Actions: actions,
-			},
-		},
-	}
-}
-
-func (*SocketClosed) ToServerPB() *ServerCommandPB {
-	return nil
-}
diff --git a/server/ws/shared.go b/server/ws/shared.go
deleted file mode 100644
index c0acd50..0000000
--- a/server/ws/shared.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package ws
-
-import (
-	"github.com/gorilla/websocket"
-	"go.uber.org/zap/zapcore"
-)
-
-const (
-	PingData        string = "are you still there?"
-	ProtocolVersion uint32 = 1
-)
-
-var StandardClientCloseTypes = []int{websocket.CloseNormalClosure, websocket.CloseGoingAway, websocket.CloseAbnormalClosure}
-
-// SocketClosed is synthesized when a client closes the WebSocket connection, or sent to the write process to write a
-// WebSocket close message.
-// Sending a SocketClosed on a channel causes that channel to be closed right after.
-type SocketClosed struct {
-	// Code is the status code given (or which should be given) in the close message.
-	Code int `json:"code"`
-	// Text is the reason text given (or which should be given) in the close message. Max 123 characters.
-	Text string `json:"text"`
-	// Error may be an error that resulted in the closure of the socket. It will be set only if the connection was cut
-	// by a condition other than receiving a close message; if it is set, Code and Text will both be zeroed.
-	// Will not be written by the writer; only useful when it's returned from the reader.
-	Error error `json:"error"`
-}
-
-func (c SocketClosed) MarshalLogObject(encoder zapcore.ObjectEncoder) error {
-	encoder.AddString("type", "GOODBYE")
-	encoder.AddInt("code", c.Code)
-	encoder.AddString("text", c.Text)
-	if c.Error != nil {
-		encoder.AddString("error", c.Error.Error())
-	}
-	return nil
-}
diff --git a/server/ws/writer.go b/server/ws/writer.go
deleted file mode 100644
index 417e961..0000000
--- a/server/ws/writer.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package ws
-
-import (
-	"github.com/gorilla/websocket"
-	"go.uber.org/zap"
-	"google.golang.org/protobuf/proto"
-	"io"
-	"time"
-)
-
-type writer struct {
-	// conn is the ws connection that this writer is responsible for writing on.
-	conn *websocket.Conn
-	// channel is the channel used to receive server messages to be sent to the client.
-	// When it receives a SocketClosed, the process on the sending end promises not to send any further messages, as the writer will close it right after.
-	channel chan ServerCommand
-	// readNotifications is the channel used to receive pings when the reader receives a message, so that a ping will be sent out before the reader is ready to time out.
-	// When it is closed, the reader has shut down.
-	readNotifications <-chan time.Time
-	// timer is the timer used to send pings when the reader is close to timing out, to make sure the other end of the connection is still listening.
-	timer *time.Timer
-	// nextPingAt is the time after which the next ping will be sent if the timer is ticking. It will be .IsZero() if the timer is not ticking.
-	nextPingAt time.Time
-	// logger is the logger used to record the state of the writer, primarily in Debug level.
-	logger *zap.Logger
-}
-
-// IsTimerTicking returns true if the writer's timer is running.
-func (w *writer) isTimerTicking() bool {
-	return !w.nextPingAt.IsZero()
-}
-
-// sendNextPingAt starts the timer if it's not running, and
-func (w *writer) sendNextPingAt(nextPing time.Time) {
-	if w.nextPingAt.IsZero() {
-		// Timer is not running, so set the next ping time and start it.
-		w.nextPingAt = nextPing
-		w.timer.Reset(time.Until(nextPing))
-	} else if w.nextPingAt.Before(nextPing) {
-		// Timer's already running, so leave it be, but update the next ping time.
-		w.nextPingAt = nextPing
-	} else {
-		// The timer is already set to a time after the incoming time.
-		// It's extremely unlikely for this empty branch to ever be reached.
-	}
-}
-
-// act is the function responsible for actually doing the writing.
-func (w *writer) act() {
-	defer w.gracefulShutdown()
-	w.logger.Debug("Starting up")
-	w.timer = time.NewTimer(PingDelay)
-	w.nextPingAt = time.Now().Add(PingDelay)
-	for {
-		select {
-		case readAt, open := <-w.readNotifications:
-			if open {
-				nextPingAt := readAt.Add(PingDelay)
-				w.logger.Debug("Received reader read, extending ping timer", zap.Time("nextPingAt", nextPingAt))
-				w.sendNextPingAt(nextPingAt)
-			} else {
-				w.logger.Debug("Received reader close, shutting down")
-				w.readNotifications = nil
-				// bye bye, we'll graceful shutdown because we deferred it
-				return
-			}
-		case raw := <-w.channel:
-			switch msg := raw.(type) {
-			case *SocketClosed:
-				w.logger.Debug("Received close message, forwarding and shutting down", zap.Object("msg", msg))
-				w.sendClose(msg)
-				// bye bye, we'll graceful shutdown because we deferred it
-				return
-			default:
-				w.logger.Debug("Received message, forwarding", zap.Object("msg", msg))
-				w.send(msg)
-			}
-		case <-w.timer.C:
-			now := time.Now()
-			if now.After(w.nextPingAt) {
-				// We successfully passed the time when a ping should be sent! Let's send it!
-				w.sendPing()
-				// The timer doesn't need to be reactivated right now, so just zero out the next ping time.
-				w.nextPingAt = time.Time{}
-			} else {
-				// It's not time to send the ping yet - we got more reads in the meantime. Restart the timer with the new time-until-next-ping.
-				w.timer.Reset(w.nextPingAt.Sub(now))
-			}
-		}
-		w.logger.Debug("Awakening handled, resuming listening")
-	}
-}
-
-// send actually transmits a ServerCommand to the client according to the protocol.
-func (w *writer) send(msg ServerCommand) {
-	w.logger.Debug("Marshaling command as protobuf", zap.Object("msg", msg))
-	marshaled, err := proto.Marshal(msg.ToServerPB())
-	if err != nil {
-		w.logger.Error("Error while marshaling to protobuf", zap.Error(err))
-		return
-	}
-	writeDeadline := time.Now().Add(WriteTimeLimit)
-	w.logger.Debug("Setting deadline to write command", zap.Time("writeDeadline", writeDeadline))
-	err = w.conn.SetWriteDeadline(writeDeadline)
-	if err != nil {
-		w.logger.Error("Error while setting write deadline", zap.Time("writeDeadline", writeDeadline), zap.Object("msg", msg), zap.Error(err))
-	}
-	w.logger.Debug("Opening message writer to send command", zap.Object("msg", msg))
-	writer, err := w.conn.NextWriter(websocket.BinaryMessage)
-	if err != nil {
-		w.logger.Error("Error while getting writer from connection", zap.Error(err))
-		return
-	}
-	defer func(writer io.WriteCloser) {
-		w.logger.Debug("Closing message writer to send command")
-		err := writer.Close()
-		if err != nil {
-			w.logger.Error("Error while closing writer to send command", zap.Error(err))
-		}
-		w.logger.Debug("Command sent")
-	}(writer)
-	_, err = writer.Write(marshaled)
-	if err != nil {
-		w.logger.Error("Error while writing marshaled protobuf to connection", zap.Error(err))
-		return
-	}
-	// Deferred close happens now
-}
-
-// sendClose sends a close message on the ws connection, but does not actually close the connection.
-// It does, however, close the incoming message channel to the writer.
-func (w *writer) sendClose(msg *SocketClosed) {
-	w.logger.Debug("Shutting down the writer channel")
-	close(w.channel)
-	w.channel = nil
-	w.logger.Debug("Writing close message")
-	err := w.conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(msg.Code, msg.Text), time.Now().Add(ControlTimeLimit))
-	if err != nil {
-		w.logger.Warn("Error while sending close", zap.Error(err))
-	}
-}
-
-// sendPing sends a ping message on the ws connection. The content is arbitrary.
-func (w *writer) sendPing() {
-	w.logger.Debug("Sending ping")
-	err := w.conn.WriteControl(websocket.PingMessage, []byte(PingData), time.Now().Add(ControlTimeLimit))
-	if err != nil {
-		w.logger.Error("Error while sending ping", zap.Error(err))
-	}
-}
-
-// gracefulShutdown causes the writer to wait for the close handshake to finish and then shut down.
-// It waits for the reader's readNotifications to close, indicating that it has also shut down, and for the channel to
-// receive a SocketClosed message indicating that the main process has shut down.
-// During this time, the writer ignores all other messages from the channel and sends no pings.
-func (w *writer) gracefulShutdown() {
-	defer w.finalShutdown()
-	// If the ping timer is still running, stop it and then close it.
-	if w.isTimerTicking() && !w.timer.Stop() {
-		<-w.timer.C
-	}
-	w.timer = nil
-	w.nextPingAt = time.Time{}
-	w.logger.Debug("Waiting for all channels to shut down")
-	for {
-		if w.channel == nil && w.readNotifications == nil {
-			w.logger.Debug("All channels closed, beginning final shutdown")
-			// all done, we outta here, let the defer pick up the final shutdown
-			return
-		}
-		select {
-		case _, open := <-w.readNotifications:
-			if !open {
-				w.logger.Debug("Received reader close while shutting down")
-				w.readNotifications = nil
-			}
-		case raw := <-w.channel:
-			switch msg := raw.(type) {
-			case *SocketClosed:
-				w.logger.Debug("Received close message from channel while shutting down, forwarding", zap.Object("msg", msg))
-				w.sendClose(msg)
-			default:
-				w.logger.Debug("Ignoring non-close message while shutting down", zap.Object("msg", msg))
-			}
-		}
-	}
-}
-
-// finalShutdown closes the socket and finishes cleanup.
-func (w *writer) finalShutdown() {
-	w.logger.Debug("Closing WebSocket connection")
-	err := w.conn.Close()
-	if err != nil {
-		w.logger.Error("Received an error while closing", zap.Error(err))
-	}
-	w.logger.Debug("Shut down")
-}
diff --git a/client/src/actions/AppAction.ts b/src/actions/AppAction.ts
similarity index 100%
rename from client/src/actions/AppAction.ts
rename to src/actions/AppAction.ts
diff --git a/client/src/actions/BaseAction.ts b/src/actions/BaseAction.ts
similarity index 100%
rename from client/src/actions/BaseAction.ts
rename to src/actions/BaseAction.ts
diff --git a/client/src/actions/CellAction.ts b/src/actions/CellAction.ts
similarity index 100%
rename from client/src/actions/CellAction.ts
rename to src/actions/CellAction.ts
diff --git a/client/src/actions/ClientAction.ts b/src/actions/ClientAction.ts
similarity index 100%
rename from client/src/actions/ClientAction.ts
rename to src/actions/ClientAction.ts
diff --git a/client/src/actions/MapAction.ts b/src/actions/MapAction.ts
similarity index 100%
rename from client/src/actions/MapAction.ts
rename to src/actions/MapAction.ts
diff --git a/client/src/actions/NetworkAction.ts b/src/actions/NetworkAction.ts
similarity index 100%
rename from client/src/actions/NetworkAction.ts
rename to src/actions/NetworkAction.ts
diff --git a/client/src/actions/ServerAction.ts b/src/actions/ServerAction.ts
similarity index 100%
rename from client/src/actions/ServerAction.ts
rename to src/actions/ServerAction.ts
diff --git a/client/src/actions/TileAction.ts b/src/actions/TileAction.ts
similarity index 100%
rename from client/src/actions/TileAction.ts
rename to src/actions/TileAction.ts
diff --git a/client/src/actions/UserAction.ts b/src/actions/UserAction.ts
similarity index 100%
rename from client/src/actions/UserAction.ts
rename to src/actions/UserAction.ts
diff --git a/src/index.tsx b/src/index.tsx
new file mode 100644
index 0000000..35ecd54
--- /dev/null
+++ b/src/index.tsx
@@ -0,0 +1,3 @@
+import {EntryPoint} from "./ui/EntryPoint";
+
+EntryPoint();
\ No newline at end of file
diff --git a/client/src/websocket/ClientToPb.ts b/src/pbconv/ClientToPb.ts
similarity index 100%
rename from client/src/websocket/ClientToPb.ts
rename to src/pbconv/ClientToPb.ts
diff --git a/client/src/websocket/MapFromPb.ts b/src/pbconv/MapFromPb.ts
similarity index 100%
rename from client/src/websocket/MapFromPb.ts
rename to src/pbconv/MapFromPb.ts
diff --git a/client/src/websocket/MapToPb.ts b/src/pbconv/MapToPb.ts
similarity index 100%
rename from client/src/websocket/MapToPb.ts
rename to src/pbconv/MapToPb.ts
diff --git a/client/src/websocket/ServerFromPb.ts b/src/pbconv/ServerFromPb.ts
similarity index 100%
rename from client/src/websocket/ServerFromPb.ts
rename to src/pbconv/ServerFromPb.ts
diff --git a/client/src/websocket/SyncableActionFromPb.ts b/src/pbconv/SyncableActionFromPb.ts
similarity index 100%
rename from client/src/websocket/SyncableActionFromPb.ts
rename to src/pbconv/SyncableActionFromPb.ts
diff --git a/client/src/websocket/SyncableActionToPb.ts b/src/pbconv/SyncableActionToPb.ts
similarity index 100%
rename from client/src/websocket/SyncableActionToPb.ts
rename to src/pbconv/SyncableActionToPb.ts
diff --git a/client/src/react-app-env.d.ts b/src/react-app-env.d.ts
similarity index 100%
rename from client/src/react-app-env.d.ts
rename to src/react-app-env.d.ts
diff --git a/client/src/reducers/AppStateReducer.ts b/src/reducers/AppStateReducer.ts
similarity index 100%
rename from client/src/reducers/AppStateReducer.ts
rename to src/reducers/AppStateReducer.ts
diff --git a/client/src/reducers/ClientReducer.ts b/src/reducers/ClientReducer.ts
similarity index 100%
rename from client/src/reducers/ClientReducer.ts
rename to src/reducers/ClientReducer.ts
diff --git a/client/src/reducers/HexMapReducer.ts b/src/reducers/HexMapReducer.ts
similarity index 100%
rename from client/src/reducers/HexMapReducer.ts
rename to src/reducers/HexMapReducer.ts
diff --git a/client/src/reducers/NetworkReducer.ts b/src/reducers/NetworkReducer.ts
similarity index 100%
rename from client/src/reducers/NetworkReducer.ts
rename to src/reducers/NetworkReducer.ts
diff --git a/client/src/reducers/ServerReducer.ts b/src/reducers/ServerReducer.ts
similarity index 100%
rename from client/src/reducers/ServerReducer.ts
rename to src/reducers/ServerReducer.ts
diff --git a/client/src/reducers/SyncedStateReducer.ts b/src/reducers/SyncedStateReducer.ts
similarity index 100%
rename from client/src/reducers/SyncedStateReducer.ts
rename to src/reducers/SyncedStateReducer.ts
diff --git a/client/src/reducers/TileReducer.ts b/src/reducers/TileReducer.ts
similarity index 100%
rename from client/src/reducers/TileReducer.ts
rename to src/reducers/TileReducer.ts
diff --git a/client/src/reducers/UserReducer.ts b/src/reducers/UserReducer.ts
similarity index 100%
rename from client/src/reducers/UserReducer.ts
rename to src/reducers/UserReducer.ts
diff --git a/client/src/setupTests.ts b/src/setupTests.ts
similarity index 100%
rename from client/src/setupTests.ts
rename to src/setupTests.ts
diff --git a/client/src/state/AppState.ts b/src/state/AppState.ts
similarity index 100%
rename from client/src/state/AppState.ts
rename to src/state/AppState.ts
diff --git a/client/src/state/Coordinates.ts b/src/state/Coordinates.ts
similarity index 100%
rename from client/src/state/Coordinates.ts
rename to src/state/Coordinates.ts
diff --git a/client/src/state/HexMap.ts b/src/state/HexMap.ts
similarity index 100%
rename from client/src/state/HexMap.ts
rename to src/state/HexMap.ts
diff --git a/client/src/state/NetworkState.ts b/src/state/NetworkState.ts
similarity index 100%
rename from client/src/state/NetworkState.ts
rename to src/state/NetworkState.ts
diff --git a/client/src/state/SyncedState.ts b/src/state/SyncedState.ts
similarity index 100%
rename from client/src/state/SyncedState.ts
rename to src/state/SyncedState.ts
diff --git a/client/src/state/UserState.ts b/src/state/UserState.ts
similarity index 100%
rename from client/src/state/UserState.ts
rename to src/state/UserState.ts
diff --git a/client/src/App.css b/src/ui/App.css
similarity index 100%
rename from client/src/App.css
rename to src/ui/App.css
diff --git a/client/src/App.test.tsx b/src/ui/App.test.tsx
similarity index 100%
rename from client/src/App.test.tsx
rename to src/ui/App.test.tsx
diff --git a/client/src/App.tsx b/src/ui/App.tsx
similarity index 79%
rename from client/src/App.tsx
rename to src/ui/App.tsx
index aec3eca..37fe4c7 100644
--- a/client/src/App.tsx
+++ b/src/ui/App.tsx
@@ -1,15 +1,15 @@
 import {Dispatch, useMemo, useReducer} from "react";
-import {appStateReducer} from "./reducers/AppStateReducer";
-import {AppState} from "./state/AppState";
-import {ServerConnectionState} from "./state/NetworkState";
-import {sizeFromLinesAndCells} from "./state/Coordinates";
-import {AppAction} from "./actions/AppAction";
-import {USER_ACTIVE_COLOR} from "./actions/UserAction";
-import HexColorPicker from "./ui/HexColorPicker";
-import HexMapRenderer from "./ui/HexMapRenderer";
-import {DispatchContext} from "./ui/context/DispatchContext";
+import {appStateReducer} from "../reducers/AppStateReducer";
+import {AppState} from "../state/AppState";
+import {ServerConnectionState} from "../state/NetworkState";
+import {sizeFromLinesAndCells} from "../state/Coordinates";
+import {AppAction} from "../actions/AppAction";
+import {USER_ACTIVE_COLOR} from "../actions/UserAction";
+import HexColorPicker from "./HexColorPicker";
+import HexMapRenderer from "./HexMapRenderer";
+import {DispatchContext} from "./context/DispatchContext";
 import "./App.css";
-import {WebsocketReactAdapter} from "./websocket/WebsocketReactAdapter";
+import {WebsocketReactAdapter} from "./WebsocketReactAdapter";
 
 function App() {
     const defaultState: AppState = {
diff --git a/client/src/websocket/WebsocketTranslator.ts b/src/ui/DOMWebsocketTranslator.ts
similarity index 96%
rename from client/src/websocket/WebsocketTranslator.ts
rename to src/ui/DOMWebsocketTranslator.ts
index 961f84a..e9d95f7 100644
--- a/client/src/websocket/WebsocketTranslator.ts
+++ b/src/ui/DOMWebsocketTranslator.ts
@@ -10,13 +10,13 @@ import {
     ServerSocketStartupAction,
     SocketState
 } from "../actions/ServerAction";
-import {clientToPb} from "./ClientToPb";
+import {clientToPb} from "../pbconv/ClientToPb";
 import {ClientCommandPB} from "../proto/client";
 import {Reader} from "protobufjs";
 import {ServerCommandPB} from "../proto/server";
-import {serverFromPb} from "./ServerFromPb";
+import {serverFromPb} from "../pbconv/ServerFromPb";
 
-export class WebsocketTranslator {
+export class DOMWebsocketTranslator {
     readonly url: string
     readonly protocols: readonly string[]
     readonly onStartup: (startup: ServerSocketStartupAction) => void
diff --git a/client/src/index.css b/src/ui/EntryPoint.css
similarity index 100%
rename from client/src/index.css
rename to src/ui/EntryPoint.css
diff --git a/src/ui/EntryPoint.tsx b/src/ui/EntryPoint.tsx
new file mode 100644
index 0000000..fb9c01f
--- /dev/null
+++ b/src/ui/EntryPoint.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import './ui/EntryPoint.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
+
+export function EntryPoint() {
+    ReactDOM.render(
+        <React.StrictMode>
+            <App />
+        </React.StrictMode>,
+        document.getElementById('root')
+    );
+    // If you want to start measuring performance in your app, pass a function
+    // to log results (for example: reportWebVitals(console.log))
+    // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
+    reportWebVitals();
+}
\ No newline at end of file
diff --git a/client/src/ui/HexColorPicker.tsx b/src/ui/HexColorPicker.tsx
similarity index 100%
rename from client/src/ui/HexColorPicker.tsx
rename to src/ui/HexColorPicker.tsx
diff --git a/client/src/ui/HexMapRenderer.tsx b/src/ui/HexMapRenderer.tsx
similarity index 100%
rename from client/src/ui/HexMapRenderer.tsx
rename to src/ui/HexMapRenderer.tsx
diff --git a/client/src/ui/HexTileRenderer.tsx b/src/ui/HexTileRenderer.tsx
similarity index 100%
rename from client/src/ui/HexTileRenderer.tsx
rename to src/ui/HexTileRenderer.tsx
diff --git a/client/src/websocket/WebsocketReactAdapter.tsx b/src/ui/WebsocketReactAdapter.tsx
similarity index 94%
rename from client/src/websocket/WebsocketReactAdapter.tsx
rename to src/ui/WebsocketReactAdapter.tsx
index 773a6f7..d66bd31 100644
--- a/client/src/websocket/WebsocketReactAdapter.tsx
+++ b/src/ui/WebsocketReactAdapter.tsx
@@ -11,8 +11,8 @@ import {
     SendableAction,
     SentAction
 } from "../actions/ClientAction";
-import {DispatchContext} from "../ui/context/DispatchContext";
-import {WebsocketTranslator} from "./WebsocketTranslator";
+import {DispatchContext} from "./context/DispatchContext";
+import {DOMWebsocketTranslator} from "./DOMWebsocketTranslator";
 import {ServerConnectionState} from "../state/NetworkState";
 import {SERVER_SOCKET_STARTUP, SocketState} from "../actions/ServerAction";
 
@@ -28,7 +28,7 @@ export function WebsocketReactAdapter({url, protocols = ["v1.hexmap.deliciousrey
     if (dispatch === null) {
         throw Error("What the heck?! No dispatch?! I quit!")
     }
-    const connector = useRef(new WebsocketTranslator({
+    const connector = useRef(new DOMWebsocketTranslator({
         url,
         protocols,
         onStartup: dispatch,
diff --git a/client/src/ui/context/DispatchContext.ts b/src/ui/context/DispatchContext.ts
similarity index 100%
rename from client/src/ui/context/DispatchContext.ts
rename to src/ui/context/DispatchContext.ts
diff --git a/client/src/reportWebVitals.ts b/src/ui/reportWebVitals.ts
similarity index 100%
rename from client/src/reportWebVitals.ts
rename to src/ui/reportWebVitals.ts
diff --git a/src/ui/tsconfig.json b/src/ui/tsconfig.json
new file mode 100644
index 0000000..7ace874
--- /dev/null
+++ b/src/ui/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "lib": [
+      "dom",
+      "dom.iterable"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/client/src/util/ArrayUtils.ts b/src/util/ArrayUtils.ts
similarity index 100%
rename from client/src/util/ArrayUtils.ts
rename to src/util/ArrayUtils.ts
diff --git a/client/src/util/ColorUtils.ts b/src/util/ColorUtils.ts
similarity index 100%
rename from client/src/util/ColorUtils.ts
rename to src/util/ColorUtils.ts
diff --git a/client/src/util/TypeUtils.ts b/src/util/TypeUtils.ts
similarity index 100%
rename from client/src/util/TypeUtils.ts
rename to src/util/TypeUtils.ts
diff --git a/client/tsconfig.json b/tsconfig.json
similarity index 86%
rename from client/tsconfig.json
rename to tsconfig.json
index 0a1b50a..b9b1c36 100644
--- a/client/tsconfig.json
+++ b/tsconfig.json
@@ -2,12 +2,11 @@
   "compilerOptions": {
     "target": "es5",
     "lib": [
-      "dom",
-      "dom.iterable",
       "esnext"
     ],
+    "baseUrl": "src",
     "downlevelIteration": true,
-    "allowJs": true,
+    "allowJs": false,
     "skipLibCheck": true,
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
@@ -23,5 +22,8 @@
   },
   "include": [
     "src"
+  ],
+  "exclude": [
+    "*.test.ts"
   ]
 }