diff --git a/.config/jrnl/jrnl.yaml b/.config/jrnl/jrnl.yaml
index 9d7c745..657a1de 100644
--- a/.config/jrnl/jrnl.yaml
+++ b/.config/jrnl/jrnl.yaml
@@ -10,10 +10,10 @@ encrypt: false
 highlight: true
 indent_character: '|'
 journals:
-  default: ~/data/2-standards/box/journal/jrnl.txt
-  intentions: ~/data/2-standards/box/journal/intentions.txt
-  intentions-nug: ~/data/2-standards/box/journal/intentions-nug.txt
-  nug: ~/data/2-standards/box/journal/nugnug.txt
+  default: ~/data/2-box/journal/jrnl.txt
+  intentions: ~/data/2-box/journal/intentions.txt
+  intentions-nug: ~/data/2-box/journal/intentions-nug.txt
+  nug: ~/data/2-box/journal/nugnug.txt
 linewrap: 99
 tagsymbols: '@'
 template: false
diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index f063799..d20ad83 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -189,7 +189,7 @@ map U unselect
 # Movement
 map gtr cd ~/.local/share/Trash/files
 
-map gd cd $DATA/4-incubator/downloads
+#map gd cd $DATA/4-incubator/downloads
 map gc cd ~/.config
 map gl cd ~/.local
 map gE cd /etc
diff --git a/.config/shell/git b/.config/shell/git
index 9453c4d..b1fbd1c 100644
--- a/.config/shell/git
+++ b/.config/shell/git
@@ -19,10 +19,10 @@ gcn() {
     if test $# -eq 0 || test -e "$1"
     then
       fulldir="$(realpath ${1:-$PWD})"
-      dir="${fulldir#$root/*/}"
+      dir="${fulldir#$root/?-}"
     else
       dir="box/$1"
-      fulldir="$root/2-standards/$dir"
+      fulldir="$root/2-$dir"
     fi
   else
       fulldir="$(realpath ${1:-$PWD})"
diff --git a/.config/user-dirs.dirs##user.janek b/.config/user-dirs.dirs##user.janek
index 6ff07ee..d7d6d11 100644
--- a/.config/user-dirs.dirs##user.janek
+++ b/.config/user-dirs.dirs##user.janek
@@ -7,9 +7,10 @@
 #
 XDG_DESKTOP_DIR="$HOME/.local/desktop"
 XDG_TEMPLATES_DIR="$HOME/.local/templates"
-XDG_DOWNLOAD_DIR="$HOME/data/4-incubator/downloads"
-XDG_MUSIC_DIR="$HOME/data/music"
-XDG_PICTURES_DIR="$HOME/data/images"
-XDG_VIDEOS_DIR="$HOME/data/3-resources/multimedia"
-XDG_DOCUMENTS_DIR="$HOME/data/3-resources/multimedia"
-XDG_PUBLICSHARE_DIR="$HOME/data/3-resources/multimedia"
+XDG_DOWNLOAD_DIR="$HOME/data/5-incubator/downloads"
+XDG_MUSIC_DIR="$HOME/data/4-media/music"
+XDG_PICTURES_DIR="$HOME/data/4-media/images"
+XDG_VIDEOS_DIR="$HOME/data/4-media/videos"
+XDG_DOCUMENTS_DIR="$HOME/data/3-dox"
+XDG_NOTES_DIR="$HOME/data/2-box"
+#XDG_PUBLICSHARE_DIR="$HOME/data/3-resources/multimedia"
diff --git a/.zshenv b/.zshenv
index 44884d3..5885c24 100644
--- a/.zshenv
+++ b/.zshenv
@@ -1,5 +1,5 @@
 export DATA="$(test -d $HOME/daten && echo $HOME/daten || echo $HOME/data)"
-export MUSIC="$DATA/music"
+export MUSIC="$DATA/4-media/music"
 
 export BORG_REPO="/mnt/backup/borg"
 export BORG_PASSCOMMAND='pass service/devices/borg/backup'
@@ -10,7 +10,7 @@ export XDG_STATE_HOME="$HOME/.local/state"
 export XDG_CACHE_HOME="$HOME/.local/cache"
 export XDG_CONFIG_HOME="$HOME/.config"
 export JOURNAL="$(eval "dirname $(grep -1 journals $XDG_CONFIG_HOME/jrnl/jrnl.yaml | tail -1 | cut -d':' -f2-)" ||
-	echo "$DATA/2-standards/box/journal")"
+	echo "$DATA/2-box/journal")"
 export PATH="$HOME/.local/bin/scripts:$HOME/.local/bin:$PATH:$XDG_CONFIG_HOME/emacs/bin:$GOPATH/bin:$XDG_DATA_HOME/gem/ruby/3.0.0/bin"
  # adjust programs to use xdg
 export MNT=/run/media/$USER