diff --git a/.dockerignore b/.dockerignore
index 0ddbf08..14d189a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
-node_modules
-target
-ui-dist
+/server/target
+/ui/dist
+/ui/node_modules
+/ui/yarn-error.log
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d1e24ad..dc240f4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         path: |
           ~/.cargo/registry
           ~/.cargo/git
-          target
+          server/target
         key: ${{ matrix.rust }}-cargo-${{ hashFiles('**/Cargo.lock') }}
     - name: Install dependencies
       run: sudo apt-get update && sudo apt-get install libavcodec-dev libavformat-dev libavutil-dev libncurses-dev libsqlite3-dev pkgconf
@@ -38,7 +38,7 @@ jobs:
         toolchain: ${{ matrix.rust }}
         override: true
     - name: Test
-      run: cargo test ${{ matrix.extra_args }} --all
+      run: cd server && cargo test ${{ matrix.extra_args }} --all
   js:
     name: Build and lint Javascript frontend
     runs-on: ubuntu-20.04
@@ -57,6 +57,6 @@ jobs:
         key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
         restore-keys: |
           ${{ runner.os }}-yarn-
-    - run: yarn install
-    - run: yarn build
-    - run: yarn lint
+    - run: cd ui && yarn install
+    - run: cd ui && yarn build
+    - run: cd ui && yarn lint
diff --git a/.gitignore b/.gitignore
index cbc053a..a965172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,6 @@
 .DS_Store
 *.swp
-*.sublime-workspace
-node_modules
-prep.config
-db/schema.rs
-target
-ui-dist
-yarn-error.log
+/server/target
+/ui/dist
+/ui/node_modules
+/ui/yarn-error.log
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f085924..0e4154b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -3,39 +3,51 @@
 # See documentation here:
 # https://github.com/moby/buildkit/blob/master/frontend/dockerfile/docs/syntax.md
 
-# Moonfire NVR development environment, using the build platform.
-FROM --platform=$BUILDPLATFORM ubuntu:20.04 AS dev
+# "dev-common" is the portion of "dev" (see below) which isn't specific to the
+# target arch. It's sufficient for building the non-arch-specific webpack.
+FROM --platform=$BUILDPLATFORM ubuntu:20.04 AS dev-common
 LABEL maintainer="slamb@slamb.org"
-ARG TARGETARCH
-ARG BUILDARCH
 ARG BUILD_UID=1000
 ARG BUILD_GID=1000
-LABEL maintainer="slamb@slamb.org"
 ENV LC_ALL=C.UTF-8
+COPY docker/dev-common.bash /
+RUN /dev-common.bash
+CMD	[ "/bin/bash", "--login" ]
+
+# "dev" is a full development environment, suitable for shelling into or
+# using with the VS Code container plugin.
+FROM --platform=$BUILDPLATFORM dev-common AS dev
+ARG BUILDARCH
+ARG TARGETARCH
+LABEL maintainer="slamb@slamb.org"
 COPY docker/dev.bash /
 RUN /dev.bash
 USER moonfire-nvr:moonfire-nvr
 WORKDIR /var/lib/moonfire-nvr
-CMD	[ "/bin/bash", "--login" ]
 
-# Build the webpack with node_modules and ui-dist outside the src dir.
-FROM dev AS build-webpack
+# Build the UI with node_modules and ui-dist outside the src dir.
+FROM --platform=$BUILDPLATFORM dev-common AS build-ui
 LABEL maintainer="slamb@slamb.org"
-RUN --mount=type=bind,target=/var/lib/moonfire-nvr/src,readonly \
-    ln -s src/package.json src/yarn.lock src/ui-src src/webpack . && \
-    yarn install && yarn build && rm -rf node_modules
+WORKDIR /var/lib/moonfire-nvr/src/ui
+COPY ui /var/lib/moonfire-nvr/src/ui
+RUN --mount=type=cache,target=/var/lib/moonfire-nvr/src/ui/node_modules,sharing=locked,mode=1777 \
+    yarn install && yarn build
 
 # Build the Rust components. Note that dev.sh set up an environment variable
 # in .buildrc that similarly changes the target dir path.
