diff --git a/homedir/.config/watchman/init.d/compton b/homedir/.config/ssm/services/compton
similarity index 100%
rename from homedir/.config/watchman/init.d/compton
rename to homedir/.config/ssm/services/compton
diff --git a/homedir/.config/watchman/init.d/dunst b/homedir/.config/ssm/services/dunst
similarity index 100%
rename from homedir/.config/watchman/init.d/dunst
rename to homedir/.config/ssm/services/dunst
diff --git a/homedir/.config/watchman/init.d/jackd b/homedir/.config/ssm/services/jackd
similarity index 100%
rename from homedir/.config/watchman/init.d/jackd
rename to homedir/.config/ssm/services/jackd
diff --git a/homedir/.config/ssm/services/lockd b/homedir/.config/ssm/services/lockd
new file mode 100755
index 0000000..c41a8be
--- /dev/null
+++ b/homedir/.config/ssm/services/lockd
@@ -0,0 +1,33 @@
+#!/usr/bin/env ssm
+# vim: ft=sh
+
+service_respawn='true'
+service_command="$HOME/bin/lockd"
+service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
+
+function do_notify {
+	declare output; var output
+	output = "$( "$@" )"
+
+	if output; then
+		notify-send "ssm ($service_name)" "$output"
+	fi
+}
+
+function start_or_lock {
+	if status; then
+		notify-send 'ssm' "Starting $service_name"
+		start
+	else
+		notify-send 'ssm' "Locking..."
+		kill -USR1 "$service_pid"
+	fi
+}
+
+function toggle {
+	if status; then
+		do_notify "$0" "$service_name" stop
+	else
+		do_notify "$0" "$service_name" start
+	fi
+}
diff --git a/homedir/.config/watchman/init.d/moltenbar b/homedir/.config/ssm/services/moltenbar
similarity index 100%
rename from homedir/.config/watchman/init.d/moltenbar
rename to homedir/.config/ssm/services/moltenbar
diff --git a/homedir/.config/watchman/init.d/mpc-notify b/homedir/.config/ssm/services/mpc-notify
similarity index 100%
rename from homedir/.config/watchman/init.d/mpc-notify
rename to homedir/.config/ssm/services/mpc-notify
diff --git a/homedir/.config/watchman/init.d/mpd b/homedir/.config/ssm/services/mpd
similarity index 100%
rename from homedir/.config/watchman/init.d/mpd
rename to homedir/.config/ssm/services/mpd
diff --git a/homedir/.config/watchman/init.d/privoxy b/homedir/.config/ssm/services/privoxy
similarity index 100%
rename from homedir/.config/watchman/init.d/privoxy
rename to homedir/.config/ssm/services/privoxy
diff --git a/homedir/.config/watchman/init.d/pulseaudio b/homedir/.config/ssm/services/pulseaudio
similarity index 100%
rename from homedir/.config/watchman/init.d/pulseaudio
rename to homedir/.config/ssm/services/pulseaudio
diff --git a/homedir/.config/watchman/init.d/scron b/homedir/.config/ssm/services/scron
similarity index 100%
rename from homedir/.config/watchman/init.d/scron
rename to homedir/.config/ssm/services/scron
diff --git a/homedir/.config/watchman/init.d/socks b/homedir/.config/ssm/services/socks
similarity index 100%
rename from homedir/.config/watchman/init.d/socks
rename to homedir/.config/ssm/services/socks
diff --git a/homedir/.config/watchman/init.d/ssh-agent b/homedir/.config/ssm/services/ssh-agent
similarity index 100%
rename from homedir/.config/watchman/init.d/ssh-agent
rename to homedir/.config/ssm/services/ssh-agent
diff --git a/homedir/.config/watchman/init.d/sxhkd b/homedir/.config/ssm/services/sxhkd
similarity index 100%
rename from homedir/.config/watchman/init.d/sxhkd
rename to homedir/.config/ssm/services/sxhkd
diff --git a/homedir/.config/watchman/init.d/syncthing b/homedir/.config/ssm/services/syncthing
similarity index 100%
rename from homedir/.config/watchman/init.d/syncthing
rename to homedir/.config/ssm/services/syncthing
diff --git a/homedir/.config/watchman/init.d/transmission-daemon b/homedir/.config/ssm/services/transmission-daemon
similarity index 100%
rename from homedir/.config/watchman/init.d/transmission-daemon
rename to homedir/.config/ssm/services/transmission-daemon
diff --git a/homedir/.config/watchman/init.d/ufwd b/homedir/.config/ssm/services/ufwd
similarity index 100%
rename from homedir/.config/watchman/init.d/ufwd
rename to homedir/.config/ssm/services/ufwd
diff --git a/homedir/.config/watchman/init.d/lockd b/homedir/.config/watchman/init.d/lockd
deleted file mode 100755
index 5216f9d..0000000
--- a/homedir/.config/watchman/init.d/lockd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env ssm
-# vim: ft=sh
-
-service_respawn='true'
-service_command="$HOME/bin/lockd"
-service_args=( i3lock-extra -s -o ~/pics/lock.png -g -p )
-
-function _lock {
-	kill -USR1 "$service_pid"
-}
-
-function lock {
-	status || {
-		start; sleep 1
-		"$0" "$service_name" lock
-		return "$?"
-	}
-
-	_lock
-}
-
-function toggle {
-	if status; then
-		out=$( "$0" "$service_name" stop 2>&1 )
-		notify-send "ssm" "$out"
-	else
-		out=$( "$0" "$service_name" start 2>&1 )
-		notify-send "ssm" "$out"
-	fi
-}