diff --git a/bspwm/.w3m/keymap b/bspwm/.w3m/keymap
deleted file mode 100644
index 0a9ffc78..00000000
--- a/bspwm/.w3m/keymap
+++ /dev/null
@@ -1,212 +0,0 @@
-# Vim keybindings for w3m
-# Heavily inspired by @sansna
-# https://github.com/sansna/keymap.w3m
-
-# Reset all the things
-keymap K NULL
-keymap J NULL
-keymap SPC NULL
-keymap - NULL
-keymap + NULL
-keymap C-v NULL
-keymap ESC-v NULL
-keymap C-f NULL
-keymap C-b NULL
-keymap C-n NULL
-keymap C-p NULL
-keymap < NULL
-keymap > NULL
-keymap . NULL
-keymap , NULL
-keymap ^ NULL
-keymap C-a NULL
-keymap W NULL
-keymap ^[[6~ NULL
-keymap ^[[5~ NULL
-keymap g NULL
-keymap ^[[1~ NULL
-keymap ^[[4~ NULL
-keymap ESC-< NULL
-keymap ESC-> NULL
-keymap [ NULL
-keymap ] NULL
-keymap ^[[Z NULL
-keymap ESC-m NULL
-keymap ( NULL
-keymap ) NULL
-keymap C-j NULL
-keymap C-m NULL
-keymap ESC-C-j NULL
-keymap ESC-C-m NULL
-keymap ESC-w NULL
-keymap ESC-W NULL
-keymap C-s NULL
-keymap = NULL
-keymap ESC-l NULL
-keymap U NULL
-keymap V NULL
-keymap v NULL
-keymap R NULL
-keymap ESC-s NULL
-keymap : NULL
-keymap C-q NULL
-keymap T NULL
-keymap } NULL
-keymap { NULL
-keymap ESC-a NULL
-keymap ESC-b NULL
-keymap c NULL
-keymap ESC-: NULL
-keymap C-h NULL
-keymap q NULL
-keymap Q NULL
-keymap C-w NULL
-keymap C-d NULL
-keymap C-u NULL
-keymap RIGHT NULL
-keymap l NULL
-keymap LEFT NULL
-keymap h NULL
-keymap j NULL
-keymap DOWN NULL
-keymap k NULL
-keymap UP NULL
-keymap C-e NULL
-keymap C-y NULL
-keymap 0 NULL
-keymap $ NULL
-keymap Z NULL
-keymap z NULL
-keymap ESC-g NULL
-keymap gg NULL
-keymap G NULL
-keymap w NULL
-keymap b NULL
-keymap C-n NULL
-keymap C-p NULL
-keymap ESC-TAB NULL
-keymap f NULL
-keymap C-o NULL
-keymap TAB NULL
-keymap C-j NULL
-keymap C-] NULL
-keymap I NULL
-keymap ESC-I NULL
-keymap ESC-C-j NULL
-keymap y NULL
-keymap u NULL
-keymap i NULL
-keymap gC-g NULL
-keymap C-g NULL
-keymap ";" NULL
-keymap M NULL
-keymap ESC-M NULL
-keymap F NULL
-keymap ESC-u NULL
-keymap t NULL
-keymap @ NULL
-keymap "#" NULL
-keymap | NULL
-keymap B NULL
-keymap L NULL
-keymap H NULL
-keymap s NULL
-keymap gf NULL
-keymap S NULL
-keymap E NULL
-keymap ESC-e NULL
-keymap C-r NULL
-keymap r NULL
-keymap C-l NULL
-keymap C-t NULL
-keymap d NULL
-keymap gt NULL
-keymap gT NULL
-keymap ESC-t NULL
-keymap C-wL NULL
-keymap C-wH NULL
-keymap a NULL
-keymap n NULL
-keymap N NULL
-keymap / NULL
-keymap ? NULL
-keymap C-@ NULL
-keymap ESC-n NULL
-keymap ESC-p NULL
-keymap \" NULL
-keymap ^[[2~ NULL
-keymap ^[[28~ NULL
-keymap ^[[E NULL
-keymap ^[[L NULL
-keymap o NULL
-keymap C-k NULL
-keymap D NULL
-keymap m NULL
-keymap ESC-c NULL
-keymap ESC-o NULL
-keymap ESC-k NULL
-keymap \\ NULL
-keymap ! NULL
-keymap C-z NULL
-keymap ZZ NULL
-keymap ZQ NULL
-
-# Movement Keys
-keymap h MOVE_LEFT
-keymap j MOVE_DOWN1
-keymap k MOVE_UP1
-keymap l MOVE_RIGHT
-
-# Commands
-keymap : COMMAND
-keymap q QUIT
-keymap Q EXIT
-keymap r RELOAD
-keymap ? HELP
-
-# Scrolling
-keymap d NEXT_PAGE
-keymap u PREV_PAGE
-keymap gg BEGIN
-keymap G END
-
-# Cursor
-keymap 0 LINE_BEGIN
-keymap $ LINE_END
-keymap w NEXT_WORD
-keymap b PREV_WORD
-
-# Tabs
-keymap x CLOSE_TAB
-keymap J PREV_TAB
-keymap K NEXT_TAB
-keymap t TAB_GOTO https://duckduckgo.com/lite
-keymap T NEW_TAB
-keymap o TAB_MENU
-
-# History Navigation
-keymap H PREV
-keymap L NEXT
-
-# Search and moving between links
-keymap / ISEARCH
-keymap n SEARCH_NEXT
-keymap N SEARCH_PREV
-keymap b NEXT_LINK
-keymap B PREV_LINK
-
-# Show the current url and where highlighted urls go to
-keymap p PEEK
-keymap P PEEK_LINK
-
-# Open links in a new buffer or new tab respectfully
-keymap F MOVE_LIST_MENU
-keymap f LIST_MENU
-keymap v GOTO_LINK
-keymap V TAB_LINK
-
-# Show history for the current buffer or the entire browsing session
-keymap i SELECT_MENU
-keymap I HISTORY
-
-# vim:ft=dosini
diff --git a/bspwm/.Xresources b/dots/bspwm/.Xresources
similarity index 100%
rename from bspwm/.Xresources
rename to dots/bspwm/.Xresources
diff --git a/bspwm/.config/bspwm/bspwmrc b/dots/bspwm/.config/bspwm/bspwmrc
similarity index 100%
rename from bspwm/.config/bspwm/bspwmrc
rename to dots/bspwm/.config/bspwm/bspwmrc
diff --git a/bspwm/.config/compton.conf b/dots/bspwm/.config/compton.conf
similarity index 100%
rename from bspwm/.config/compton.conf
rename to dots/bspwm/.config/compton.conf
diff --git a/bspwm/.config/feh/keys b/dots/bspwm/.config/feh/keys
similarity index 100%
rename from bspwm/.config/feh/keys
rename to dots/bspwm/.config/feh/keys
diff --git a/fontconfig/.config/fontconfig/fonts.conf b/dots/bspwm/.config/fontconfig/fonts.conf
similarity index 100%
rename from fontconfig/.config/fontconfig/fonts.conf
rename to dots/bspwm/.config/fontconfig/fonts.conf
diff --git a/bspwm/.config/mpd/mpd.conf b/dots/bspwm/.config/mpd/mpd.conf
similarity index 100%
rename from bspwm/.config/mpd/mpd.conf
rename to dots/bspwm/.config/mpd/mpd.conf
diff --git a/bspwm/.config/mpv/input.conf b/dots/bspwm/.config/mpv/input.conf
similarity index 100%
rename from bspwm/.config/mpv/input.conf
rename to dots/bspwm/.config/mpv/input.conf
diff --git a/bspwm/.config/mpv/mpv.conf b/dots/bspwm/.config/mpv/mpv.conf
similarity index 100%
rename from bspwm/.config/mpv/mpv.conf
rename to dots/bspwm/.config/mpv/mpv.conf
diff --git a/bspwm/.config/ncmpcpp/bindings b/dots/bspwm/.config/ncmpcpp/bindings
similarity index 100%
rename from bspwm/.config/ncmpcpp/bindings
rename to dots/bspwm/.config/ncmpcpp/bindings
diff --git a/bspwm/.config/ncmpcpp/config b/dots/bspwm/.config/ncmpcpp/config
similarity index 100%
rename from bspwm/.config/ncmpcpp/config
rename to dots/bspwm/.config/ncmpcpp/config
diff --git a/bspwm/.config/polybar/config b/dots/bspwm/.config/polybar/config
similarity index 100%
rename from bspwm/.config/polybar/config
rename to dots/bspwm/.config/polybar/config
diff --git a/bspwm/.config/polybar/launch.sh b/dots/bspwm/.config/polybar/launch.sh
similarity index 100%
rename from bspwm/.config/polybar/launch.sh
rename to dots/bspwm/.config/polybar/launch.sh
diff --git a/bspwm/.config/sxhkd/screenshot.sh b/dots/bspwm/.config/sxhkd/screenshot.sh
similarity index 100%
rename from bspwm/.config/sxhkd/screenshot.sh
rename to dots/bspwm/.config/sxhkd/screenshot.sh
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/dots/bspwm/.config/sxhkd/sxhkdrc
similarity index 100%
rename from bspwm/.config/sxhkd/sxhkdrc
rename to dots/bspwm/.config/sxhkd/sxhkdrc
diff --git a/bspwm/.config/zathura/zathurarc b/dots/bspwm/.config/zathura/zathurarc
similarity index 100%
rename from bspwm/.config/zathura/zathurarc
rename to dots/bspwm/.config/zathura/zathurarc
diff --git a/bspwm/.mailcap b/dots/bspwm/.mailcap
similarity index 100%
rename from bspwm/.mailcap
rename to dots/bspwm/.mailcap
diff --git a/bspwm/.xinitrc b/dots/bspwm/.xinitrc
similarity index 100%
rename from bspwm/.xinitrc
rename to dots/bspwm/.xinitrc
diff --git a/neofetch/.config/neofetch/config.conf b/dots/common/.config/neofetch/config.conf
similarity index 100%
rename from neofetch/.config/neofetch/config.conf
rename to dots/common/.config/neofetch/config.conf
diff --git a/rtv/.config/rtv/rtv.cfg b/dots/common/.config/rtv/rtv.cfg
similarity index 100%
rename from rtv/.config/rtv/rtv.cfg
rename to dots/common/.config/rtv/rtv.cfg
diff --git a/yt-dl/.config/youtube-dl/config b/dots/common/.config/youtube-dl/config
similarity index 100%
rename from yt-dl/.config/youtube-dl/config
rename to dots/common/.config/youtube-dl/config
diff --git a/git/.gitconfig b/dots/git/.gitconfig
similarity index 100%
rename from git/.gitconfig
rename to dots/git/.gitconfig
diff --git a/git/.gitignore b/dots/git/.gitignore
similarity index 100%
rename from git/.gitignore
rename to dots/git/.gitignore
diff --git a/gnupg/.gnupg/gpg-agent.conf b/dots/gnupg/.gnupg/gpg-agent.conf
similarity index 100%
rename from gnupg/.gnupg/gpg-agent.conf
rename to dots/gnupg/.gnupg/gpg-agent.conf
diff --git a/gnupg/.gnupg/gpg.conf b/dots/gnupg/.gnupg/gpg.conf
similarity index 100%
rename from gnupg/.gnupg/gpg.conf
rename to dots/gnupg/.gnupg/gpg.conf
diff --git a/termite/.config/gtk-3.0/gtk.css b/dots/termite/.config/gtk-3.0/gtk.css
similarity index 100%
rename from termite/.config/gtk-3.0/gtk.css
rename to dots/termite/.config/gtk-3.0/gtk.css
diff --git a/termite/.config/termite/config b/dots/termite/.config/termite/config
similarity index 100%
rename from termite/.config/termite/config
rename to dots/termite/.config/termite/config
diff --git a/tmux/.tmux.conf b/dots/tmux/.tmux.conf
similarity index 100%
rename from tmux/.tmux.conf
rename to dots/tmux/.tmux.conf
diff --git a/neovim/.config/nvim/init.vim b/dots/vim/.config/nvim/init.vim
similarity index 100%
rename from neovim/.config/nvim/init.vim
rename to dots/vim/.config/nvim/init.vim
diff --git a/vim/.vim/colors.vim b/dots/vim/.vim/colors.vim
similarity index 100%
rename from vim/.vim/colors.vim
rename to dots/vim/.vim/colors.vim
diff --git a/vim/.vim/config.vim b/dots/vim/.vim/config.vim
similarity index 100%
rename from vim/.vim/config.vim
rename to dots/vim/.vim/config.vim
diff --git a/vim/.vim/keybindings.vim b/dots/vim/.vim/keybindings.vim
similarity index 100%
rename from vim/.vim/keybindings.vim
rename to dots/vim/.vim/keybindings.vim
diff --git a/vim/.vim/plugins.vim b/dots/vim/.vim/plugins.vim
similarity index 100%
rename from vim/.vim/plugins.vim
rename to dots/vim/.vim/plugins.vim
diff --git a/vim/.vimrc b/dots/vim/.vimrc
similarity index 100%
rename from vim/.vimrc
rename to dots/vim/.vimrc
diff --git a/xcape/.xmodmap b/dots/xcape/.xmodmap
similarity index 100%
rename from xcape/.xmodmap
rename to dots/xcape/.xmodmap
diff --git a/xcape/README.md b/xcape/README.md
deleted file mode 100644
index e31dfaa5..00000000
--- a/xcape/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# xcape
-
-[`xcape`](https://github.com/alols/xcape) makes Caps Lock the escape key on press and the control key when used in combination with other keys. This is especially useful for vim and other programs so you don't have to reach for the escape key or the ctrl key
-
-By default, `.xmodmap` only adds the `Ctrl` functionality. To add the `Esc` functionality, use `xcape -e 'Control_L=Escape'`.