diff --git a/Xdefaults b/bspwm/.Xdefaults
similarity index 100%
rename from Xdefaults
rename to bspwm/.Xdefaults
diff --git a/bspwm/autostart b/bspwm/.config/bspwm/autostart
similarity index 100%
rename from bspwm/autostart
rename to bspwm/.config/bspwm/autostart
diff --git a/bspwm/bspwmrc b/bspwm/.config/bspwm/bspwmrc
similarity index 100%
rename from bspwm/bspwmrc
rename to bspwm/.config/bspwm/bspwmrc
diff --git a/bspwm/sxhkdrc b/bspwm/.config/bspwm/sxhkdrc
similarity index 100%
rename from bspwm/sxhkdrc
rename to bspwm/.config/bspwm/sxhkdrc
diff --git a/compton.conf b/compton/.config/compton.conf
similarity index 100%
rename from compton.conf
rename to compton/.config/compton.conf
diff --git a/mpdconf b/mpd/.mpdconf
similarity index 100%
rename from mpdconf
rename to mpd/.mpdconf
diff --git a/ncmpcpp b/ncmpcpp/.ncmpcpp/config
similarity index 100%
rename from ncmpcpp
rename to ncmpcpp/.ncmpcpp/config
diff --git a/tmux.conf b/tmux/.tmux.conf
similarity index 100%
rename from tmux.conf
rename to tmux/.tmux.conf
diff --git a/vim/snippets/_.snippets b/vim/.vim/snippets/_.snippets
similarity index 100%
rename from vim/snippets/_.snippets
rename to vim/.vim/snippets/_.snippets
diff --git a/vim/snippets/c.snippets b/vim/.vim/snippets/c.snippets
similarity index 100%
rename from vim/snippets/c.snippets
rename to vim/.vim/snippets/c.snippets
diff --git a/vim/snippets/cpp.snippets b/vim/.vim/snippets/cpp.snippets
similarity index 100%
rename from vim/snippets/cpp.snippets
rename to vim/.vim/snippets/cpp.snippets
diff --git a/vim/snippets/css.snippets b/vim/.vim/snippets/css.snippets
similarity index 100%
rename from vim/snippets/css.snippets
rename to vim/.vim/snippets/css.snippets
diff --git a/vim/snippets/html.snippets b/vim/.vim/snippets/html.snippets
similarity index 100%
rename from vim/snippets/html.snippets
rename to vim/.vim/snippets/html.snippets
diff --git a/vim/snippets/java.snippets b/vim/.vim/snippets/java.snippets
similarity index 100%
rename from vim/snippets/java.snippets
rename to vim/.vim/snippets/java.snippets
diff --git a/vim/snippets/javascript.snippets b/vim/.vim/snippets/javascript.snippets
similarity index 100%
rename from vim/snippets/javascript.snippets
rename to vim/.vim/snippets/javascript.snippets
diff --git a/vim/snippets/perl.snippets b/vim/.vim/snippets/perl.snippets
similarity index 100%
rename from vim/snippets/perl.snippets
rename to vim/.vim/snippets/perl.snippets
diff --git a/vim/snippets/php.snippets b/vim/.vim/snippets/php.snippets
similarity index 100%
rename from vim/snippets/php.snippets
rename to vim/.vim/snippets/php.snippets
diff --git a/vim/snippets/python.snippets b/vim/.vim/snippets/python.snippets
similarity index 100%
rename from vim/snippets/python.snippets
rename to vim/.vim/snippets/python.snippets
diff --git a/vim/snippets/ruby.snippets b/vim/.vim/snippets/ruby.snippets
similarity index 100%
rename from vim/snippets/ruby.snippets
rename to vim/.vim/snippets/ruby.snippets
diff --git a/vim/snippets/sh.snippets b/vim/.vim/snippets/sh.snippets
similarity index 100%
rename from vim/snippets/sh.snippets
rename to vim/.vim/snippets/sh.snippets
diff --git a/vim/snippets/snippet.snippets b/vim/.vim/snippets/snippet.snippets
similarity index 100%
rename from vim/snippets/snippet.snippets
rename to vim/.vim/snippets/snippet.snippets
diff --git a/vim/snippets/tex.snippets b/vim/.vim/snippets/tex.snippets
similarity index 100%
rename from vim/snippets/tex.snippets
rename to vim/.vim/snippets/tex.snippets
diff --git a/vim/snippets/vim.snippets b/vim/.vim/snippets/vim.snippets
similarity index 100%
rename from vim/snippets/vim.snippets
rename to vim/.vim/snippets/vim.snippets
diff --git a/vim/snippets/zsh.snippets b/vim/.vim/snippets/zsh.snippets
similarity index 100%
rename from vim/snippets/zsh.snippets
rename to vim/.vim/snippets/zsh.snippets
diff --git a/vim/templates/c b/vim/.vim/templates/c
similarity index 100%
rename from vim/templates/c
rename to vim/.vim/templates/c
diff --git a/vim/templates/html b/vim/.vim/templates/html
similarity index 100%
rename from vim/templates/html
rename to vim/.vim/templates/html
diff --git a/vim/templates/perl b/vim/.vim/templates/perl
similarity index 100%
rename from vim/templates/perl
rename to vim/.vim/templates/perl
diff --git a/vim/templates/python b/vim/.vim/templates/python
similarity index 100%
rename from vim/templates/python
rename to vim/.vim/templates/python
diff --git a/vim/templates/sh b/vim/.vim/templates/sh
similarity index 100%
rename from vim/templates/sh
rename to vim/.vim/templates/sh
diff --git a/vim/templates/xhtml b/vim/.vim/templates/xhtml
similarity index 100%
rename from vim/templates/xhtml
rename to vim/.vim/templates/xhtml
diff --git a/vim/templates/xslt b/vim/.vim/templates/xslt
similarity index 100%
rename from vim/templates/xslt
rename to vim/.vim/templates/xslt
diff --git a/vimrc b/vim/.vimrc
similarity index 100%
rename from vimrc
rename to vim/.vimrc