diff --git a/bspwm/README.md b/bspwm/README.md
deleted file mode 100644
index 2b990c12..00000000
--- a/bspwm/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# bspwm
-
-I use `bspwm` as my window manager of choice. My setup is optimized for HiDPI, so you will have to manually adjust the numbers if you aren't using a HiDPI display.
-
-## Dependencies
-
-- [bspwm][bspwm] - Window manager
-- [polybar][polybar] - Panel
-- [dunst][dunst] - Notifications
-- [rofi][rofi] - Window switcher, application launcher, and dmenu replacement
-- [sxhkd][sxhkd] - Keybinds
-- [rxvt-unicode-patched][rxvt-unicode-patched] - Terminal with image support
-- [termite][termite] - Terminal with true transparency, icon fonts, true color, and emoji support
-- [python-pywal][python-pywal] - A universal color scheme changer
-- [feh][feh] - Used to set the background image
-
-## Installation
-
-```sh
-make package=bspwm
-```
-
-## Usage
-
-Either `startx` directly or use a display manager. Assuming you have the necessary dependencies installed, and assuming you configured your system properly, everything should just work.
-
-## Note
-
-When you use `wal` to change the color scheme, add `-o ~/.config/wal/done.sh` to run the done script. The [fish](/fish) abbreviation `w` does this automatically for you.
-
-[bspwm]: https://www.archlinux.org/packages/community/x86_64/bspwm/
-[polybar]: https://aur.archlinux.org/packages/polybar/
-[dunst]: https://www.archlinux.org/packages/community/x86_64/dunst/
-[rofi]: https://www.archlinux.org/packages/community/x86_64/rofi/
-[sxhkd]: https://www.archlinux.org/packages/community/x86_64/sxhkd/
-[termite]: https://www.archlinux.org/packages/community/x86_64/termite/
-[rxvt-unicode-patched]: https://aur.archlinux.org/packages/rxvt-unicode-patched/
-[python-pywal]: https://www.archlinux.org/packages/community/any/python-pywal/
-[feh]: https://www.archlinux.org/packages/extra/x86_64/feh/
diff --git a/bspwm/.config/compton.conf b/compton/.config/compton.conf
similarity index 100%
rename from bspwm/.config/compton.conf
rename to compton/.config/compton.conf
diff --git a/bspwm/.config/wal/templates/dunstrc b/dunst/.config/wal/templates/dunstrc
similarity index 100%
rename from bspwm/.config/wal/templates/dunstrc
rename to dunst/.config/wal/templates/dunstrc
diff --git a/bspwm/.config/feh/tile.sh b/feh/.config/feh/tile.sh
similarity index 100%
rename from bspwm/.config/feh/tile.sh
rename to feh/.config/feh/tile.sh
diff --git a/bspwm/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini
similarity index 100%
rename from bspwm/.config/gtk-3.0/settings.ini
rename to gtk/.config/gtk-3.0/settings.ini
diff --git a/bspwm/.config/polybar/config b/polybar/.config/polybar/config
similarity index 100%
rename from bspwm/.config/polybar/config
rename to polybar/.config/polybar/config
diff --git a/bspwm/.config/polybar/launch.sh b/polybar/.config/polybar/launch.sh
similarity index 100%
rename from bspwm/.config/polybar/launch.sh
rename to polybar/.config/polybar/launch.sh
diff --git a/bspwm/.config/rofi/config.rasi b/rofi/.config/rofi/config.rasi
similarity index 100%
rename from bspwm/.config/rofi/config.rasi
rename to rofi/.config/rofi/config.rasi
diff --git a/bspwm/.config/sxhkd/dropdown.sh b/sxhkd/.config/sxhkd/dropdown.sh
similarity index 100%
rename from bspwm/.config/sxhkd/dropdown.sh
rename to sxhkd/.config/sxhkd/dropdown.sh
diff --git a/bspwm/.config/sxhkd/screenshot.sh b/sxhkd/.config/sxhkd/screenshot.sh
similarity index 100%
rename from bspwm/.config/sxhkd/screenshot.sh
rename to sxhkd/.config/sxhkd/screenshot.sh
diff --git a/bspwm/.config/sxhkd/sxhkdrc b/sxhkd/.config/sxhkd/sxhkdrc
similarity index 100%
rename from bspwm/.config/sxhkd/sxhkdrc
rename to sxhkd/.config/sxhkd/sxhkdrc
diff --git a/bspwm/.config/wal/done.sh b/wal/.config/wal/done.sh
similarity index 100%
rename from bspwm/.config/wal/done.sh
rename to wal/.config/wal/done.sh
diff --git a/bspwm/.icons/default/index.theme b/xcursor/.icons/default/index.theme
similarity index 100%
rename from bspwm/.icons/default/index.theme
rename to xcursor/.icons/default/index.theme
diff --git a/bspwm/.xinitrc b/xinit/.xinitrc
similarity index 100%
rename from bspwm/.xinitrc
rename to xinit/.xinitrc
diff --git a/bspwm/.Xresources b/xresources/.Xresources
similarity index 100%
rename from bspwm/.Xresources
rename to xresources/.Xresources