diff --git a/dot_Xresources.tmpl b/dot_config/X11/Xresources.tmpl
similarity index 100%
rename from dot_Xresources.tmpl
rename to dot_config/X11/Xresources.tmpl
diff --git a/dot_xinitrc.tmpl b/dot_config/X11/xinitrc.tmpl
similarity index 100%
rename from dot_xinitrc.tmpl
rename to dot_config/X11/xinitrc.tmpl
diff --git a/dot_gitconfig.tmpl b/dot_config/git/config.tmpl
similarity index 100%
rename from dot_gitconfig.tmpl
rename to dot_config/git/config.tmpl
diff --git a/dot_gtkrc-2.0 b/dot_config/gtk-2.0/gtkrc
similarity index 100%
rename from dot_gtkrc-2.0
rename to dot_config/gtk-2.0/gtkrc
diff --git a/dot_config/npm/npmrc b/dot_config/npm/npmrc
new file mode 100644
index 0000000..7d339e5
--- /dev/null
+++ b/dot_config/npm/npmrc
@@ -0,0 +1,4 @@
+prefix=${XDG_DATA_HOME}/npm
+cache=${XDG_CACHE_HOME}/npm
+tmp=${XDG_RUNTIME_DIR}/npm
+init-module=${XDG_CONFIG_HOME}/npm/init/npm-init.js
diff --git a/dot_profile.tmpl b/dot_profile.tmpl
index 3efc784..5813dbb 100644
--- a/dot_profile.tmpl
+++ b/dot_profile.tmpl
@@ -10,10 +10,6 @@ export PATH="$HOME/.local/bin:$PATH"
 # make Java behave when not using a DE
 export _JAVA_AWT_WM_NONREPARENTING=1
 
-# move $GOPATH to .local
-export GOPATH="$HOME/.local/opt/go"
-export PATH="$HOME/.local/opt/go/bin:$PATH"
-
 # xsecurelock settings
 export XSECURELOCK_AUTH=auth_x11
 export XSECURELOCK_AUTHPROTO=authproto_pam
@@ -31,3 +27,26 @@ export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Gajim
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 Ristretto
 export GDK_SCALE=2 GDK_DPI_SCALE=0.50 ghex
 {{- end }}
+
+## No littering in $HOME!
+
+# bash
+export HISTFILE="${XDG_STATE_HOME}"/bash_history
+
+# cargo
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+
+# go
+export GOPATH="$XDG_DATA_HOME"/go
+export GOMODCACHE="$XDG_CACHE_HOME"/go/mod
+
+# GTK2
+export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
+
+# Node
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME"/npm/npmrc
+
+# Xorg
+export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc
+export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
+xrdb -load "$XDG_CONFIG_HOME/X11/Xresources"