-FROM dev AS build-server
+FROM --platform=$BUILDPLATFORM dev AS build-server
 LABEL maintainer="slamb@slamb.org"
-RUN --mount=type=bind,target=/var/lib/moonfire-nvr/src,readonly \
-    bash -c 'set -o xtrace && source ~/.buildrc && cd src && cargo test && cargo build --release'
+RUN --mount=type=cache,id=target,target=/var/lib/moonfire-nvr/target,sharing=locked,mode=1777 \
+    --mount=type=bind,source=server,target=/var/lib/moonfire-nvr/src/server,readonly \
+    bash -c 'set -o xtrace && \
+             source ~/.buildrc && \
+             cd src/server && \
+             cargo test && \
+             cargo build --release && \
+             sudo install -m 755 ~/moonfire-nvr /usr/local/bin/moonfire-nvr'
 
 # Deployment environment, now in the target platform.
 FROM --platform=$TARGETPLATFORM ubuntu:20.04 AS deploy
-ARG DEPLOY_UID=10000
-ARG DEPLOY_GID=10000
 LABEL maintainer="slamb@slamb.org"
 ENV LC_ALL=C.UTF-8
 RUN export DEBIAN_FRONTEND=noninteractive && \
@@ -51,21 +63,12 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
         vim-nox && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \
-    groupadd \
-        --gid="${DEPLOY_GID}" \
-        moonfire-nvr && \
-    useradd \
-        --no-log-init \
-        --home-dir=/var/lib/moonfire-nvr \
-        --uid="${DEPLOY_UID}" \
-        --gid=moonfire-nvr \
-        --shell=/bin/bash \
-        --create-home \
-        moonfire-nvr && \
     ln -s moonfire-nvr /usr/local/bin/nvr
-COPY --from=build-server /var/lib/moonfire-nvr/moonfire-nvr /usr/local/bin/moonfire-nvr
-COPY --from=build-webpack /var/lib/moonfire-nvr/ui-dist /usr/local/lib/moonfire-nvr/ui
+COPY --from=build-server /usr/local/bin/moonfire-nvr /usr/local/bin/moonfire-nvr
+COPY --from=build-ui /var/lib/moonfire-nvr/ui/dist /usr/local/lib/moonfire-nvr/ui
 
-USER moonfire-nvr:moonfire-nvr
+# The install instructions say to use --user in the docker run commandline.
+# Specify a non-root user just in case someone forgets.
+USER 10000:10000
 WORKDIR /var/lib/moonfire-nvr
 ENTRYPOINT [ "/usr/local/bin/moonfire-nvr" ]
