diff --git a/derivations/dev/cross.nix b/environments/dev/cross.nix
similarity index 100%
rename from derivations/dev/cross.nix
rename to environments/dev/cross.nix
diff --git a/derivations/dev/go.nix b/environments/dev/go.nix
similarity index 100%
rename from derivations/dev/go.nix
rename to environments/dev/go.nix
diff --git a/derivations/dev/neovim-go.nix b/environments/dev/neovim-go.nix
similarity index 100%
rename from derivations/dev/neovim-go.nix
rename to environments/dev/neovim-go.nix
diff --git a/derivations/dev/pandoc.nix b/environments/dev/pandoc.nix
similarity index 100%
rename from derivations/dev/pandoc.nix
rename to environments/dev/pandoc.nix
diff --git a/derivations/dev/rkt.nix b/environments/dev/rkt.nix
similarity index 100%
rename from derivations/dev/rkt.nix
rename to environments/dev/rkt.nix
diff --git a/derivations/dev/rust.nix b/environments/dev/rust.nix
similarity index 100%
rename from derivations/dev/rust.nix
rename to environments/dev/rust.nix
diff --git a/derivations/dev/vim-go.nix b/environments/dev/vim-go.nix
similarity index 100%
rename from derivations/dev/vim-go.nix
rename to environments/dev/vim-go.nix
diff --git a/derivations/dev/vim-pandoc.nix b/environments/dev/vim-pandoc.nix
similarity index 100%
rename from derivations/dev/vim-pandoc.nix
rename to environments/dev/vim-pandoc.nix
diff --git a/derivations/dev/vim-rust.nix b/environments/dev/vim-rust.nix
similarity index 100%
rename from derivations/dev/vim-rust.nix
rename to environments/dev/vim-rust.nix
diff --git a/derivations/fhs/android.nix b/environments/fhs/android.nix
similarity index 100%
rename from derivations/fhs/android.nix
rename to environments/fhs/android.nix
diff --git a/derivations/fhs/vscode.nix b/environments/fhs/vscode.nix
similarity index 100%
rename from derivations/fhs/vscode.nix
rename to environments/fhs/vscode.nix
diff --git a/derivations/pkgs/browserpass/default.nix b/pkgs/browserpass/default.nix
similarity index 100%
rename from derivations/pkgs/browserpass/default.nix
rename to pkgs/browserpass/default.nix
diff --git a/derivations/pkgs/nomad/default.nix b/pkgs/nomad/default.nix
similarity index 100%
rename from derivations/pkgs/nomad/default.nix
rename to pkgs/nomad/default.nix
diff --git a/derivations/pkgs/nozbe/default.nix b/pkgs/nozbe/default.nix
similarity index 100%
rename from derivations/pkgs/nozbe/default.nix
rename to pkgs/nozbe/default.nix
diff --git a/derivations/pkgs/staruml.nix b/pkgs/staruml.nix
similarity index 100%
rename from derivations/pkgs/staruml.nix
rename to pkgs/staruml.nix