diff --git a/.dotter/global.toml b/.dotter/global.toml
index 504b5b7..22633cd 100644
--- a/.dotter/global.toml
+++ b/.dotter/global.toml
@@ -4,7 +4,7 @@
 #       a development environment based on git and nvim.
 
 [base]
-depends = ["shell", "vcs", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
+depends = ["shell", "git", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
 
 [bootstrap.files]
 "bootstrap/dotlink.sh" = "~/.config/sh/alias.d/dotlink.sh"
@@ -13,13 +13,9 @@ depends = ["shell", "vcs", "nvim", "scripts", "ssh", "terminal", "bootstrap"]
 "sh/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
 sh = "~"
 
-[vcs.files]
-"vcs/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
-"vcs/git" = "~/.config"
-"vcs/jj" = "~/.config"
-"vcs/gitignore/config" = "~/.config"
-"vcs/gitignore/local" = "~/.local"
-vcs = "~"
+[git.files]
+"git/README.md" = { target = "~/NOWHERE", type = "symbolic", if = "false" }
+git = "~"
 
 [nvim.files]
 "nvim/.config/nvim/spell/de.utf-8.add.spl" = { target = "~/.config/nvim/spell/de.utf-8.add.spl", type = "symbolic" }
diff --git a/vcs/git/git/config b/git/.config/git/config
similarity index 100%
rename from vcs/git/git/config
rename to git/.config/git/config
diff --git a/vcs/git/git/ignore b/git/.config/git/ignore
similarity index 100%
rename from vcs/git/git/ignore
rename to git/.config/git/ignore
diff --git a/vcs/git/sh/alias.d/git.sh b/git/.config/sh/alias.d/git.sh
similarity index 100%
rename from vcs/git/sh/alias.d/git.sh
rename to git/.config/sh/alias.d/git.sh
diff --git a/vcs/gitignore/config/zsh/completions/_gitignore b/git/.config/zsh/completions/_gitignore
similarity index 100%
rename from vcs/gitignore/config/zsh/completions/_gitignore
rename to git/.config/zsh/completions/_gitignore
diff --git a/vcs/gitignore/local/bin/gitignore b/git/.local/bin/gitignore
similarity index 100%
rename from vcs/gitignore/local/bin/gitignore
rename to git/.local/bin/gitignore
diff --git a/vcs/README.md b/git/README.md
similarity index 86%
rename from vcs/README.md
rename to git/README.md
index 6315168..1c38319 100644
--- a/vcs/README.md
+++ b/git/README.md
@@ -1,17 +1,15 @@
-# Version control software module
+# Git module
 
 [git](https://git-scm.com/) - a distributed version control system
-[jujutsu](https://martinvonz.github.io/jj/latest/) - a change-based version control system
 
 ## What's in this module
 
 [[_TOC_]]
 
-## Global vcs settings
+## Global git settings
 
-This are probably the first things that need to be customized, since it points to a different identity for each git user.
+This is probably the first thing that needs to be customized, since it points to a different identity for each git user.
 I sign all my commits by default, so take out the corresponding lines if you don't, or exchange it with your gpg key.
-Similarly for jujutsu, change the identity and remove the lines concerning gpg signing if you don't use it.
 
 Git will rewrite any remotes using http(s) to use the ssh notation for pushes to github and gitlab so that, even if you set up the repository using an https url you can utilize your usual ssh key for pushing.
 
diff --git a/nvim/.config/nvim/lua/plugins/pickers.lua b/nvim/.config/nvim/lua/plugins/pickers.lua
index c8d1053..7637b6d 100644
--- a/nvim/.config/nvim/lua/plugins/pickers.lua
+++ b/nvim/.config/nvim/lua/plugins/pickers.lua
@@ -15,20 +15,13 @@ return {
 		event = { "BufEnter" },
 	}, -- integrate file manager
 	{
-		"nvim-neo-tree/neo-tree.nvim",
-		dependencies = {
-			"MunifTanjim/nui.nvim",
-			"nvim-lua/plenary.nvim",
-			{ "nvim-tree/nvim-web-devicons", optional = true },
-		},
-		cmd = "Neotree",
-		opts = {
-			source_selector = { winbar = true },
-		},
+		"nvim-tree/nvim-tree.lua", -- integrate file tree
+		config = true,
+		dependencies = { "nvim-tree/nvim-web-devicons", config = true },
+		cmd = "NvimTreeToggle",
 		keys = {
-			{ "<leader>se", "<cmd>Neotree toggle left<cr>", desc = "filetree", silent = true },
+			{ "<leader>se", "<cmd>NvimTreeToggle<cr>", desc = "filetree", silent = true },
 		},
-		lazy = false
 	},
 	{ "MagicDuck/grug-far.nvim", lazy = false, opts = {} },
 	-- fuzzy matching picker
diff --git a/vcs/jj/jj/config.toml b/vcs/jj/jj/config.toml
deleted file mode 100644
index 603c3b2..0000000
--- a/vcs/jj/jj/config.toml
+++ /dev/null
@@ -1,12 +0,0 @@
-[user]
-email = "marty.oehme@gmail.com"
-name = "Marty Oehme"
-
-[signing]
-sign-all = true
-backend = "gpg"
-key = "73BA40D5AFAF49C9"
-
-[ui]
-default-command = "log"
-diff-editor = ["nvim", "-c", "DiffEditor $left $right $output"]
diff --git a/vcs/jj/sh/alias.d/jj.sh b/vcs/jj/sh/alias.d/jj.sh
deleted file mode 100644
index ed69305..0000000
--- a/vcs/jj/sh/alias.d/jj.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env sh
-
-if ! exist jj; then
-    return 1
-fi
-
-alias j='jj' # necessary for a thing as easy to type?
-if exist lazyjj; then
-    alias lj="lazyjj"
-fi
-alias js="jj status"
-
-alias jd="jj describe"
-alias jn="jj new"
-alias jc="jj commit"
-
-alias jl='jj log'
-alias jlo='jj log --summary'
-alias jloo='jj log --patch'
-alias jo="jj op log"
-
-alias jss="jj squash"
-alias jsi="jj squash --interactive"
-
-alias je="jj edit"
-alias jee="jj next --edit"
-
-alias jun="jj undo"
-
-alias jp="jj git push"