diff --git a/.forgejo/workflows/release-image.yml b/.forgejo/workflows/release-image.yml
index 2055d91a..6972c791 100644
--- a/.forgejo/workflows/release-image.yml
+++ b/.forgejo/workflows/release-image.yml
@@ -10,7 +10,7 @@ on:
       - ".gitlab-ci.yml"
       - ".gitignore"
       - "renovate.json"
-      - "dist/**"
+      - "pkg/**"
       - "docker/**"
       - "docs/**"
   # Allows you to run this workflow manually from the Actions tab
diff --git a/docs/configuration/examples.md b/docs/configuration/examples.md
index b30661b5..9613e252 100644
--- a/docs/configuration/examples.md
+++ b/docs/configuration/examples.md
@@ -15,5 +15,5 @@
 <summary>systemd unit file</summary>
 
 ```
-{{#include ../../dist/conduwuit.service}}
+{{#include ../../pkg/conduwuit.service}}
 ```
diff --git a/docs/deploying/debian.md b/docs/deploying/debian.md
index 527c1864..369638a4 100644
--- a/docs/deploying/debian.md
+++ b/docs/deploying/debian.md
@@ -1 +1 @@
-{{#include ../../dist/debian/README.md}}
+{{#include ../../pkg/debian/README.md}}
diff --git a/flake.nix b/flake.nix
index 4655fc01..e65fcbda 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,7 @@
           pkgs.lib.makeScope pkgs.newScope (self: {
             inherit pkgs inputs;
             craneLib = (inputs.crane.mkLib pkgs).overrideToolchain (_: toolchain);
-            main = self.callPackage ./dist/nix/pkgs/main { };
+            main = self.callPackage ./pkg/nix/pkgs/main { };
             liburing = pkgs.liburing.overrideAttrs {
               # Tests weren't building
               outputs = [
diff --git a/dist/conduwuit.service b/pkg/conduwuit.service
similarity index 100%
rename from dist/conduwuit.service
rename to pkg/conduwuit.service
diff --git a/dist/debian/README.md b/pkg/debian/README.md
similarity index 100%
rename from dist/debian/README.md
rename to pkg/debian/README.md
diff --git a/dist/debian/config b/pkg/debian/config
similarity index 100%
rename from dist/debian/config
rename to pkg/debian/config
diff --git a/dist/debian/postinst b/pkg/debian/postinst
similarity index 100%
rename from dist/debian/postinst
rename to pkg/debian/postinst
diff --git a/dist/debian/postrm b/pkg/debian/postrm
similarity index 100%
rename from dist/debian/postrm
rename to pkg/debian/postrm
diff --git a/dist/fedora/continuwuity.spec.rpkg b/pkg/fedora/continuwuity.spec.rpkg
similarity index 97%
rename from dist/fedora/continuwuity.spec.rpkg
rename to pkg/fedora/continuwuity.spec.rpkg
index dec4fff2..a2b32e48 100644
--- a/dist/fedora/continuwuity.spec.rpkg
+++ b/pkg/fedora/continuwuity.spec.rpkg
@@ -51,7 +51,7 @@ find .cargo/registry/ -executable -name "*.rs" -exec chmod -x {} +
 
 %install
 install -Dpm0755 target/rpm/conduwuit -t %{buildroot}%{_bindir}
-install -Dpm0644 dist/conduwuit.service -t %{buildroot}%{_unitdir}
+install -Dpm0644 pkg/conduwuit.service -t %{buildroot}%{_unitdir}
 install -Dpm0644 conduwuit-example.toml %{buildroot}%{_sysconfdir}/conduwuit/conduwuit.toml
 
 %files
diff --git a/dist/nix/pkgs/main/cross-compilation-env.nix b/pkg/nix/pkgs/main/cross-compilation-env.nix
similarity index 100%
rename from dist/nix/pkgs/main/cross-compilation-env.nix
rename to pkg/nix/pkgs/main/cross-compilation-env.nix
diff --git a/dist/nix/pkgs/main/default.nix b/pkg/nix/pkgs/main/default.nix
similarity index 100%
rename from dist/nix/pkgs/main/default.nix
rename to pkg/nix/pkgs/main/default.nix
diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml
index bbb3bec4..8f6f4341 100644
--- a/src/main/Cargo.toml
+++ b/src/main/Cargo.toml
@@ -32,10 +32,10 @@ a cool hard fork of Conduit, a Matrix homeserver written in Rust"""
 section = "net"
 priority = "optional"
 conf-files = ["/etc/conduwuit/conduwuit.toml"]
-maintainer-scripts = "../../dist/debian/"
-systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../dist/" }
+maintainer-scripts = "../../pkg/debian/"
+systemd-units = { unit-name = "conduwuit", start = false, unit-scripts = "../../pkg/" }
 assets = [
-	["../../dist/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"],
+	["../../pkg/debian/README.md", "usr/share/doc/conduwuit/README.Debian", "644"],
 	["../../README.md", "usr/share/doc/conduwuit/", "644"],
 	["../../target/release/conduwuit", "usr/bin/conduwuit", "755"],
 	["../../conduwuit-example.toml", "etc/conduwuit/conduwuit.toml", "640"],