diff --git a/scripts/bar.sh b/bspwm/.config/scripts/bar.sh
similarity index 100%
rename from scripts/bar.sh
rename to bspwm/.config/scripts/bar.sh
diff --git a/scripts/barformatter.py b/bspwm/.config/scripts/barformatter.py
similarity index 100%
rename from scripts/barformatter.py
rename to bspwm/.config/scripts/barformatter.py
diff --git a/scripts/barinfo.sh b/bspwm/.config/scripts/barinfo.sh
similarity index 100%
rename from scripts/barinfo.sh
rename to bspwm/.config/scripts/barinfo.sh
diff --git a/scripts/blurlock.sh b/bspwm/.config/scripts/blurlock.sh
similarity index 100%
rename from scripts/blurlock.sh
rename to bspwm/.config/scripts/blurlock.sh
diff --git a/scripts/bspwm-session.sh b/bspwm/.config/scripts/bspwm-session.sh
similarity index 100%
rename from scripts/bspwm-session.sh
rename to bspwm/.config/scripts/bspwm-session.sh
diff --git a/scripts/bspwmbar.py b/bspwm/.config/scripts/bspwmbar.py
similarity index 100%
rename from scripts/bspwmbar.py
rename to bspwm/.config/scripts/bspwmbar.py
diff --git a/scripts/cmenu.sh b/bspwm/.config/scripts/cmenu.sh
similarity index 100%
rename from scripts/cmenu.sh
rename to bspwm/.config/scripts/cmenu.sh
diff --git a/scripts/dmenu.sh b/bspwm/.config/scripts/dmenu.sh
similarity index 100%
rename from scripts/dmenu.sh
rename to bspwm/.config/scripts/dmenu.sh
diff --git a/scripts/dmenu_run.sh b/bspwm/.config/scripts/dmenu_run.sh
similarity index 100%
rename from scripts/dmenu_run.sh
rename to bspwm/.config/scripts/dmenu_run.sh
diff --git a/scripts/explorer_run.sh b/bspwm/.config/scripts/explorer_run.sh
similarity index 100%
rename from scripts/explorer_run.sh
rename to bspwm/.config/scripts/explorer_run.sh
diff --git a/scripts/lock.sh b/bspwm/.config/scripts/lock.sh
similarity index 100%
rename from scripts/lock.sh
rename to bspwm/.config/scripts/lock.sh
diff --git a/scripts/monsetup.sh b/bspwm/.config/scripts/monsetup.sh
similarity index 100%
rename from scripts/monsetup.sh
rename to bspwm/.config/scripts/monsetup.sh
diff --git a/scripts/monsetup_menu.sh b/bspwm/.config/scripts/monsetup_menu.sh
similarity index 100%
rename from scripts/monsetup_menu.sh
rename to bspwm/.config/scripts/monsetup_menu.sh
diff --git a/bspwm/.config/bspwm/sxhkdrc b/bspwm/.config/sxhkd/sxhkdrc
similarity index 100%
rename from bspwm/.config/bspwm/sxhkdrc
rename to bspwm/.config/sxhkd/sxhkdrc
diff --git a/scripts/batteryobserver.sh b/scripts/.config/scripts/batteryobserver.sh
similarity index 100%
rename from scripts/batteryobserver.sh
rename to scripts/.config/scripts/batteryobserver.sh
diff --git a/scripts/cmdcache.sh b/scripts/.config/scripts/cmdcache.sh
similarity index 100%
rename from scripts/cmdcache.sh
rename to scripts/.config/scripts/cmdcache.sh
diff --git a/scripts/dotfiles.sh b/scripts/.config/scripts/dotfiles.sh
similarity index 100%
rename from scripts/dotfiles.sh
rename to scripts/.config/scripts/dotfiles.sh
diff --git a/scripts/extract.sh b/scripts/.config/scripts/extract.sh
similarity index 100%
rename from scripts/extract.sh
rename to scripts/.config/scripts/extract.sh
diff --git a/scripts/firewall.sh b/scripts/.config/scripts/firewall.sh
similarity index 100%
rename from scripts/firewall.sh
rename to scripts/.config/scripts/firewall.sh
diff --git a/scripts/monitor_switch.sh b/scripts/.config/scripts/monitor_switch.sh
similarity index 100%
rename from scripts/monitor_switch.sh
rename to scripts/.config/scripts/monitor_switch.sh
diff --git a/scripts/pacrank.sh b/scripts/.config/scripts/pacrank.sh
similarity index 100%
rename from scripts/pacrank.sh
rename to scripts/.config/scripts/pacrank.sh
diff --git a/scripts/prepare_monitors.sh b/scripts/.config/scripts/prepare_monitors.sh
similarity index 100%
rename from scripts/prepare_monitors.sh
rename to scripts/.config/scripts/prepare_monitors.sh
diff --git a/scripts/srec.sh b/scripts/.config/scripts/srec.sh
similarity index 100%
rename from scripts/srec.sh
rename to scripts/.config/scripts/srec.sh
diff --git a/scripts/ssh_hosts.sh b/scripts/.config/scripts/ssh_hosts.sh
similarity index 100%
rename from scripts/ssh_hosts.sh
rename to scripts/.config/scripts/ssh_hosts.sh
diff --git a/scripts/sshw.sh b/scripts/.config/scripts/sshw.sh
similarity index 100%
rename from scripts/sshw.sh
rename to scripts/.config/scripts/sshw.sh
diff --git a/scripts/teatimer.sh b/scripts/.config/scripts/teatimer.sh
similarity index 100%
rename from scripts/teatimer.sh
rename to scripts/.config/scripts/teatimer.sh
diff --git a/scripts/termclock.sh b/scripts/.config/scripts/termclock.sh
similarity index 100%
rename from scripts/termclock.sh
rename to scripts/.config/scripts/termclock.sh
diff --git a/scripts/tmuxn.sh b/scripts/.config/scripts/tmuxn.sh
similarity index 100%
rename from scripts/tmuxn.sh
rename to scripts/.config/scripts/tmuxn.sh
diff --git a/scripts/volume.sh b/scripts/.config/scripts/volume.sh
similarity index 100%
rename from scripts/volume.sh
rename to scripts/.config/scripts/volume.sh
diff --git a/scripts/maptooutput.sh b/tablet/.config/scripts/maptooutput.sh
similarity index 100%
rename from scripts/maptooutput.sh
rename to tablet/.config/scripts/maptooutput.sh
diff --git a/scripts/tabletmode.sh b/tablet/.config/scripts/tabletmode.sh
similarity index 100%
rename from scripts/tabletmode.sh
rename to tablet/.config/scripts/tabletmode.sh
diff --git a/scripts/wacomdevices.sh b/tablet/.config/scripts/wacomdevices.sh
similarity index 100%
rename from scripts/wacomdevices.sh
rename to tablet/.config/scripts/wacomdevices.sh
diff --git a/vimperatorrc b/vimperator/.vimperatorrc
similarity index 100%
rename from vimperatorrc
rename to vimperator/.vimperatorrc
diff --git a/weechat/irc.conf b/weechat/.weechat/irc.conf
similarity index 100%
rename from weechat/irc.conf
rename to weechat/.weechat/irc.conf
diff --git a/weechat/weechat.conf b/weechat/.weechat/weechat.conf
similarity index 100%
rename from weechat/weechat.conf
rename to weechat/.weechat/weechat.conf