diff --git a/docker/dev-common.bash b/docker/dev-common.bash
new file mode 100755
index 0000000..0bd1ff0
--- /dev/null
+++ b/docker/dev-common.bash
@@ -0,0 +1,68 @@
+#!/bin/bash
+# Build the "dev" target. See Dockerfile.
+
+set -o errexit
+set -o pipefail
+set -o xtrace
+
+export DEBIAN_FRONTEND=noninteractive
+
+packages=()
+
+apt-get update
+
+# Add yarn repository.
+apt-get --assume-yes --no-install-recommends install curl gnupg ca-certificates
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" \
+    >> /etc/apt/sources.list.d/yarn.list
+
+# Install all packages necessary for building (and some for testing/debugging).
+packages+=(
+    build-essential
+    pkgconf
+    locales
+    nodejs
+    sudo
+    sqlite3
+    tzdata
+    vim-nox
+    yarn
+)
+apt-get update
+apt-get install --assume-yes --no-install-recommends "${packages[@]}"
+apt-get clean
+rm -rf /var/lib/apt/lists/*
+
+# Create the user. On the dev environment, allow sudo.
+groupadd \
+    --gid="${BUILD_GID}" \
+    moonfire-nvr
+useradd \
+    --no-log-init \
+    --home-dir=/var/lib/moonfire-nvr \
+    --uid="${BUILD_UID}" \
+    --gid=moonfire-nvr \
+    --shell=/bin/bash \
+    --create-home \
+    moonfire-nvr
+echo 'moonfire-nvr ALL=(ALL) NOPASSWD: ALL' >>/etc/sudoers
+
+# Install Rust. Note curl was already installed for yarn above.
+su moonfire-nvr -lc "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs |
+                     sh -s - -y"
+
+# Put configuration for the Rust build into a new ".buildrc" which is used
+# both (1) interactively from ~/.bashrc when logging into the dev container
+# and (2) from a build-server RUN command. In particular, the latter can't
+# use ~/.bashrc because that script immediately exits when run from a
+# non-interactive shell.
+echo 'source $HOME/.buildrc' >> /var/lib/moonfire-nvr/.bashrc
+cat >> /var/lib/moonfire-nvr/.buildrc <<EOF
+source \$HOME/.cargo/env
+
+# Set the target directory to be outside the src bind mount.
+# https://doc.rust-lang.org/cargo/reference/config.html#buildtarget-dir
+export CARGO_BUILD_TARGET_DIR=/var/lib/moonfire-nvr/target
+EOF
+chown moonfire-nvr:moonfire-nvr /var/lib/moonfire-nvr/.buildrc
diff --git a/docker/dev.bash b/docker/dev.bash
index 97a23bd..49efaa7 100755
--- a/docker/dev.bash
+++ b/docker/dev.bash
@@ -1,4 +1,5 @@
 #!/bin/bash
+# Build the "dev" target. See Dockerfile.
 
 set -o errexit
 set -o pipefail
@@ -64,68 +65,20 @@ fi
 
 apt-get update
 
-# Add yarn repository.
-apt-get --assume-yes --no-install-recommends install curl gnupg ca-certificates
-curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add -
-echo "deb https://dl.yarnpkg.com/debian/ stable main" \
-    >> /etc/apt/sources.list.d/yarn.list
-
-# Install all packages necessary for building (and some for testing/debugging).
+# Install the packages for the target architecture.
 packages+=(
-    build-essential
-    pkgconf
     ffmpeg"${apt_target_suffix}"
     libavcodec-dev"${apt_target_suffix}"
     libavformat-dev"${apt_target_suffix}"
     libavutil-dev"${apt_target_suffix}"
     libncurses-dev"${apt_target_suffix}"
     libsqlite3-dev"${apt_target_suffix}"
-    locales
-    nodejs
-    sudo
-    sqlite3
-    tzdata
-    vim-nox
-    yarn
 )
 apt-get update
 apt-get install --assume-yes --no-install-recommends "${packages[@]}"
 apt-get clean
 rm -rf /var/lib/apt/lists/*
 
-# Create the user. On the dev environment, allow sudo.
-groupadd \
-    --gid="${BUILD_GID}" \
-    moonfire-nvr
-useradd \
-    --no-log-init \
-    --home-dir=/var/lib/moonfire-nvr \
-    --uid="${BUILD_UID}" \
-    --gid=moonfire-nvr \
-    --shell=/bin/bash \
-    --create-home \
-    moonfire-nvr
-echo 'moonfire-nvr ALL=(ALL) NOPASSWD: ALL' >>/etc/sudoers
-
-# Install Rust. Note curl was already installed for yarn above.
-su moonfire-nvr -lc "curl --proto =https --tlsv1.2 -sSf https://sh.rustup.rs |
-                     sh -s - -y"
-
-# Put configuration for the Rust build into a new ".buildrc" which is used
-# both (1) interactively from ~/.bashrc when logging into the dev container
-# and (2) from a build-server RUN command. In particular, the latter can't
-# use ~/.bashrc because that script immediately exits when run from a
-# non-interactive shell.
-echo 'source $HOME/.buildrc' >> /var/lib/moonfire-nvr/.bashrc
-cat >> /var/lib/moonfire-nvr/.buildrc <<EOF
-source \$HOME/.cargo/env
-
-# Set the target directory to be outside the src bind mount.
-# https://doc.rust-lang.org/cargo/reference/config.html#buildtarget-dir
-export CARGO_BUILD_TARGET_DIR=/var/lib/moonfire-nvr/target
-EOF
-chown moonfire-nvr:moonfire-nvr /var/lib/moonfire-nvr/.buildrc
-
 # Set environment variables for cross-compiling.
 # Also set up a symlink that points to the release binary, because the
 # release binary's location varies when cross-compiling, as described here:
diff --git a/guide/build.md b/guide/build.md
index adf24dc..05c289b 100644
--- a/guide/build.md
+++ b/guide/build.md
@@ -84,10 +84,6 @@ caveats:
     $ docker buildx build --load --platform=arm64/v8 ...
     ```
 
-Major caveat: something appears to be making `docker buildx build` frequently
-redo builds rather than reusing cached results. The author is very annoyed by
-this and would welcome help in understanding this problem...
-
 ## Non-Docker setup
 
 You may prefer building without Docker on the host. Moonfire NVR should run
@@ -148,13 +144,15 @@ Once prerequisites are installed, you can build the server and find it in
 `target/release/moonfire-nvr`:
 
 ```
+$ cd server
 $ cargo test
 $ cargo build --release
 ```
 
-You can build the UI via `yarn` and find it in the `ui-dist` directory:
+You can build the UI via `yarn` and find it in the `ui/dist` directory:
 
 ```
+$ cd ui
 $ yarn
 $ yarn build
 ```
diff --git a/guide/developing-ui.md b/guide/developing-ui.md
index a11b536..679e40c 100644
--- a/guide/developing-ui.md
+++ b/guide/developing-ui.md
@@ -20,6 +20,7 @@ this in the webpack documentation.
 
 Checkout the branch you want to work on and type
 
+    $ cd ui
     $ yarn start
 
 This will pack and prepare a development setup. By default the development
diff --git a/Cargo.lock b/server/Cargo.lock
similarity index 100%
rename from Cargo.lock
rename to server/Cargo.lock
diff --git a/Cargo.toml b/server/Cargo.toml
similarity index 100%
rename from Cargo.toml
rename to server/Cargo.toml
diff --git a/base/Cargo.toml b/server/base/Cargo.toml
similarity index 100%
rename from base/Cargo.toml
rename to server/base/Cargo.toml
diff --git a/base/clock.rs b/server/base/clock.rs
similarity index 100%
rename from base/clock.rs
rename to server/base/clock.rs
diff --git a/base/error.rs b/server/base/error.rs
similarity index 100%
rename from base/error.rs
rename to server/base/error.rs
diff --git a/base/lib.rs b/server/base/lib.rs
similarity index 100%
rename from base/lib.rs
rename to server/base/lib.rs
diff --git a/base/strutil.rs b/server/base/strutil.rs
similarity index 100%
rename from base/strutil.rs
rename to server/base/strutil.rs
diff --git a/base/time.rs b/server/base/time.rs
similarity index 100%
rename from base/time.rs
rename to server/base/time.rs
diff --git a/db/Cargo.toml b/server/db/Cargo.toml
similarity index 100%
rename from db/Cargo.toml
rename to server/db/Cargo.toml
diff --git a/db/auth.rs b/server/db/auth.rs
similarity index 100%
rename from db/auth.rs
rename to server/db/auth.rs
diff --git a/db/build.rs b/server/db/build.rs
similarity index 100%
rename from db/build.rs
rename to server/db/build.rs
diff --git a/db/check.rs b/server/db/check.rs
similarity index 100%
rename from db/check.rs
rename to server/db/check.rs
diff --git a/db/coding.rs b/server/db/coding.rs
similarity index 100%
rename from db/coding.rs
rename to server/db/coding.rs
diff --git a/db/compare.rs b/server/db/compare.rs
similarity index 100%
rename from db/compare.rs
rename to server/db/compare.rs
diff --git a/db/db.rs b/server/db/db.rs
similarity index 100%
rename from db/db.rs
rename to server/db/db.rs
diff --git a/db/dir.rs b/server/db/dir.rs
similarity index 100%
rename from db/dir.rs
rename to server/db/dir.rs
diff --git a/db/fs.rs b/server/db/fs.rs
similarity index 100%
rename from db/fs.rs
rename to server/db/fs.rs
diff --git a/db/lib.rs b/server/db/lib.rs
similarity index 100%
rename from db/lib.rs
rename to server/db/lib.rs
diff --git a/db/proto/schema.proto b/server/db/proto/schema.proto
similarity index 100%
rename from db/proto/schema.proto
rename to server/db/proto/schema.proto
diff --git a/db/raw.rs b/server/db/raw.rs
similarity index 100%
rename from db/raw.rs
rename to server/db/raw.rs
diff --git a/db/recording.rs b/server/db/recording.rs
similarity index 100%
rename from db/recording.rs
rename to server/db/recording.rs
diff --git a/db/schema.sql b/server/db/schema.sql
similarity index 100%
rename from db/schema.sql
rename to server/db/schema.sql
diff --git a/db/signal.rs b/server/db/signal.rs
similarity index 100%
rename from db/signal.rs
rename to server/db/signal.rs
diff --git a/db/testdata/avc1 b/server/db/testdata/avc1
similarity index 100%
rename from db/testdata/avc1
rename to server/db/testdata/avc1
diff --git a/db/testdata/video_sample_index.bin b/server/db/testdata/video_sample_index.bin
similarity index 100%
rename from db/testdata/video_sample_index.bin
rename to server/db/testdata/video_sample_index.bin
diff --git a/db/testutil.rs b/server/db/testutil.rs
similarity index 100%
rename from db/testutil.rs
rename to server/db/testutil.rs
diff --git a/db/upgrade/mod.rs b/server/db/upgrade/mod.rs
similarity index 100%
rename from db/upgrade/mod.rs
rename to server/db/upgrade/mod.rs
diff --git a/db/upgrade/v0.sql b/server/db/upgrade/v0.sql
similarity index 100%
rename from db/upgrade/v0.sql
rename to server/db/upgrade/v0.sql
diff --git a/db/upgrade/v0_to_v1.rs b/server/db/upgrade/v0_to_v1.rs
similarity index 100%
rename from db/upgrade/v0_to_v1.rs
rename to server/db/upgrade/v0_to_v1.rs
diff --git a/db/upgrade/v1.sql b/server/db/upgrade/v1.sql
similarity index 100%
rename from db/upgrade/v1.sql
rename to server/db/upgrade/v1.sql
diff --git a/db/upgrade/v1_to_v2.rs b/server/db/upgrade/v1_to_v2.rs
similarity index 100%
rename from db/upgrade/v1_to_v2.rs
rename to server/db/upgrade/v1_to_v2.rs
diff --git a/db/upgrade/v2_to_v3.rs b/server/db/upgrade/v2_to_v3.rs
similarity index 100%
rename from db/upgrade/v2_to_v3.rs
rename to server/db/upgrade/v2_to_v3.rs
diff --git a/db/upgrade/v3.sql b/server/db/upgrade/v3.sql
similarity index 100%
rename from db/upgrade/v3.sql
rename to server/db/upgrade/v3.sql
diff --git a/db/upgrade/v3_to_v4.rs b/server/db/upgrade/v3_to_v4.rs
similarity index 100%
rename from db/upgrade/v3_to_v4.rs
rename to server/db/upgrade/v3_to_v4.rs
diff --git a/db/upgrade/v4_to_v5.rs b/server/db/upgrade/v4_to_v5.rs
similarity index 100%
rename from db/upgrade/v4_to_v5.rs
rename to server/db/upgrade/v4_to_v5.rs
diff --git a/db/upgrade/v5.sql b/server/db/upgrade/v5.sql
similarity index 100%
rename from db/upgrade/v5.sql
rename to server/db/upgrade/v5.sql
diff --git a/db/upgrade/v5_to_v6.rs b/server/db/upgrade/v5_to_v6.rs
similarity index 100%
rename from db/upgrade/v5_to_v6.rs
rename to server/db/upgrade/v5_to_v6.rs
diff --git a/db/writer.rs b/server/db/writer.rs
similarity index 100%
rename from db/writer.rs
rename to server/db/writer.rs
diff --git a/src/analytics.rs b/server/src/analytics.rs
similarity index 100%
rename from src/analytics.rs
rename to server/src/analytics.rs
diff --git a/src/body.rs b/server/src/body.rs
similarity index 100%
rename from src/body.rs
rename to server/src/body.rs
diff --git a/src/cmds/check.rs b/server/src/cmds/check.rs
similarity index 100%
rename from src/cmds/check.rs
rename to server/src/cmds/check.rs
diff --git a/src/cmds/config/cameras.rs b/server/src/cmds/config/cameras.rs
similarity index 100%
rename from src/cmds/config/cameras.rs
rename to server/src/cmds/config/cameras.rs
diff --git a/src/cmds/config/dirs.rs b/server/src/cmds/config/dirs.rs
similarity index 100%
rename from src/cmds/config/dirs.rs
rename to server/src/cmds/config/dirs.rs
diff --git a/src/cmds/config/mod.rs b/server/src/cmds/config/mod.rs
similarity index 100%
rename from src/cmds/config/mod.rs
rename to server/src/cmds/config/mod.rs
diff --git a/src/cmds/config/users.rs b/server/src/cmds/config/users.rs
similarity index 100%
rename from src/cmds/config/users.rs
rename to server/src/cmds/config/users.rs
diff --git a/src/cmds/init.rs b/server/src/cmds/init.rs
similarity index 100%
rename from src/cmds/init.rs
rename to server/src/cmds/init.rs
diff --git a/src/cmds/login.rs b/server/src/cmds/login.rs
similarity index 100%
rename from src/cmds/login.rs
rename to server/src/cmds/login.rs
diff --git a/src/cmds/mod.rs b/server/src/cmds/mod.rs
similarity index 100%
rename from src/cmds/mod.rs
rename to server/src/cmds/mod.rs
diff --git a/src/cmds/run.rs b/server/src/cmds/run.rs
similarity index 100%
rename from src/cmds/run.rs
rename to server/src/cmds/run.rs
diff --git a/src/cmds/sql.rs b/server/src/cmds/sql.rs
similarity index 100%
rename from src/cmds/sql.rs
rename to server/src/cmds/sql.rs
diff --git a/src/cmds/ts.rs b/server/src/cmds/ts.rs
similarity index 100%
rename from src/cmds/ts.rs
rename to server/src/cmds/ts.rs
diff --git a/src/cmds/upgrade/mod.rs b/server/src/cmds/upgrade/mod.rs
similarity index 100%
rename from src/cmds/upgrade/mod.rs
rename to server/src/cmds/upgrade/mod.rs
diff --git a/src/edgetpu.tflite b/server/src/edgetpu.tflite
similarity index 100%
rename from src/edgetpu.tflite
rename to server/src/edgetpu.tflite
diff --git a/src/h264.rs b/server/src/h264.rs
similarity index 100%
rename from src/h264.rs
rename to server/src/h264.rs
diff --git a/src/json.rs b/server/src/json.rs
similarity index 100%
rename from src/json.rs
rename to server/src/json.rs
diff --git a/src/main.rs b/server/src/main.rs
similarity index 100%
rename from src/main.rs
rename to server/src/main.rs
diff --git a/src/mp4.rs b/server/src/mp4.rs
similarity index 100%
rename from src/mp4.rs
rename to server/src/mp4.rs
diff --git a/src/slices.rs b/server/src/slices.rs
similarity index 100%
rename from src/slices.rs
rename to server/src/slices.rs
diff --git a/src/stream.rs b/server/src/stream.rs
similarity index 100%
rename from src/stream.rs
rename to server/src/stream.rs
diff --git a/src/streamer.rs b/server/src/streamer.rs
similarity index 100%
rename from src/streamer.rs
rename to server/src/streamer.rs
diff --git a/src/testdata/clip.mp4 b/server/src/testdata/clip.mp4
similarity index 100%
rename from src/testdata/clip.mp4
rename to server/src/testdata/clip.mp4
diff --git a/src/web.rs b/server/src/web.rs
similarity index 100%
rename from src/web.rs
rename to server/src/web.rs
diff --git a/.eslintrc.json b/ui/.eslintrc.json
similarity index 100%
rename from .eslintrc.json
rename to ui/.eslintrc.json
diff --git a/package.json b/ui/package.json
similarity index 98%
rename from package.json
rename to ui/package.json
index 41572ed..520670f 100644
--- a/package.json
+++ b/ui/package.json
@@ -10,7 +10,7 @@
   "scripts": {
     "start": "webpack-dev-server --mode development --config webpack/dev.config.js --progress",
     "build": "webpack --mode production --config webpack/prod.config.js",
-    "lint": "eslint ui-src"
+    "lint": "eslint src"
   },
   "dependencies": {
     "jquery": "^3.2.1",
@@ -45,3 +45,4 @@
     "webpack-merge": "^4.2.2"
   }
 }
+
diff --git a/ui-src/NVRApplication.js b/ui/src/NVRApplication.js
similarity index 100%
rename from ui-src/NVRApplication.js
rename to ui/src/NVRApplication.js
diff --git a/ui-src/favicon.svg b/ui/src/favicon.svg
similarity index 100%
rename from ui-src/favicon.svg
rename to ui/src/favicon.svg
diff --git a/ui-src/index.css b/ui/src/index.css
similarity index 100%
rename from ui-src/index.css
rename to ui/src/index.css
diff --git a/ui-src/index.html b/ui/src/index.html
similarity index 100%
rename from ui-src/index.html
rename to ui/src/index.html
diff --git a/ui-src/index.js b/ui/src/index.js
similarity index 100%
rename from ui-src/index.js
rename to ui/src/index.js
diff --git a/ui-src/lib/MoonfireAPI.js b/ui/src/lib/MoonfireAPI.js
similarity index 100%
rename from ui-src/lib/MoonfireAPI.js
rename to ui/src/lib/MoonfireAPI.js
diff --git a/ui-src/lib/models/CalendarTSRange.js b/ui/src/lib/models/CalendarTSRange.js
similarity index 100%
rename from ui-src/lib/models/CalendarTSRange.js
rename to ui/src/lib/models/CalendarTSRange.js
diff --git a/ui-src/lib/models/Camera.js b/ui/src/lib/models/Camera.js
similarity index 100%
rename from ui-src/lib/models/Camera.js
rename to ui/src/lib/models/Camera.js
diff --git a/ui-src/lib/models/Range.js b/ui/src/lib/models/Range.js
similarity index 100%
rename from ui-src/lib/models/Range.js
rename to ui/src/lib/models/Range.js
diff --git a/ui-src/lib/models/Range90k.js b/ui/src/lib/models/Range90k.js
similarity index 100%
rename from ui-src/lib/models/Range90k.js
rename to ui/src/lib/models/Range90k.js
diff --git a/ui-src/lib/models/Recording.js b/ui/src/lib/models/Recording.js
similarity index 100%
rename from ui-src/lib/models/Recording.js
rename to ui/src/lib/models/Recording.js
diff --git a/ui-src/lib/models/Stream.js b/ui/src/lib/models/Stream.js
similarity index 100%
rename from ui-src/lib/models/Stream.js
rename to ui/src/lib/models/Stream.js
diff --git a/ui-src/lib/support/RecordingFormatter.js b/ui/src/lib/support/RecordingFormatter.js
similarity index 100%
rename from ui-src/lib/support/RecordingFormatter.js
rename to ui/src/lib/support/RecordingFormatter.js
diff --git a/ui-src/lib/support/Time90kParser.js b/ui/src/lib/support/Time90kParser.js
similarity index 100%
rename from ui-src/lib/support/Time90kParser.js
rename to ui/src/lib/support/Time90kParser.js
diff --git a/ui-src/lib/support/TimeFormatter.js b/ui/src/lib/support/TimeFormatter.js
similarity index 100%
rename from ui-src/lib/support/TimeFormatter.js
rename to ui/src/lib/support/TimeFormatter.js
diff --git a/ui-src/lib/support/TimeStamp90kFormatter.js b/ui/src/lib/support/TimeStamp90kFormatter.js
similarity index 100%
rename from ui-src/lib/support/TimeStamp90kFormatter.js
rename to ui/src/lib/support/TimeStamp90kFormatter.js
diff --git a/ui-src/lib/support/URLBuilder.js b/ui/src/lib/support/URLBuilder.js
similarity index 100%
rename from ui-src/lib/support/URLBuilder.js
rename to ui/src/lib/support/URLBuilder.js
diff --git a/ui-src/lib/views/CalendarView.js b/ui/src/lib/views/CalendarView.js
similarity index 100%
rename from ui-src/lib/views/CalendarView.js
rename to ui/src/lib/views/CalendarView.js
diff --git a/ui-src/lib/views/DatePickerView.js b/ui/src/lib/views/DatePickerView.js
similarity index 100%
rename from ui-src/lib/views/DatePickerView.js
rename to ui/src/lib/views/DatePickerView.js
diff --git a/ui-src/lib/views/NVRSettingsView.js b/ui/src/lib/views/NVRSettingsView.js
similarity index 100%
rename from ui-src/lib/views/NVRSettingsView.js
rename to ui/src/lib/views/NVRSettingsView.js
diff --git a/ui-src/lib/views/RecordingsView.js b/ui/src/lib/views/RecordingsView.js
similarity index 100%
rename from ui-src/lib/views/RecordingsView.js
rename to ui/src/lib/views/RecordingsView.js
diff --git a/ui-src/lib/views/StreamSelectorView.js b/ui/src/lib/views/StreamSelectorView.js
similarity index 100%
rename from ui-src/lib/views/StreamSelectorView.js
rename to ui/src/lib/views/StreamSelectorView.js
diff --git a/ui-src/lib/views/StreamView.js b/ui/src/lib/views/StreamView.js
similarity index 100%
rename from ui-src/lib/views/StreamView.js
rename to ui/src/lib/views/StreamView.js
diff --git a/ui-src/lib/views/VideoDialogView.js b/ui/src/lib/views/VideoDialogView.js
similarity index 100%
rename from ui-src/lib/views/VideoDialogView.js
rename to ui/src/lib/views/VideoDialogView.js
diff --git a/webpack/base.config.js b/ui/webpack/base.config.js
similarity index 94%
rename from webpack/base.config.js
rename to ui/webpack/base.config.js
index 4f98b57..ec97ba0 100644
--- a/webpack/base.config.js
+++ b/ui/webpack/base.config.js
@@ -37,11 +37,11 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
 
 module.exports = {
   entry: {
-    nvr: './ui-src/index.js',
+    nvr: './src/index.js',
   },
   output: {
     filename: '[name].[chunkhash].js',
-    path: path.resolve('./ui-dist/'),
+    path: path.resolve('./dist/'),
     publicPath: '/',
   },
   module: {
@@ -60,7 +60,7 @@ module.exports = {
           ],
         },
         exclude: /(node_modules|bower_components)/,
-        include: [path.resolve('./ui-src')],
+        include: [path.resolve('./src')],
       },
       {
         test: /\.png$/,
@@ -83,7 +83,7 @@ module.exports = {
   plugins: [
     new webpack.IgnorePlugin(/\.\/locale$/),
     new HtmlWebpackPlugin({
-      template: './ui-src/index.html',
+      template: './src/index.html',
     }),
     new webpack.NormalModuleReplacementPlugin(
       /node_modules\/moment\/moment\.js$/,
@@ -94,7 +94,7 @@ module.exports = {
       './builds/moment-timezone-with-data-2012-2022.min.js'
     ),
     new FaviconsWebpackPlugin({
-      logo: './ui-src/favicon.svg',
+      logo: './src/favicon.svg',
       mode: 'webapp',
       devMode: 'light',
       prefix: 'favicons-[hash]/',
diff --git a/webpack/dev.config.js b/ui/webpack/dev.config.js
similarity index 100%
rename from webpack/dev.config.js
rename to ui/webpack/dev.config.js
diff --git a/webpack/prod.config.js b/ui/webpack/prod.config.js
similarity index 100%
rename from webpack/prod.config.js
rename to ui/webpack/prod.config.js
diff --git a/yarn.lock b/ui/yarn.lock
similarity index 100%
rename from yarn.lock
rename to ui/yarn.lock