diff --git a/Makefile b/Makefile
index a650fbd..884fb01 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,13 @@ programs/sxmo_vibratepine:
 
 install: programs/sxmo_setpineled programs/sxmo_setpinebacklight programs/sxmo_screenlock programs/sxmo_megiaudioroute programs/sxmo_vibratepine
 	mkdir -p $(PREFIX)/usr/share/sxmo
-	cp configs/* $(PREFIX)/usr/share/sxmo
+	cp -r configs/* $(PREFIX)/usr/share/sxmo
 
 	mkdir -p $(PREFIX)/etc/alsa/conf.d/
-	cp configs/alsa_sxmo_enable_dmix.conf $(PREFIX)/etc/alsa/conf.d/
+	cp configs/alsa/alsa_sxmo_enable_dmix.conf $(PREFIX)/etc/alsa/conf.d/
 
 	mkdir -p $(PREFIX)/etc/polkit-1/rules.d
-	cp configs/00-sxmo.rules $(PREFIX)/etc/polkit-1/rules.d/
+	cp configs/polkit/00-sxmo.rules $(PREFIX)/etc/polkit-1/rules.d/
 
 	mkdir -p $(PREFIX)/usr/bin
 	cp scripts/*/* $(PREFIX)/usr/bin
diff --git a/configs/alsa_sxmo_enable_dmix.conf b/configs/alsa/alsa_sxmo_enable_dmix.conf
similarity index 100%
rename from configs/alsa_sxmo_enable_dmix.conf
rename to configs/alsa/alsa_sxmo_enable_dmix.conf
diff --git a/configs/default_alsa_sound.conf b/configs/alsa/default_alsa_sound.conf
similarity index 100%
rename from configs/default_alsa_sound.conf
rename to configs/alsa/default_alsa_sound.conf
diff --git a/configs/conky.conf b/configs/appcfg/conky.conf
similarity index 100%
rename from configs/conky.conf
rename to configs/appcfg/conky.conf
diff --git a/configs/dunst.conf b/configs/appcfg/dunst.conf
similarity index 100%
rename from configs/dunst.conf
rename to configs/appcfg/dunst.conf
diff --git a/configs/places_for_gps.tsv b/configs/appcfg/places_for_gps.tsv
similarity index 100%
rename from configs/places_for_gps.tsv
rename to configs/appcfg/places_for_gps.tsv
diff --git a/configs/sxmo_sfeedrc b/configs/appcfg/sxmo_sfeedrc
similarity index 100%
rename from configs/sxmo_sfeedrc
rename to configs/appcfg/sxmo_sfeedrc
diff --git a/configs/xmodmap_caps_esc b/configs/appcfg/xmodmap_caps_esc
similarity index 100%
rename from configs/xmodmap_caps_esc
rename to configs/appcfg/xmodmap_caps_esc
diff --git a/configs/xresources_xcalc.xr b/configs/appcfg/xresources_xcalc.xr
similarity index 100%
rename from configs/xresources_xcalc.xr
rename to configs/appcfg/xresources_xcalc.xr
diff --git a/configs/00-sxmo.rules b/configs/polkit/00-sxmo.rules
similarity index 100%
rename from configs/00-sxmo.rules
rename to configs/polkit/00-sxmo.rules
diff --git a/scripts/appscripts/sxmo_rss.sh b/scripts/appscripts/sxmo_rss.sh
index 80e8137..fccc0dc 100755
--- a/scripts/appscripts/sxmo_rss.sh
+++ b/scripts/appscripts/sxmo_rss.sh
@@ -4,7 +4,7 @@ if [ -f "$XDG_CONFIG_HOME/sxmo/sfeedrc" ]; then
 elif [ -f "$HOME/.sfeed/sfeedrc" ]; then
 	SFEEDCONF="$HOME/.sfeed/sfeedrc"
 else
