diff --git a/Makefile b/Makefile
index bf1da3f..32c93c7 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ SRC_C_SOURCES_NAMES := $(notdir $(basename $(wildcard $(SRCD)/*$(SRC_FMT))))
 C_BINARIES := $(addprefix $(QEMU_BIN)/,$(SRC_C_SOURCES_NAMES))
 
 # Directories in ~qemu necessary for qemush to work
-QEMUSH_DIRS_NAMES := bin launchers disks sockets
+QEMUSH_DIRS_NAMES := bin launchers disks sockets/monitors sockets/spice
 QEMUSH_DIRS := $(addprefix $(QEMU_HOME)/,$(QEMUSH_DIRS_NAMES))
 
 install: $(QEMUSH_DIRS) $(MODULES) $(C_BINARIES) $(QEMUSH) $(LAUNCHERS)
diff --git a/bin/qemush b/bin/qemush
index b3447ee..cd4155e 100755
--- a/bin/qemush
+++ b/bin/qemush
@@ -86,7 +86,7 @@ public_attach() {
 public_running() {
     cd || return
     echo "Running machines:"
-    set -- $ls -t sockets "$@"
+    set -- $ls -t sockets/monitors "$@"
     exec "$@"
 }
 
diff --git a/qemu/bin/pathof b/qemu/bin/pathof
index b92f3d5..dbed3d5 100755
--- a/qemu/bin/pathof
+++ b/qemu/bin/pathof
@@ -18,11 +18,10 @@ case "$1" in
         extension=qcow2
         ;;
     socket)
-        basedir=sockets
+        basedir=sockets/monitors
         ;;
     spice)
-        basedir=spice
-        extension=sock
+        basedir=sockets/spice
         ;;
     *)
         false