diff --git a/.gitignore b/.gitignore
index c3a8bd70e..01032e172 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,16 +6,14 @@ ansible/passwords/
 # docker build files
 docker/lemmy_mine.hjson
 docker/dev/env_deploy.sh
-docker/federation/volumes
-docker/federation-test/volumes
-docker/dev/volumes
-
-# local build files
-build/
-ui/src/translations
+volumes
 
 # ide config
-.idea/
-.vscode/
+.idea
+.vscode
 
+# local build files
 target
+env_setup.sh
+query_testing/*.json
+query_testing/*.json.old
diff --git a/server/.rustfmt.toml b/.rustfmt.toml
similarity index 100%
rename from server/.rustfmt.toml
rename to .rustfmt.toml
diff --git a/server/Cargo.lock b/Cargo.lock
similarity index 100%
rename from server/Cargo.lock
rename to Cargo.lock
diff --git a/server/Cargo.toml b/Cargo.toml
similarity index 100%
rename from server/Cargo.toml
rename to Cargo.toml
diff --git a/server/clean.sh b/clean.sh
similarity index 100%
rename from server/clean.sh
rename to clean.sh
diff --git a/server/config/config.hjson b/config/config.hjson
similarity index 100%
rename from server/config/config.hjson
rename to config/config.hjson
diff --git a/server/config/defaults.hjson b/config/defaults.hjson
similarity index 100%
rename from server/config/defaults.hjson
rename to config/defaults.hjson
diff --git a/server/db-init.sh b/db-init.sh
similarity index 100%
rename from server/db-init.sh
rename to db-init.sh
diff --git a/server/diesel.toml b/diesel.toml
similarity index 100%
rename from server/diesel.toml
rename to diesel.toml
diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile
index 7c60a4c45..d9a95c85c 100644
--- a/docker/dev/Dockerfile
+++ b/docker/dev/Dockerfile
@@ -15,22 +15,22 @@ RUN mkdir -p lemmy_db/src/ \
       lemmy
 
 # Copy the cargo tomls
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db/Cargo.toml ./lemmy_db/
-COPY server/lemmy_utils/Cargo.toml ./lemmy_utils/
-COPY server/lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
-COPY server/lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
+COPY Cargo.toml Cargo.lock ./
+COPY lemmy_db/Cargo.toml ./lemmy_db/
+COPY lemmy_utils/Cargo.toml ./lemmy_utils/
+COPY lemmy_api_structs/Cargo.toml ./lemmy_api_structs/
+COPY lemmy_rate_limit/Cargo.toml ./lemmy_rate_limit/
 
 # Cache the deps
 RUN cargo build-deps
 
 # Copy the src folders
-COPY server/src ./src/
-COPY server/lemmy_db/src ./lemmy_db/src/
-COPY server/lemmy_utils/src/ ./lemmy_utils/src/
-COPY server/lemmy_api_structs/src/ ./lemmy_api_structs/src/
-COPY server/lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
-COPY server/migrations ./migrations/
+COPY src ./src/
+COPY lemmy_db/src ./lemmy_db/src/
+COPY lemmy_utils/src/ ./lemmy_utils/src/
+COPY lemmy_api_structs/src/ ./lemmy_api_structs/src/
+COPY lemmy_rate_limit/src/ ./lemmy_rate_limit/src/
+COPY migrations ./migrations/
 
 # Build for debug
 RUN cargo build
@@ -50,7 +50,7 @@ RUN apk add libpq
 RUN apk add espeak
 
 # Copy resources
-COPY server/config/defaults.hjson /config/defaults.hjson
+COPY config/defaults.hjson /config/defaults.hjson
 COPY --from=rust /app/server/target/x86_64-unknown-linux-musl/debug/lemmy_server /app/lemmy
 COPY --from=docs /app/docs/book/ /app/documentation/
 
diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile
index 9bccb4489..cc0f8733e 100644
--- a/docker/prod/Dockerfile
+++ b/docker/prod/Dockerfile
@@ -10,17 +10,17 @@ WORKDIR /app
 RUN sudo chown -R rust:rust .
 RUN USER=root cargo new server
 WORKDIR /app/server
-COPY server/Cargo.toml server/Cargo.lock ./
-COPY server/lemmy_db ./lemmy_db
-COPY server/lemmy_utils ./lemmy_utils
-COPY server/lemmy_api_structs ./lemmy_api_structs
-COPY server/lemmy_rate_limit ./lemmy_rate_limit
+COPY Cargo.toml Cargo.lock ./
+COPY lemmy_db ./lemmy_db
+COPY lemmy_utils ./lemmy_utils
+COPY lemmy_api_structs ./lemmy_api_structs
+COPY lemmy_rate_limit ./lemmy_rate_limit
 RUN mkdir -p ./src/bin \
    && echo 'fn main() { println!("Dummy") }' > ./src/bin/main.rs
 RUN cargo build --release
 RUN find target/$CARGO_BUILD_TARGET/$RUSTRELEASEDIR -type f -name "$(echo "lemmy_server" | tr '-' '_')*" -exec touch -t 200001010000 {} +
-COPY server/src ./src/
-COPY server/migrations ./migrations/
+COPY src ./src/
+COPY migrations ./migrations/
 
 # build for release
 # workaround for https://github.com/rust-lang/rust/issues/62896
@@ -60,7 +60,7 @@ RUN addgroup -g 1000 lemmy
 RUN adduser -D -s /bin/sh -u 1000 -G lemmy lemmy
 
 # Copy resources
-COPY --chown=lemmy:lemmy server/config/defaults.hjson /config/defaults.hjson
+COPY --chown=lemmy:lemmy config/defaults.hjson /config/defaults.hjson
 COPY --chown=lemmy:lemmy --from=rust /app/server/lemmy_server /app/lemmy
 COPY --chown=lemmy:lemmy --from=docs /app/docs/book/ /app/dist/documentation/
 COPY --chown=lemmy:lemmy --from=node /app/ui/dist /app/dist
diff --git a/docker/prod/deploy.sh b/docker/prod/deploy.sh
index 3c12df204..a0a8dd6c7 100755
--- a/docker/prod/deploy.sh
+++ b/docker/prod/deploy.sh
@@ -13,8 +13,8 @@ third_semver=$(echo $new_tag | cut -d "." -f 3)
 # Setting the version on the front end
 cd ../../
 # Setting the version on the backend
-echo "pub const VERSION: &str = \"$new_tag\";" > "server/src/version.rs"
-git add "server/src/version.rs"
+echo "pub const VERSION: &str = \"$new_tag\";" > "src/version.rs"
+git add "src/version.rs"
 # Setting the version for Ansible
 echo $new_tag > "ansible/VERSION"
 git add "ansible/VERSION"
diff --git a/docs/src/administration_configuration.md b/docs/src/administration_configuration.md
index ce9dc2ba8..0e730d330 100644
--- a/docs/src/administration_configuration.md
+++ b/docs/src/administration_configuration.md
@@ -1,7 +1,7 @@
 # Configuration
 
 The configuration is based on the file
-[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/server/config/defaults.hjson).
+[defaults.hjson](https://yerbamate.dev/LemmyNet/lemmy/src/branch/main/config/defaults.hjson).
 This file also contains documentation for all the available options. To override the defaults, you
 can copy the options you want to change into your local `config.hjson` file.
 
diff --git a/docs/src/contributing_local_development.md b/docs/src/contributing_local_development.md
index b95c308da..5bfbfdd10 100644
--- a/docs/src/contributing_local_development.md
+++ b/docs/src/contributing_local_development.md
@@ -32,18 +32,10 @@ by the `cd` command.
 
 ### Build the backend (Rust)
 ```
-cd server
 cargo build
 # for development, use `cargo check` instead)
 ```
 
-### Build the frontend (Typescript)
-```
-cd ui
-yarn
-yarn build
-```
-
 ### Setup postgresql
 #### Ubuntu
 ```
diff --git a/install.sh b/install.sh
index 19b847b1c..2a8390816 100755
--- a/install.sh
+++ b/install.sh
@@ -29,7 +29,7 @@ ask_to_init_db() {
   done
   if [ "$init_db_final" = 1 ]
   then
-    source ./server/db-init.sh
+    source ./db-init.sh
     read -n 1 -s -r -p "Press ANY KEY to continue execution of this script, press CTRL+C to quit..."
     echo
   fi
diff --git a/server/lemmy_api_structs/Cargo.toml b/lemmy_api_structs/Cargo.toml
similarity index 100%
rename from server/lemmy_api_structs/Cargo.toml
rename to lemmy_api_structs/Cargo.toml
diff --git a/server/lemmy_api_structs/src/comment.rs b/lemmy_api_structs/src/comment.rs
similarity index 100%
rename from server/lemmy_api_structs/src/comment.rs
rename to lemmy_api_structs/src/comment.rs
diff --git a/server/lemmy_api_structs/src/community.rs b/lemmy_api_structs/src/community.rs
similarity index 100%
rename from server/lemmy_api_structs/src/community.rs
rename to lemmy_api_structs/src/community.rs
diff --git a/server/lemmy_api_structs/src/lib.rs b/lemmy_api_structs/src/lib.rs
similarity index 100%
rename from server/lemmy_api_structs/src/lib.rs
rename to lemmy_api_structs/src/lib.rs
diff --git a/server/lemmy_api_structs/src/post.rs b/lemmy_api_structs/src/post.rs
similarity index 100%
rename from server/lemmy_api_structs/src/post.rs
rename to lemmy_api_structs/src/post.rs
diff --git a/server/lemmy_api_structs/src/site.rs b/lemmy_api_structs/src/site.rs
similarity index 100%
rename from server/lemmy_api_structs/src/site.rs
rename to lemmy_api_structs/src/site.rs
diff --git a/server/lemmy_api_structs/src/user.rs b/lemmy_api_structs/src/user.rs
similarity index 100%
rename from server/lemmy_api_structs/src/user.rs
rename to lemmy_api_structs/src/user.rs
diff --git a/server/lemmy_db/Cargo.toml b/lemmy_db/Cargo.toml
similarity index 100%
rename from server/lemmy_db/Cargo.toml
rename to lemmy_db/Cargo.toml
diff --git a/server/lemmy_db/src/activity.rs b/lemmy_db/src/activity.rs
similarity index 100%
rename from server/lemmy_db/src/activity.rs
rename to lemmy_db/src/activity.rs
diff --git a/server/lemmy_db/src/category.rs b/lemmy_db/src/category.rs
similarity index 100%
rename from server/lemmy_db/src/category.rs
rename to lemmy_db/src/category.rs
diff --git a/server/lemmy_db/src/comment.rs b/lemmy_db/src/comment.rs
similarity index 100%
rename from server/lemmy_db/src/comment.rs
rename to lemmy_db/src/comment.rs
diff --git a/server/lemmy_db/src/comment_view.rs b/lemmy_db/src/comment_view.rs
similarity index 100%
rename from server/lemmy_db/src/comment_view.rs
rename to lemmy_db/src/comment_view.rs
diff --git a/server/lemmy_db/src/community.rs b/lemmy_db/src/community.rs
similarity index 100%
rename from server/lemmy_db/src/community.rs
rename to lemmy_db/src/community.rs
diff --git a/server/lemmy_db/src/community_view.rs b/lemmy_db/src/community_view.rs
similarity index 100%
rename from server/lemmy_db/src/community_view.rs
rename to lemmy_db/src/community_view.rs
diff --git a/server/lemmy_db/src/lib.rs b/lemmy_db/src/lib.rs
similarity index 100%
rename from server/lemmy_db/src/lib.rs
rename to lemmy_db/src/lib.rs
diff --git a/server/lemmy_db/src/moderator.rs b/lemmy_db/src/moderator.rs
similarity index 100%
rename from server/lemmy_db/src/moderator.rs
rename to lemmy_db/src/moderator.rs
diff --git a/server/lemmy_db/src/moderator_views.rs b/lemmy_db/src/moderator_views.rs
similarity index 100%
rename from server/lemmy_db/src/moderator_views.rs
rename to lemmy_db/src/moderator_views.rs
diff --git a/server/lemmy_db/src/password_reset_request.rs b/lemmy_db/src/password_reset_request.rs
similarity index 100%
rename from server/lemmy_db/src/password_reset_request.rs
rename to lemmy_db/src/password_reset_request.rs
diff --git a/server/lemmy_db/src/post.rs b/lemmy_db/src/post.rs
similarity index 100%
rename from server/lemmy_db/src/post.rs
rename to lemmy_db/src/post.rs
diff --git a/server/lemmy_db/src/post_view.rs b/lemmy_db/src/post_view.rs
similarity index 100%
rename from server/lemmy_db/src/post_view.rs
rename to lemmy_db/src/post_view.rs
diff --git a/server/lemmy_db/src/private_message.rs b/lemmy_db/src/private_message.rs
similarity index 100%
rename from server/lemmy_db/src/private_message.rs
rename to lemmy_db/src/private_message.rs
diff --git a/server/lemmy_db/src/private_message_view.rs b/lemmy_db/src/private_message_view.rs
similarity index 100%
rename from server/lemmy_db/src/private_message_view.rs
rename to lemmy_db/src/private_message_view.rs
diff --git a/server/lemmy_db/src/schema.rs b/lemmy_db/src/schema.rs
similarity index 100%
rename from server/lemmy_db/src/schema.rs
rename to lemmy_db/src/schema.rs
diff --git a/server/lemmy_db/src/site.rs b/lemmy_db/src/site.rs
similarity index 100%
rename from server/lemmy_db/src/site.rs
rename to lemmy_db/src/site.rs
diff --git a/server/lemmy_db/src/site_view.rs b/lemmy_db/src/site_view.rs
similarity index 100%
rename from server/lemmy_db/src/site_view.rs
rename to lemmy_db/src/site_view.rs
diff --git a/server/lemmy_db/src/user.rs b/lemmy_db/src/user.rs
similarity index 100%
rename from server/lemmy_db/src/user.rs
rename to lemmy_db/src/user.rs
diff --git a/server/lemmy_db/src/user_mention.rs b/lemmy_db/src/user_mention.rs
similarity index 100%
rename from server/lemmy_db/src/user_mention.rs
rename to lemmy_db/src/user_mention.rs
diff --git a/server/lemmy_db/src/user_mention_view.rs b/lemmy_db/src/user_mention_view.rs
similarity index 100%
rename from server/lemmy_db/src/user_mention_view.rs
rename to lemmy_db/src/user_mention_view.rs
diff --git a/server/lemmy_db/src/user_view.rs b/lemmy_db/src/user_view.rs
similarity index 100%
rename from server/lemmy_db/src/user_view.rs
rename to lemmy_db/src/user_view.rs
diff --git a/server/lemmy_rate_limit/Cargo.toml b/lemmy_rate_limit/Cargo.toml
similarity index 100%
rename from server/lemmy_rate_limit/Cargo.toml
rename to lemmy_rate_limit/Cargo.toml
diff --git a/server/lemmy_rate_limit/src/lib.rs b/lemmy_rate_limit/src/lib.rs
similarity index 100%
rename from server/lemmy_rate_limit/src/lib.rs
rename to lemmy_rate_limit/src/lib.rs
diff --git a/server/lemmy_rate_limit/src/rate_limiter.rs b/lemmy_rate_limit/src/rate_limiter.rs
similarity index 100%
rename from server/lemmy_rate_limit/src/rate_limiter.rs
rename to lemmy_rate_limit/src/rate_limiter.rs
diff --git a/server/lemmy_utils/Cargo.toml b/lemmy_utils/Cargo.toml
similarity index 100%
rename from server/lemmy_utils/Cargo.toml
rename to lemmy_utils/Cargo.toml
diff --git a/server/lemmy_utils/src/lib.rs b/lemmy_utils/src/lib.rs
similarity index 100%
rename from server/lemmy_utils/src/lib.rs
rename to lemmy_utils/src/lib.rs
diff --git a/server/lemmy_utils/src/settings.rs b/lemmy_utils/src/settings.rs
similarity index 98%
rename from server/lemmy_utils/src/settings.rs
rename to lemmy_utils/src/settings.rs
index ac4eb0b8f..82bdceb21 100644
--- a/server/lemmy_utils/src/settings.rs
+++ b/lemmy_utils/src/settings.rs
@@ -87,7 +87,7 @@ impl Settings {
   /// added to the config.
   ///
   /// Note: The env var `LEMMY_DATABASE_URL` is parsed in
-  /// `server/lemmy_db/src/lib.rs::get_database_url_from_env()`
+  /// `lemmy_db/src/lib.rs::get_database_url_from_env()`
   fn init() -> Result<Self, ConfigError> {
     let mut s = Config::new();
 
diff --git a/server/migrations/.gitkeep b/migrations/.gitkeep
similarity index 100%
rename from server/migrations/.gitkeep
rename to migrations/.gitkeep
diff --git a/server/migrations/00000000000000_diesel_initial_setup/down.sql b/migrations/00000000000000_diesel_initial_setup/down.sql
similarity index 100%
rename from server/migrations/00000000000000_diesel_initial_setup/down.sql
rename to migrations/00000000000000_diesel_initial_setup/down.sql
diff --git a/server/migrations/00000000000000_diesel_initial_setup/up.sql b/migrations/00000000000000_diesel_initial_setup/up.sql
similarity index 100%
rename from server/migrations/00000000000000_diesel_initial_setup/up.sql
rename to migrations/00000000000000_diesel_initial_setup/up.sql
diff --git a/server/migrations/2019-02-26-002946_create_user/down.sql b/migrations/2019-02-26-002946_create_user/down.sql
similarity index 100%
rename from server/migrations/2019-02-26-002946_create_user/down.sql
rename to migrations/2019-02-26-002946_create_user/down.sql
diff --git a/server/migrations/2019-02-26-002946_create_user/up.sql b/migrations/2019-02-26-002946_create_user/up.sql
similarity index 100%
rename from server/migrations/2019-02-26-002946_create_user/up.sql
rename to migrations/2019-02-26-002946_create_user/up.sql
diff --git a/server/migrations/2019-02-27-170003_create_community/down.sql b/migrations/2019-02-27-170003_create_community/down.sql
similarity index 100%
rename from server/migrations/2019-02-27-170003_create_community/down.sql
rename to migrations/2019-02-27-170003_create_community/down.sql
diff --git a/server/migrations/2019-02-27-170003_create_community/up.sql b/migrations/2019-02-27-170003_create_community/up.sql
similarity index 100%
rename from server/migrations/2019-02-27-170003_create_community/up.sql
rename to migrations/2019-02-27-170003_create_community/up.sql
diff --git a/server/migrations/2019-03-03-163336_create_post/down.sql b/migrations/2019-03-03-163336_create_post/down.sql
similarity index 100%
rename from server/migrations/2019-03-03-163336_create_post/down.sql
rename to migrations/2019-03-03-163336_create_post/down.sql
diff --git a/server/migrations/2019-03-03-163336_create_post/up.sql b/migrations/2019-03-03-163336_create_post/up.sql
similarity index 100%
rename from server/migrations/2019-03-03-163336_create_post/up.sql
rename to migrations/2019-03-03-163336_create_post/up.sql
diff --git a/server/migrations/2019-03-05-233828_create_comment/down.sql b/migrations/2019-03-05-233828_create_comment/down.sql
similarity index 100%
rename from server/migrations/2019-03-05-233828_create_comment/down.sql
rename to migrations/2019-03-05-233828_create_comment/down.sql
diff --git a/server/migrations/2019-03-05-233828_create_comment/up.sql b/migrations/2019-03-05-233828_create_comment/up.sql
similarity index 100%
rename from server/migrations/2019-03-05-233828_create_comment/up.sql
rename to migrations/2019-03-05-233828_create_comment/up.sql
diff --git a/server/migrations/2019-03-30-212058_create_post_view/down.sql b/migrations/2019-03-30-212058_create_post_view/down.sql
similarity index 100%
rename from server/migrations/2019-03-30-212058_create_post_view/down.sql
rename to migrations/2019-03-30-212058_create_post_view/down.sql
diff --git a/server/migrations/2019-03-30-212058_create_post_view/up.sql b/migrations/2019-03-30-212058_create_post_view/up.sql
similarity index 100%
rename from server/migrations/2019-03-30-212058_create_post_view/up.sql
rename to migrations/2019-03-30-212058_create_post_view/up.sql
diff --git a/server/migrations/2019-04-03-155205_create_community_view/down.sql b/migrations/2019-04-03-155205_create_community_view/down.sql
similarity index 100%
rename from server/migrations/2019-04-03-155205_create_community_view/down.sql
rename to migrations/2019-04-03-155205_create_community_view/down.sql
diff --git a/server/migrations/2019-04-03-155205_create_community_view/up.sql b/migrations/2019-04-03-155205_create_community_view/up.sql
similarity index 100%
rename from server/migrations/2019-04-03-155205_create_community_view/up.sql
rename to migrations/2019-04-03-155205_create_community_view/up.sql
diff --git a/server/migrations/2019-04-03-155309_create_comment_view/down.sql b/migrations/2019-04-03-155309_create_comment_view/down.sql
similarity index 100%
rename from server/migrations/2019-04-03-155309_create_comment_view/down.sql
rename to migrations/2019-04-03-155309_create_comment_view/down.sql
diff --git a/server/migrations/2019-04-03-155309_create_comment_view/up.sql b/migrations/2019-04-03-155309_create_comment_view/up.sql
similarity index 100%
rename from server/migrations/2019-04-03-155309_create_comment_view/up.sql
rename to migrations/2019-04-03-155309_create_comment_view/up.sql
diff --git a/server/migrations/2019-04-07-003142_create_moderation_logs/down.sql b/migrations/2019-04-07-003142_create_moderation_logs/down.sql
similarity index 100%
rename from server/migrations/2019-04-07-003142_create_moderation_logs/down.sql
rename to migrations/2019-04-07-003142_create_moderation_logs/down.sql
diff --git a/server/migrations/2019-04-07-003142_create_moderation_logs/up.sql b/migrations/2019-04-07-003142_create_moderation_logs/up.sql
similarity index 100%
rename from server/migrations/2019-04-07-003142_create_moderation_logs/up.sql
rename to migrations/2019-04-07-003142_create_moderation_logs/up.sql
diff --git a/server/migrations/2019-04-08-015947_create_user_view/down.sql b/migrations/2019-04-08-015947_create_user_view/down.sql
similarity index 100%
rename from server/migrations/2019-04-08-015947_create_user_view/down.sql
rename to migrations/2019-04-08-015947_create_user_view/down.sql
diff --git a/server/migrations/2019-04-08-015947_create_user_view/up.sql b/migrations/2019-04-08-015947_create_user_view/up.sql
similarity index 100%
rename from server/migrations/2019-04-08-015947_create_user_view/up.sql
rename to migrations/2019-04-08-015947_create_user_view/up.sql
diff --git a/server/migrations/2019-04-11-144915_create_mod_views/down.sql b/migrations/2019-04-11-144915_create_mod_views/down.sql
similarity index 100%
rename from server/migrations/2019-04-11-144915_create_mod_views/down.sql
rename to migrations/2019-04-11-144915_create_mod_views/down.sql
diff --git a/server/migrations/2019-04-11-144915_create_mod_views/up.sql b/migrations/2019-04-11-144915_create_mod_views/up.sql
similarity index 100%
rename from server/migrations/2019-04-11-144915_create_mod_views/up.sql
rename to migrations/2019-04-11-144915_create_mod_views/up.sql
diff --git a/server/migrations/2019-04-29-175834_add_delete_columns/down.sql b/migrations/2019-04-29-175834_add_delete_columns/down.sql
similarity index 100%
rename from server/migrations/2019-04-29-175834_add_delete_columns/down.sql
rename to migrations/2019-04-29-175834_add_delete_columns/down.sql
diff --git a/server/migrations/2019-04-29-175834_add_delete_columns/up.sql b/migrations/2019-04-29-175834_add_delete_columns/up.sql
similarity index 100%
rename from server/migrations/2019-04-29-175834_add_delete_columns/up.sql
rename to migrations/2019-04-29-175834_add_delete_columns/up.sql
diff --git a/server/migrations/2019-05-02-051656_community_view_hot_rank/down.sql b/migrations/2019-05-02-051656_community_view_hot_rank/down.sql
similarity index 100%
rename from server/migrations/2019-05-02-051656_community_view_hot_rank/down.sql
rename to migrations/2019-05-02-051656_community_view_hot_rank/down.sql
diff --git a/server/migrations/2019-05-02-051656_community_view_hot_rank/up.sql b/migrations/2019-05-02-051656_community_view_hot_rank/up.sql
similarity index 100%
rename from server/migrations/2019-05-02-051656_community_view_hot_rank/up.sql
rename to migrations/2019-05-02-051656_community_view_hot_rank/up.sql
diff --git a/server/migrations/2019-06-01-222649_remove_admin/down.sql b/migrations/2019-06-01-222649_remove_admin/down.sql
similarity index 100%
rename from server/migrations/2019-06-01-222649_remove_admin/down.sql
rename to migrations/2019-06-01-222649_remove_admin/down.sql
diff --git a/server/migrations/2019-06-01-222649_remove_admin/up.sql b/migrations/2019-06-01-222649_remove_admin/up.sql
similarity index 100%
rename from server/migrations/2019-06-01-222649_remove_admin/up.sql
rename to migrations/2019-06-01-222649_remove_admin/up.sql
diff --git a/server/migrations/2019-08-11-000918_add_nsfw_columns/down.sql b/migrations/2019-08-11-000918_add_nsfw_columns/down.sql
similarity index 100%
rename from server/migrations/2019-08-11-000918_add_nsfw_columns/down.sql
rename to migrations/2019-08-11-000918_add_nsfw_columns/down.sql
diff --git a/server/migrations/2019-08-11-000918_add_nsfw_columns/up.sql b/migrations/2019-08-11-000918_add_nsfw_columns/up.sql
similarity index 100%
rename from server/migrations/2019-08-11-000918_add_nsfw_columns/up.sql
rename to migrations/2019-08-11-000918_add_nsfw_columns/up.sql
diff --git a/server/migrations/2019-08-29-040006_add_community_count/down.sql b/migrations/2019-08-29-040006_add_community_count/down.sql
similarity index 100%
rename from server/migrations/2019-08-29-040006_add_community_count/down.sql
rename to migrations/2019-08-29-040006_add_community_count/down.sql
diff --git a/server/migrations/2019-08-29-040006_add_community_count/up.sql b/migrations/2019-08-29-040006_add_community_count/up.sql
similarity index 100%
rename from server/migrations/2019-08-29-040006_add_community_count/up.sql
rename to migrations/2019-08-29-040006_add_community_count/up.sql
diff --git a/server/migrations/2019-09-05-230317_add_mod_ban_views/down.sql b/migrations/2019-09-05-230317_add_mod_ban_views/down.sql
similarity index 100%
rename from server/migrations/2019-09-05-230317_add_mod_ban_views/down.sql
rename to migrations/2019-09-05-230317_add_mod_ban_views/down.sql
diff --git a/server/migrations/2019-09-05-230317_add_mod_ban_views/up.sql b/migrations/2019-09-05-230317_add_mod_ban_views/up.sql
similarity index 100%
rename from server/migrations/2019-09-05-230317_add_mod_ban_views/up.sql
rename to migrations/2019-09-05-230317_add_mod_ban_views/up.sql
diff --git a/server/migrations/2019-09-09-042010_add_stickied_posts/down.sql b/migrations/2019-09-09-042010_add_stickied_posts/down.sql
similarity index 100%
rename from server/migrations/2019-09-09-042010_add_stickied_posts/down.sql
rename to migrations/2019-09-09-042010_add_stickied_posts/down.sql
diff --git a/server/migrations/2019-09-09-042010_add_stickied_posts/up.sql b/migrations/2019-09-09-042010_add_stickied_posts/up.sql
similarity index 100%
rename from server/migrations/2019-09-09-042010_add_stickied_posts/up.sql
rename to migrations/2019-09-09-042010_add_stickied_posts/up.sql
diff --git a/server/migrations/2019-10-15-181630_add_themes/down.sql b/migrations/2019-10-15-181630_add_themes/down.sql
similarity index 100%
rename from server/migrations/2019-10-15-181630_add_themes/down.sql
rename to migrations/2019-10-15-181630_add_themes/down.sql
diff --git a/server/migrations/2019-10-15-181630_add_themes/up.sql b/migrations/2019-10-15-181630_add_themes/up.sql
similarity index 100%
rename from server/migrations/2019-10-15-181630_add_themes/up.sql
rename to migrations/2019-10-15-181630_add_themes/up.sql
diff --git a/server/migrations/2019-10-19-052737_create_user_mention/down.sql b/migrations/2019-10-19-052737_create_user_mention/down.sql
similarity index 100%
rename from server/migrations/2019-10-19-052737_create_user_mention/down.sql
rename to migrations/2019-10-19-052737_create_user_mention/down.sql
diff --git a/server/migrations/2019-10-19-052737_create_user_mention/up.sql b/migrations/2019-10-19-052737_create_user_mention/up.sql
similarity index 100%
rename from server/migrations/2019-10-19-052737_create_user_mention/up.sql
rename to migrations/2019-10-19-052737_create_user_mention/up.sql
diff --git a/server/migrations/2019-10-21-011237_add_default_sorts/down.sql b/migrations/2019-10-21-011237_add_default_sorts/down.sql
similarity index 100%
rename from server/migrations/2019-10-21-011237_add_default_sorts/down.sql
rename to migrations/2019-10-21-011237_add_default_sorts/down.sql
diff --git a/server/migrations/2019-10-21-011237_add_default_sorts/up.sql b/migrations/2019-10-21-011237_add_default_sorts/up.sql
similarity index 100%
rename from server/migrations/2019-10-21-011237_add_default_sorts/up.sql
rename to migrations/2019-10-21-011237_add_default_sorts/up.sql
diff --git a/server/migrations/2019-10-24-002614_create_password_reset_request/down.sql b/migrations/2019-10-24-002614_create_password_reset_request/down.sql
similarity index 100%
rename from server/migrations/2019-10-24-002614_create_password_reset_request/down.sql
rename to migrations/2019-10-24-002614_create_password_reset_request/down.sql
diff --git a/server/migrations/2019-10-24-002614_create_password_reset_request/up.sql b/migrations/2019-10-24-002614_create_password_reset_request/up.sql
similarity index 100%
rename from server/migrations/2019-10-24-002614_create_password_reset_request/up.sql
rename to migrations/2019-10-24-002614_create_password_reset_request/up.sql
diff --git a/server/migrations/2019-12-09-060754_add_lang/down.sql b/migrations/2019-12-09-060754_add_lang/down.sql
similarity index 100%
rename from server/migrations/2019-12-09-060754_add_lang/down.sql
rename to migrations/2019-12-09-060754_add_lang/down.sql
diff --git a/server/migrations/2019-12-09-060754_add_lang/up.sql b/migrations/2019-12-09-060754_add_lang/up.sql
similarity index 100%
rename from server/migrations/2019-12-09-060754_add_lang/up.sql
rename to migrations/2019-12-09-060754_add_lang/up.sql
diff --git a/server/migrations/2019-12-11-181820_add_site_fields/down.sql b/migrations/2019-12-11-181820_add_site_fields/down.sql
similarity index 100%
rename from server/migrations/2019-12-11-181820_add_site_fields/down.sql
rename to migrations/2019-12-11-181820_add_site_fields/down.sql
diff --git a/server/migrations/2019-12-11-181820_add_site_fields/up.sql b/migrations/2019-12-11-181820_add_site_fields/up.sql
similarity index 100%
rename from server/migrations/2019-12-11-181820_add_site_fields/up.sql
rename to migrations/2019-12-11-181820_add_site_fields/up.sql
diff --git a/server/migrations/2019-12-29-164820_add_avatar/down.sql b/migrations/2019-12-29-164820_add_avatar/down.sql
similarity index 100%
rename from server/migrations/2019-12-29-164820_add_avatar/down.sql
rename to migrations/2019-12-29-164820_add_avatar/down.sql
diff --git a/server/migrations/2019-12-29-164820_add_avatar/up.sql b/migrations/2019-12-29-164820_add_avatar/up.sql
similarity index 100%
rename from server/migrations/2019-12-29-164820_add_avatar/up.sql
rename to migrations/2019-12-29-164820_add_avatar/up.sql
diff --git a/server/migrations/2020-01-01-200418_add_email_to_user_view/down.sql b/migrations/2020-01-01-200418_add_email_to_user_view/down.sql
similarity index 100%
rename from server/migrations/2020-01-01-200418_add_email_to_user_view/down.sql
rename to migrations/2020-01-01-200418_add_email_to_user_view/down.sql
diff --git a/server/migrations/2020-01-01-200418_add_email_to_user_view/up.sql b/migrations/2020-01-01-200418_add_email_to_user_view/up.sql
similarity index 100%
rename from server/migrations/2020-01-01-200418_add_email_to_user_view/up.sql
rename to migrations/2020-01-01-200418_add_email_to_user_view/up.sql
diff --git a/server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/down.sql b/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/down.sql
similarity index 100%
rename from server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/down.sql
rename to migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/down.sql
diff --git a/server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/up.sql b/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/up.sql
similarity index 100%
rename from server/migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/up.sql
rename to migrations/2020-01-02-172755_add_show_avatar_and_email_notifications_to_user/up.sql
diff --git a/server/migrations/2020-01-11-012452_add_indexes/down.sql b/migrations/2020-01-11-012452_add_indexes/down.sql
similarity index 100%
rename from server/migrations/2020-01-11-012452_add_indexes/down.sql
rename to migrations/2020-01-11-012452_add_indexes/down.sql
diff --git a/server/migrations/2020-01-11-012452_add_indexes/up.sql b/migrations/2020-01-11-012452_add_indexes/up.sql
similarity index 100%
rename from server/migrations/2020-01-11-012452_add_indexes/up.sql
rename to migrations/2020-01-11-012452_add_indexes/up.sql
diff --git a/server/migrations/2020-01-13-025151_create_materialized_views/down.sql b/migrations/2020-01-13-025151_create_materialized_views/down.sql
similarity index 100%
rename from server/migrations/2020-01-13-025151_create_materialized_views/down.sql
rename to migrations/2020-01-13-025151_create_materialized_views/down.sql
diff --git a/server/migrations/2020-01-13-025151_create_materialized_views/up.sql b/migrations/2020-01-13-025151_create_materialized_views/up.sql
similarity index 100%
rename from server/migrations/2020-01-13-025151_create_materialized_views/up.sql
rename to migrations/2020-01-13-025151_create_materialized_views/up.sql
diff --git a/server/migrations/2020-01-21-001001_create_private_message/down.sql b/migrations/2020-01-21-001001_create_private_message/down.sql
similarity index 100%
rename from server/migrations/2020-01-21-001001_create_private_message/down.sql
rename to migrations/2020-01-21-001001_create_private_message/down.sql
diff --git a/server/migrations/2020-01-21-001001_create_private_message/up.sql b/migrations/2020-01-21-001001_create_private_message/up.sql
similarity index 100%
rename from server/migrations/2020-01-21-001001_create_private_message/up.sql
rename to migrations/2020-01-21-001001_create_private_message/up.sql
diff --git a/server/migrations/2020-01-29-011901_create_reply_materialized_view/down.sql b/migrations/2020-01-29-011901_create_reply_materialized_view/down.sql
similarity index 100%
rename from server/migrations/2020-01-29-011901_create_reply_materialized_view/down.sql
rename to migrations/2020-01-29-011901_create_reply_materialized_view/down.sql
diff --git a/server/migrations/2020-01-29-011901_create_reply_materialized_view/up.sql b/migrations/2020-01-29-011901_create_reply_materialized_view/up.sql
similarity index 100%
rename from server/migrations/2020-01-29-011901_create_reply_materialized_view/up.sql
rename to migrations/2020-01-29-011901_create_reply_materialized_view/up.sql
diff --git a/server/migrations/2020-01-29-030825_create_user_mention_materialized_view/down.sql b/migrations/2020-01-29-030825_create_user_mention_materialized_view/down.sql
similarity index 100%
rename from server/migrations/2020-01-29-030825_create_user_mention_materialized_view/down.sql
rename to migrations/2020-01-29-030825_create_user_mention_materialized_view/down.sql
diff --git a/server/migrations/2020-01-29-030825_create_user_mention_materialized_view/up.sql b/migrations/2020-01-29-030825_create_user_mention_materialized_view/up.sql
similarity index 100%
rename from server/migrations/2020-01-29-030825_create_user_mention_materialized_view/up.sql
rename to migrations/2020-01-29-030825_create_user_mention_materialized_view/up.sql
diff --git a/server/migrations/2020-02-02-004806_add_case_insensitive_usernames/down.sql b/migrations/2020-02-02-004806_add_case_insensitive_usernames/down.sql
similarity index 100%
rename from server/migrations/2020-02-02-004806_add_case_insensitive_usernames/down.sql
rename to migrations/2020-02-02-004806_add_case_insensitive_usernames/down.sql
diff --git a/server/migrations/2020-02-02-004806_add_case_insensitive_usernames/up.sql b/migrations/2020-02-02-004806_add_case_insensitive_usernames/up.sql
similarity index 100%
rename from server/migrations/2020-02-02-004806_add_case_insensitive_usernames/up.sql
rename to migrations/2020-02-02-004806_add_case_insensitive_usernames/up.sql
diff --git a/server/migrations/2020-02-06-165953_change_post_title_length/down.sql b/migrations/2020-02-06-165953_change_post_title_length/down.sql
similarity index 100%
rename from server/migrations/2020-02-06-165953_change_post_title_length/down.sql
rename to migrations/2020-02-06-165953_change_post_title_length/down.sql
diff --git a/server/migrations/2020-02-06-165953_change_post_title_length/up.sql b/migrations/2020-02-06-165953_change_post_title_length/up.sql
similarity index 100%
rename from server/migrations/2020-02-06-165953_change_post_title_length/up.sql
rename to migrations/2020-02-06-165953_change_post_title_length/up.sql
diff --git a/server/migrations/2020-02-07-210055_add_comment_subscribed/down.sql b/migrations/2020-02-07-210055_add_comment_subscribed/down.sql
similarity index 100%
rename from server/migrations/2020-02-07-210055_add_comment_subscribed/down.sql
rename to migrations/2020-02-07-210055_add_comment_subscribed/down.sql
diff --git a/server/migrations/2020-02-07-210055_add_comment_subscribed/up.sql b/migrations/2020-02-07-210055_add_comment_subscribed/up.sql
similarity index 100%
rename from server/migrations/2020-02-07-210055_add_comment_subscribed/up.sql
rename to migrations/2020-02-07-210055_add_comment_subscribed/up.sql
diff --git a/server/migrations/2020-02-08-145624_add_post_newest_activity_time/down.sql b/migrations/2020-02-08-145624_add_post_newest_activity_time/down.sql
similarity index 100%
rename from server/migrations/2020-02-08-145624_add_post_newest_activity_time/down.sql
rename to migrations/2020-02-08-145624_add_post_newest_activity_time/down.sql
diff --git a/server/migrations/2020-02-08-145624_add_post_newest_activity_time/up.sql b/migrations/2020-02-08-145624_add_post_newest_activity_time/up.sql
similarity index 100%
rename from server/migrations/2020-02-08-145624_add_post_newest_activity_time/up.sql
rename to migrations/2020-02-08-145624_add_post_newest_activity_time/up.sql
diff --git a/server/migrations/2020-03-06-202329_add_post_iframely_data/down.sql b/migrations/2020-03-06-202329_add_post_iframely_data/down.sql
similarity index 100%
rename from server/migrations/2020-03-06-202329_add_post_iframely_data/down.sql
rename to migrations/2020-03-06-202329_add_post_iframely_data/down.sql
diff --git a/server/migrations/2020-03-06-202329_add_post_iframely_data/up.sql b/migrations/2020-03-06-202329_add_post_iframely_data/up.sql
similarity index 100%
rename from server/migrations/2020-03-06-202329_add_post_iframely_data/up.sql
rename to migrations/2020-03-06-202329_add_post_iframely_data/up.sql
diff --git a/server/migrations/2020-03-26-192410_add_activitypub_tables/down.sql b/migrations/2020-03-26-192410_add_activitypub_tables/down.sql
similarity index 100%
rename from server/migrations/2020-03-26-192410_add_activitypub_tables/down.sql
rename to migrations/2020-03-26-192410_add_activitypub_tables/down.sql
diff --git a/server/migrations/2020-03-26-192410_add_activitypub_tables/up.sql b/migrations/2020-03-26-192410_add_activitypub_tables/up.sql
similarity index 100%
rename from server/migrations/2020-03-26-192410_add_activitypub_tables/up.sql
rename to migrations/2020-03-26-192410_add_activitypub_tables/up.sql
diff --git a/server/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/down.sql b/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/down.sql
similarity index 100%
rename from server/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/down.sql
rename to migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/down.sql
diff --git a/server/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/up.sql b/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/up.sql
similarity index 100%
rename from server/migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/up.sql
rename to migrations/2020-04-03-194936_add_activitypub_for_posts_and_comments/up.sql
diff --git a/server/migrations/2020-04-07-135912_add_user_community_apub_constraints/down.sql b/migrations/2020-04-07-135912_add_user_community_apub_constraints/down.sql
similarity index 100%
rename from server/migrations/2020-04-07-135912_add_user_community_apub_constraints/down.sql
rename to migrations/2020-04-07-135912_add_user_community_apub_constraints/down.sql
diff --git a/server/migrations/2020-04-07-135912_add_user_community_apub_constraints/up.sql b/migrations/2020-04-07-135912_add_user_community_apub_constraints/up.sql
similarity index 100%
rename from server/migrations/2020-04-07-135912_add_user_community_apub_constraints/up.sql
rename to migrations/2020-04-07-135912_add_user_community_apub_constraints/up.sql
diff --git a/server/migrations/2020-04-14-163701_update_views_for_activitypub/down.sql b/migrations/2020-04-14-163701_update_views_for_activitypub/down.sql
similarity index 100%
rename from server/migrations/2020-04-14-163701_update_views_for_activitypub/down.sql
rename to migrations/2020-04-14-163701_update_views_for_activitypub/down.sql
diff --git a/server/migrations/2020-04-14-163701_update_views_for_activitypub/up.sql b/migrations/2020-04-14-163701_update_views_for_activitypub/up.sql
similarity index 100%
rename from server/migrations/2020-04-14-163701_update_views_for_activitypub/up.sql
rename to migrations/2020-04-14-163701_update_views_for_activitypub/up.sql
diff --git a/server/migrations/2020-04-21-123957_remove_unique_user_constraints/down.sql b/migrations/2020-04-21-123957_remove_unique_user_constraints/down.sql
similarity index 100%
rename from server/migrations/2020-04-21-123957_remove_unique_user_constraints/down.sql
rename to migrations/2020-04-21-123957_remove_unique_user_constraints/down.sql
diff --git a/server/migrations/2020-04-21-123957_remove_unique_user_constraints/up.sql b/migrations/2020-04-21-123957_remove_unique_user_constraints/up.sql
similarity index 100%
rename from server/migrations/2020-04-21-123957_remove_unique_user_constraints/up.sql
rename to migrations/2020-04-21-123957_remove_unique_user_constraints/up.sql
diff --git a/server/migrations/2020-05-05-210233_add_activitypub_for_private_messages/down.sql b/migrations/2020-05-05-210233_add_activitypub_for_private_messages/down.sql
similarity index 100%
rename from server/migrations/2020-05-05-210233_add_activitypub_for_private_messages/down.sql
rename to migrations/2020-05-05-210233_add_activitypub_for_private_messages/down.sql
diff --git a/server/migrations/2020-05-05-210233_add_activitypub_for_private_messages/up.sql b/migrations/2020-05-05-210233_add_activitypub_for_private_messages/up.sql
similarity index 100%
rename from server/migrations/2020-05-05-210233_add_activitypub_for_private_messages/up.sql
rename to migrations/2020-05-05-210233_add_activitypub_for_private_messages/up.sql
diff --git a/server/migrations/2020-06-30-135809_remove_mat_views/down.sql b/migrations/2020-06-30-135809_remove_mat_views/down.sql
similarity index 100%
rename from server/migrations/2020-06-30-135809_remove_mat_views/down.sql
rename to migrations/2020-06-30-135809_remove_mat_views/down.sql
diff --git a/server/migrations/2020-06-30-135809_remove_mat_views/up.sql b/migrations/2020-06-30-135809_remove_mat_views/up.sql
similarity index 100%
rename from server/migrations/2020-06-30-135809_remove_mat_views/up.sql
rename to migrations/2020-06-30-135809_remove_mat_views/up.sql
diff --git a/server/migrations/2020-07-08-202609_add_creator_published/down.sql b/migrations/2020-07-08-202609_add_creator_published/down.sql
similarity index 100%
rename from server/migrations/2020-07-08-202609_add_creator_published/down.sql
rename to migrations/2020-07-08-202609_add_creator_published/down.sql
diff --git a/server/migrations/2020-07-08-202609_add_creator_published/up.sql b/migrations/2020-07-08-202609_add_creator_published/up.sql
similarity index 100%
rename from server/migrations/2020-07-08-202609_add_creator_published/up.sql
rename to migrations/2020-07-08-202609_add_creator_published/up.sql
diff --git a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql b/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
similarity index 100%
rename from server/migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
rename to migrations/2020-07-12-100442_add_post_title_to_comments_view/down.sql
diff --git a/server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql b/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
similarity index 100%
rename from server/migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
rename to migrations/2020-07-12-100442_add_post_title_to_comments_view/up.sql
diff --git a/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/down.sql b/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/down.sql
similarity index 100%
rename from server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/down.sql
rename to migrations/2020-07-18-234519_add_unique_community_user_actor_ids/down.sql
diff --git a/server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql b/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
similarity index 100%
rename from server/migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
rename to migrations/2020-07-18-234519_add_unique_community_user_actor_ids/up.sql
diff --git a/server/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/down.sql b/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/down.sql
similarity index 100%
rename from server/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/down.sql
rename to migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/down.sql
diff --git a/server/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/up.sql b/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/up.sql
similarity index 100%
rename from server/migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/up.sql
rename to migrations/2020-08-03-000110_add_preferred_usernames_banners_and_icons/up.sql
diff --git a/server/migrations/2020-08-06-205355_update_community_post_count/down.sql b/migrations/2020-08-06-205355_update_community_post_count/down.sql
similarity index 100%
rename from server/migrations/2020-08-06-205355_update_community_post_count/down.sql
rename to migrations/2020-08-06-205355_update_community_post_count/down.sql
diff --git a/server/migrations/2020-08-06-205355_update_community_post_count/up.sql b/migrations/2020-08-06-205355_update_community_post_count/up.sql
similarity index 100%
rename from server/migrations/2020-08-06-205355_update_community_post_count/up.sql
rename to migrations/2020-08-06-205355_update_community_post_count/up.sql
diff --git a/server/migrations/2020-08-25-132005_add_unique_ap_ids/down.sql b/migrations/2020-08-25-132005_add_unique_ap_ids/down.sql
similarity index 100%
rename from server/migrations/2020-08-25-132005_add_unique_ap_ids/down.sql
rename to migrations/2020-08-25-132005_add_unique_ap_ids/down.sql
diff --git a/server/migrations/2020-08-25-132005_add_unique_ap_ids/up.sql b/migrations/2020-08-25-132005_add_unique_ap_ids/up.sql
similarity index 100%
rename from server/migrations/2020-08-25-132005_add_unique_ap_ids/up.sql
rename to migrations/2020-08-25-132005_add_unique_ap_ids/up.sql
diff --git a/server/migrations_testing/2020-01-13-025151_create_materialized_views/down.sql b/migrations_testing/2020-01-13-025151_create_materialized_views/down.sql
similarity index 100%
rename from server/migrations_testing/2020-01-13-025151_create_materialized_views/down.sql
rename to migrations_testing/2020-01-13-025151_create_materialized_views/down.sql
diff --git a/server/migrations_testing/2020-01-13-025151_create_materialized_views/up.sql b/migrations_testing/2020-01-13-025151_create_materialized_views/up.sql
similarity index 100%
rename from server/migrations_testing/2020-01-13-025151_create_materialized_views/up.sql
rename to migrations_testing/2020-01-13-025151_create_materialized_views/up.sql
diff --git a/query_testing/after.out b/query_testing/after.out
new file mode 100644
index 000000000..2dbc5d1ed
--- /dev/null
+++ b/query_testing/after.out
@@ -0,0 +1,13 @@
+comment_fast_view.json:    "Execution Time": 400.841
+comment_view.json:    "Execution Time": 2312.899
+community_fast_view.json:    "Execution Time": 0.272
+community_view.json:    "Execution Time": 36.572
+post_fast_view.json:    "Execution Time": 128.839
+post_view.json:    "Execution Time": 970.671
+private_message_view.json:    "Execution Time": 1.426
+reply_fast_view.json:    "Execution Time": 426.179
+site_view.json:    "Execution Time": 2.453
+user_fast.json:    "Execution Time": 0.400
+user_mention_fast_view.json:    "Execution Time": 0.179
+user_mention_view.json:    "Execution Time": 95.815
+user_view.json:    "Execution Time": 44.692
diff --git a/server/query_testing/apache_bench_report.sh b/query_testing/apache_bench_report.sh
similarity index 100%
rename from server/query_testing/apache_bench_report.sh
rename to query_testing/apache_bench_report.sh
diff --git a/server/query_testing/api_benchmark.sh b/query_testing/api_benchmark.sh
similarity index 100%
rename from server/query_testing/api_benchmark.sh
rename to query_testing/api_benchmark.sh
diff --git a/query_testing/before.out b/query_testing/before.out
new file mode 100644
index 000000000..579dd1275
--- /dev/null
+++ b/query_testing/before.out
@@ -0,0 +1,13 @@
+comment_fast_view.json:    "Execution Time": 3.501
+comment_view.json:    "Execution Time": 2312.899
+community_fast_view.json:    "Execution Time": 0.372
+community_view.json:    "Execution Time": 36.572
+post_fast_view.json:    "Execution Time": 78.920
+post_view.json:    "Execution Time": 970.671
+private_message_view.json:    "Execution Time": 1.426
+reply_fast_view.json:    "Execution Time": 32.875
+site_view.json:    "Execution Time": 2.593
+user_fast.json:    "Execution Time": 0.155
+user_mention_fast_view.json:    "Execution Time": 0.171
+user_mention_view.json:    "Execution Time": 1468.291
+user_view.json:    "Execution Time": 44.692
diff --git a/server/query_testing/generate_explain_reports.sh b/query_testing/generate_explain_reports.sh
similarity index 100%
rename from server/query_testing/generate_explain_reports.sh
rename to query_testing/generate_explain_reports.sh
diff --git a/server/.gitignore b/server/.gitignore
deleted file mode 100644
index 00e9d4525..000000000
--- a/server/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/target
-.env
-.idea
-env_setup.sh
-query_testing/*.json
-query_testing/*.json.old
diff --git a/server/src/api/claims.rs b/src/api/claims.rs
similarity index 100%
rename from server/src/api/claims.rs
rename to src/api/claims.rs
diff --git a/server/src/api/comment.rs b/src/api/comment.rs
similarity index 100%
rename from server/src/api/comment.rs
rename to src/api/comment.rs
diff --git a/server/src/api/community.rs b/src/api/community.rs
similarity index 100%
rename from server/src/api/community.rs
rename to src/api/community.rs
diff --git a/server/src/api/mod.rs b/src/api/mod.rs
similarity index 100%
rename from server/src/api/mod.rs
rename to src/api/mod.rs
diff --git a/server/src/api/post.rs b/src/api/post.rs
similarity index 100%
rename from server/src/api/post.rs
rename to src/api/post.rs
diff --git a/server/src/api/site.rs b/src/api/site.rs
similarity index 100%
rename from server/src/api/site.rs
rename to src/api/site.rs
diff --git a/server/src/api/user.rs b/src/api/user.rs
similarity index 100%
rename from server/src/api/user.rs
rename to src/api/user.rs
diff --git a/server/src/apub/activities.rs b/src/apub/activities.rs
similarity index 100%
rename from server/src/apub/activities.rs
rename to src/apub/activities.rs
diff --git a/server/src/apub/activity_queue.rs b/src/apub/activity_queue.rs
similarity index 100%
rename from server/src/apub/activity_queue.rs
rename to src/apub/activity_queue.rs
diff --git a/server/src/apub/comment.rs b/src/apub/comment.rs
similarity index 100%
rename from server/src/apub/comment.rs
rename to src/apub/comment.rs
diff --git a/server/src/apub/community.rs b/src/apub/community.rs
similarity index 100%
rename from server/src/apub/community.rs
rename to src/apub/community.rs
diff --git a/server/src/apub/extensions/group_extensions.rs b/src/apub/extensions/group_extensions.rs
similarity index 100%
rename from server/src/apub/extensions/group_extensions.rs
rename to src/apub/extensions/group_extensions.rs
diff --git a/server/src/apub/extensions/mod.rs b/src/apub/extensions/mod.rs
similarity index 100%
rename from server/src/apub/extensions/mod.rs
rename to src/apub/extensions/mod.rs
diff --git a/server/src/apub/extensions/page_extension.rs b/src/apub/extensions/page_extension.rs
similarity index 100%
rename from server/src/apub/extensions/page_extension.rs
rename to src/apub/extensions/page_extension.rs
diff --git a/server/src/apub/extensions/signatures.rs b/src/apub/extensions/signatures.rs
similarity index 100%
rename from server/src/apub/extensions/signatures.rs
rename to src/apub/extensions/signatures.rs
diff --git a/server/src/apub/fetcher.rs b/src/apub/fetcher.rs
similarity index 100%
rename from server/src/apub/fetcher.rs
rename to src/apub/fetcher.rs
diff --git a/server/src/apub/inbox/activities/announce.rs b/src/apub/inbox/activities/announce.rs
similarity index 100%
rename from server/src/apub/inbox/activities/announce.rs
rename to src/apub/inbox/activities/announce.rs
diff --git a/server/src/apub/inbox/activities/create.rs b/src/apub/inbox/activities/create.rs
similarity index 100%
rename from server/src/apub/inbox/activities/create.rs
rename to src/apub/inbox/activities/create.rs
diff --git a/server/src/apub/inbox/activities/delete.rs b/src/apub/inbox/activities/delete.rs
similarity index 100%
rename from server/src/apub/inbox/activities/delete.rs
rename to src/apub/inbox/activities/delete.rs
diff --git a/server/src/apub/inbox/activities/dislike.rs b/src/apub/inbox/activities/dislike.rs
similarity index 100%
rename from server/src/apub/inbox/activities/dislike.rs
rename to src/apub/inbox/activities/dislike.rs
diff --git a/server/src/apub/inbox/activities/like.rs b/src/apub/inbox/activities/like.rs
similarity index 100%
rename from server/src/apub/inbox/activities/like.rs
rename to src/apub/inbox/activities/like.rs
diff --git a/server/src/apub/inbox/activities/mod.rs b/src/apub/inbox/activities/mod.rs
similarity index 100%
rename from server/src/apub/inbox/activities/mod.rs
rename to src/apub/inbox/activities/mod.rs
diff --git a/server/src/apub/inbox/activities/remove.rs b/src/apub/inbox/activities/remove.rs
similarity index 100%
rename from server/src/apub/inbox/activities/remove.rs
rename to src/apub/inbox/activities/remove.rs
diff --git a/server/src/apub/inbox/activities/undo.rs b/src/apub/inbox/activities/undo.rs
similarity index 100%
rename from server/src/apub/inbox/activities/undo.rs
rename to src/apub/inbox/activities/undo.rs
diff --git a/server/src/apub/inbox/activities/update.rs b/src/apub/inbox/activities/update.rs
similarity index 100%
rename from server/src/apub/inbox/activities/update.rs
rename to src/apub/inbox/activities/update.rs
diff --git a/server/src/apub/inbox/community_inbox.rs b/src/apub/inbox/community_inbox.rs
similarity index 100%
rename from server/src/apub/inbox/community_inbox.rs
rename to src/apub/inbox/community_inbox.rs
diff --git a/server/src/apub/inbox/mod.rs b/src/apub/inbox/mod.rs
similarity index 100%
rename from server/src/apub/inbox/mod.rs
rename to src/apub/inbox/mod.rs
diff --git a/server/src/apub/inbox/shared_inbox.rs b/src/apub/inbox/shared_inbox.rs
similarity index 100%
rename from server/src/apub/inbox/shared_inbox.rs
rename to src/apub/inbox/shared_inbox.rs
diff --git a/server/src/apub/inbox/user_inbox.rs b/src/apub/inbox/user_inbox.rs
similarity index 100%
rename from server/src/apub/inbox/user_inbox.rs
rename to src/apub/inbox/user_inbox.rs
diff --git a/server/src/apub/mod.rs b/src/apub/mod.rs
similarity index 100%
rename from server/src/apub/mod.rs
rename to src/apub/mod.rs
diff --git a/server/src/apub/post.rs b/src/apub/post.rs
similarity index 100%
rename from server/src/apub/post.rs
rename to src/apub/post.rs
diff --git a/server/src/apub/private_message.rs b/src/apub/private_message.rs
similarity index 100%
rename from server/src/apub/private_message.rs
rename to src/apub/private_message.rs
diff --git a/server/src/apub/user.rs b/src/apub/user.rs
similarity index 100%
rename from server/src/apub/user.rs
rename to src/apub/user.rs
diff --git a/server/src/code_migrations.rs b/src/code_migrations.rs
similarity index 100%
rename from server/src/code_migrations.rs
rename to src/code_migrations.rs
diff --git a/server/src/lib.rs b/src/lib.rs
similarity index 100%
rename from server/src/lib.rs
rename to src/lib.rs
diff --git a/server/src/main.rs b/src/main.rs
similarity index 100%
rename from server/src/main.rs
rename to src/main.rs
diff --git a/server/src/request.rs b/src/request.rs
similarity index 100%
rename from server/src/request.rs
rename to src/request.rs
diff --git a/server/src/routes/api.rs b/src/routes/api.rs
similarity index 100%
rename from server/src/routes/api.rs
rename to src/routes/api.rs
diff --git a/server/src/routes/federation.rs b/src/routes/federation.rs
similarity index 100%
rename from server/src/routes/federation.rs
rename to src/routes/federation.rs
diff --git a/server/src/routes/feeds.rs b/src/routes/feeds.rs
similarity index 100%
rename from server/src/routes/feeds.rs
rename to src/routes/feeds.rs
diff --git a/server/src/routes/images.rs b/src/routes/images.rs
similarity index 100%
rename from server/src/routes/images.rs
rename to src/routes/images.rs
diff --git a/server/src/routes/mod.rs b/src/routes/mod.rs
similarity index 100%
rename from server/src/routes/mod.rs
rename to src/routes/mod.rs
diff --git a/server/src/routes/nodeinfo.rs b/src/routes/nodeinfo.rs
similarity index 100%
rename from server/src/routes/nodeinfo.rs
rename to src/routes/nodeinfo.rs
diff --git a/server/src/routes/webfinger.rs b/src/routes/webfinger.rs
similarity index 100%
rename from server/src/routes/webfinger.rs
rename to src/routes/webfinger.rs
diff --git a/server/src/routes/websocket.rs b/src/routes/websocket.rs
similarity index 100%
rename from server/src/routes/websocket.rs
rename to src/routes/websocket.rs
diff --git a/server/src/version.rs b/src/version.rs
similarity index 100%
rename from server/src/version.rs
rename to src/version.rs
diff --git a/server/src/websocket/chat_server.rs b/src/websocket/chat_server.rs
similarity index 100%
rename from server/src/websocket/chat_server.rs
rename to src/websocket/chat_server.rs
diff --git a/server/src/websocket/handlers.rs b/src/websocket/handlers.rs
similarity index 100%
rename from server/src/websocket/handlers.rs
rename to src/websocket/handlers.rs
diff --git a/server/src/websocket/messages.rs b/src/websocket/messages.rs
similarity index 100%
rename from server/src/websocket/messages.rs
rename to src/websocket/messages.rs
diff --git a/server/src/websocket/mod.rs b/src/websocket/mod.rs
similarity index 100%
rename from server/src/websocket/mod.rs
rename to src/websocket/mod.rs
diff --git a/server/test.sh b/test.sh
similarity index 100%
rename from server/test.sh
rename to test.sh