-	SFEEDCONF=/usr/share/sxmo/sxmo_sfeedrc
+	SFEEDCONF=/usr/share/sxmo/appcfg/sxmo_sfeedrc
 fi
 
 die() {
diff --git a/scripts/appscripts/sxmo_weather.sh b/scripts/appscripts/sxmo_weather.sh
index 06ef855..faaf3c3 100755
--- a/scripts/appscripts/sxmo_weather.sh
+++ b/scripts/appscripts/sxmo_weather.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/places_for_gps.tsv"
+[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/appcfg/places_for_gps.tsv"
 ROWHOURS=12
 WEATHERXML=""
 
diff --git a/scripts/core/sxmo_gpsutil.sh b/scripts/core/sxmo_gpsutil.sh
index 4be4c24..6752190 100755
--- a/scripts/core/sxmo_gpsutil.sh
+++ b/scripts/core/sxmo_gpsutil.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
-[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/places_for_gps.tsv"
+[ -z "$SXMO_GPSLOCATIONSFILES" ] && SXMO_GPSLOCATIONSFILES="/usr/share/sxmo/appcfg/places_for_gps.tsv"
 CTILESIZE=256
 CLN2=0.693147180559945309417
 CPI=3.14159265358979323846
diff --git a/scripts/core/sxmo_statusbarupdate.sh b/scripts/core/sxmo_statusbarupdate.sh
new file mode 100755
index 0000000..ffd1651
--- /dev/null
+++ b/scripts/core/sxmo_statusbarupdate.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env sh
+pgrep -f "$(command -v sxmo_statusbar.sh)" | xargs kill -USR1 &
diff --git a/scripts/core/sxmo_xinit.sh b/scripts/core/sxmo_xinit.sh
index 6a89b20..f00a78a 100755
--- a/scripts/core/sxmo_xinit.sh
+++ b/scripts/core/sxmo_xinit.sh
@@ -8,11 +8,11 @@ command -v "$BROWSER" || export BROWSER=surf
 [ -z "$XDG_CONFIG_HOME" ] && export XDG_CONFIG_HOME=~/.config
 
 # Setup audio and a few sensible X defaults
-alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore
-xmodmap /usr/share/sxmo/xmodmap_caps_esc
+alsactl --file /usr/share/sxmo/alsa/default_alsa_sound.conf restore
+xmodmap /usr/share/sxmo/appcfg/xmodmap_caps_esc
 xsetroot -mod 3 2 -fg '#000000' -bg '#888888'
 xset s off -dpms
-xrdb /usr/share/sxmo/xresources_xcalc.xr
+xrdb /usr/share/sxmo/appcfg/xresources_xcalc.xr
 synclient TapButton1=1 TapButton2=3 TapButton3=2 MinSpeed=0.25
 
 # Start daemons
@@ -20,7 +20,7 @@ pkill conky
 if [ -e "$XDG_CONFIG_HOME/sxmo/conky.conf" ]; then
 	conky -c $XDG_CONFIG_HOME/sxmo/conky.conf -d
 else
-	conky -c /usr/share/sxmo/conky.conf -d
+	conky -c /usr/share/sxmo/appcfg/conky.conf -d
 fi
 keynav &
 autocutsel &
@@ -34,7 +34,7 @@ set +o allexport
 
 # Startup dbus, dunst in dbus path, lisgd in dbus path, and finally dwm
 exec dbus-run-session sh -c "
-	dunst -conf /usr/share/sxmo/dunst.conf &
+	dunst -conf /usr/share/sxmo/appcfg/dunst.conf &
 	sxmo_lisgdstart.sh &
 	dwm 2> ~/.dwm.log
 "
diff --git a/scripts/modem/sxmo_modemcall.sh b/scripts/modem/sxmo_modemcall.sh
index c0d161d..a31aadb 100755
--- a/scripts/modem/sxmo_modemcall.sh
+++ b/scripts/modem/sxmo_modemcall.sh
@@ -7,7 +7,7 @@ fatalerr() {
 	# E.g. hangup all calls, switch back to default audio, notify user, and die
 	sxmo_vibratepine 1000 &
 	mmcli -m "$(mmcli -L | grep -oE 'Modem\/([0-9]+)' | cut -d'/' -f2)" --voice-hangup-all
-	alsactl --file /usr/share/sxmo/default_alsa_sound.conf restore
+	alsactl --file /usr/share/sxmo/alsa/default_alsa_sound.conf restore
 	notify-send "$1"
 	setsid -f sh -c 'sleep 2; smxo_statusbarupdate.sh'
 	kill -9 0