-dir_minimal=~/config/dotfiles_minimal
-dir_user_minimal=~/config/dotfiles_user_minimal
-dir_user_thinkpad=~/config/dotfiles_user_thinkpad
-dir_user_server=~/config/dotfiles_user_server
-dir_root=~/config/dotfiles_root
+dir_minimal=~/config/dotfiles
+dir_user_minimal=~/config/dotfiles/user
+dir_user_thinkpad=~/config/dotfiles/user/thinkpad
+dir_user_server=~/config/dotfiles/user/server
+dir_root=~/config/dotfiles/root