diff --git a/server/default.nix b/hosts/server/default.nix
similarity index 100%
rename from server/default.nix
rename to hosts/server/default.nix
diff --git a/server/systemd.nix b/hosts/server/systemd.nix
similarity index 100%
rename from server/systemd.nix
rename to hosts/server/systemd.nix
diff --git a/server/tailscale.nix b/hosts/server/tailscale.nix
similarity index 100%
rename from server/tailscale.nix
rename to hosts/server/tailscale.nix
diff --git a/server/upgrade-diff.nix b/hosts/server/upgrade-diff.nix
similarity index 100%
rename from server/upgrade-diff.nix
rename to hosts/server/upgrade-diff.nix
diff --git a/wm/default.nix b/hosts/wm/default.nix
similarity index 100%
rename from wm/default.nix
rename to hosts/wm/default.nix
diff --git a/wm/kde/default.nix b/hosts/wm/kde/default.nix
similarity index 100%
rename from wm/kde/default.nix
rename to hosts/wm/kde/default.nix
diff --git a/wm/sway/default.nix b/hosts/wm/sway/default.nix
similarity index 100%
rename from wm/sway/default.nix
rename to hosts/wm/sway/default.nix
diff --git a/workstation/default.nix b/hosts/workstation/default.nix
similarity index 100%
rename from workstation/default.nix
rename to hosts/workstation/default.nix
diff --git a/workstation/detect-reboot-needed.nix b/hosts/workstation/detect-reboot-needed.nix
similarity index 100%
rename from workstation/detect-reboot-needed.nix
rename to hosts/workstation/detect-reboot-needed.nix
diff --git a/workstation/systemd.nix b/hosts/workstation/systemd.nix
similarity index 100%
rename from workstation/systemd.nix
rename to hosts/workstation/systemd.nix
diff --git a/workstation/tailscale.nix b/hosts/workstation/tailscale.nix
similarity index 100%
rename from workstation/tailscale.nix
rename to hosts/workstation/tailscale.nix
diff --git a/workstation/upgrade-diff.nix b/hosts/workstation/upgrade-diff.nix
similarity index 100%
rename from workstation/upgrade-diff.nix
rename to hosts/workstation/upgrade-diff.nix
diff --git a/mypackages/kanshi-fix/99-kanshi-fix.rules b/pkgs/mypackages/kanshi-fix/99-kanshi-fix.rules
similarity index 100%
rename from mypackages/kanshi-fix/99-kanshi-fix.rules
rename to pkgs/mypackages/kanshi-fix/99-kanshi-fix.rules
diff --git a/mypackages/kanshi-fix/default.nix b/pkgs/mypackages/kanshi-fix/default.nix
similarity index 100%
rename from mypackages/kanshi-fix/default.nix
rename to pkgs/mypackages/kanshi-fix/default.nix
diff --git a/mypackages/kanshi-fix/derivation.nix b/pkgs/mypackages/kanshi-fix/derivation.nix
similarity index 100%
rename from mypackages/kanshi-fix/derivation.nix
rename to pkgs/mypackages/kanshi-fix/derivation.nix
diff --git a/mypackages/kanshi-fix/kanshi-fix b/pkgs/mypackages/kanshi-fix/kanshi-fix
similarity index 100%
rename from mypackages/kanshi-fix/kanshi-fix
rename to pkgs/mypackages/kanshi-fix/kanshi-fix