diff --git a/nexush/utils/print.go b/libclient/utils/print.go
similarity index 100%
rename from nexush/utils/print.go
rename to libclient/utils/print.go
diff --git a/nexush/utils/signal.go b/libclient/utils/signal.go
similarity index 55%
rename from nexush/utils/signal.go
rename to libclient/utils/signal.go
index 92964d25f02fedcbc73ee265b52fc48efdf31445..fda419d0d6badafda37b7a4bd0b8453fb67bc565 100644
--- a/nexush/utils/signal.go
+++ b/libclient/utils/signal.go
@@ -4,16 +4,18 @@ import (
 	"os"
 	"os/signal"
 	"syscall"
+
+	u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
 )
 
-// Wait on dedicated signals
+// Wait on most signals
 func WaitForSignals() {
 	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP)
+	signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGUSR1, syscall.SIGUSR2)
 
 	for {
 		sig := <-sigs // blocks on any of the above signals.
-		Println("Caught signal (" + sig.String() + ")")
+		u.Println("Caught signal (" + sig.String() + ")")
 		break
 	}
 }
diff --git a/nexus-exam/go.mod b/nexus-exam/go.mod
index 8455c2edb55017c0fdd911ae3b124b71051c803d..3b5890df37dfc089815251764ef4944d059aa1a7 100644
--- a/nexus-exam/go.mod
+++ b/nexus-exam/go.mod
@@ -4,7 +4,6 @@ go 1.22.2
 
 require (
 	fyne.io/fyne/v2 v2.5.5
-	gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client v0.0.0-20250320135605-9ac7ec3df57a
 	gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250325205800-0184d2c91b35
 )
 
diff --git a/nexus-exam/go.sum b/nexus-exam/go.sum
index 1ee84be25c8b918a4bfbb1a1b04fc78a13e0a146..3b392f9fcb33e814f6a30ea8666caab40d5f4fda 100644
--- a/nexus-exam/go.sum
+++ b/nexus-exam/go.sum
@@ -41,8 +41,6 @@ fyne.io/fyne/v2 v2.5.5 h1:IhS8Vf1EtSHS94/i41D9Rh4s1rG1habkGN/oISA0kTU=
 fyne.io/fyne/v2 v2.5.5/go.mod h1:0GOXKqyvNwk3DLmsFu9v0oYM0ZcD1ysGnlHCerKoAmo=
 fyne.io/systray v1.11.0 h1:D9HISlxSkx+jHSniMBR6fCFOUjk1x/OOOJLa9lJYAKg=
 fyne.io/systray v1.11.0/go.mod h1:RVwqP9nYMo7h5zViCBHri2FgjXF7H2cub7MAq4NSoLs=
-gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client v0.0.0-20250320135605-9ac7ec3df57a h1:v+M1W/zpGQ8uD2nWN/fWe0bMSu9DzkUBxidnBRhUzAc=
-gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client v0.0.0-20250320135605-9ac7ec3df57a/go.mod h1:PTy6fgQsS+7QKFvQZEhrzMUTonYGI2s8kkkVKza6GBE=
 gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a h1:D4M2OnN+9vUALGPo6yNyWmcpvgGIzo/2HJj8SA4bGls=
 gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/common v0.0.0-20250320135605-9ac7ec3df57a/go.mod h1:HzVsiYhPk7BhhvspjLchF3HlY1z+qIF89jG6+Hs8m3c=
 gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient v0.0.0-20250325205800-0184d2c91b35 h1:xCnxp014yKhBI8nVMjMEBgsKs+fzvtciDb/EmtVCXR0=
diff --git a/nexus-exam/nexus-exam.go b/nexus-exam/nexus-exam.go
index 2904ebd2f43223ccb17dcea9f9d16c9753206e30..2fb493065142e26e1f2113e9265e9fe620b383be 100644
--- a/nexus-exam/nexus-exam.go
+++ b/nexus-exam/nexus-exam.go
@@ -14,8 +14,8 @@ import (
 	"fyne.io/fyne/v2/container"
 	"fyne.io/fyne/v2/theme"
 	"fyne.io/fyne/v2/widget"
-	u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/client/utils"
 	nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient"
+	u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexus-exam/buildversion"
 )
diff --git a/nexush/nexush.go b/nexush/nexush.go
index e32a0f56ac45993a05ea6ce838dd94c00d5304b7..96a20c9b2022ebe702a1c59edf5682464caf821d 100644
--- a/nexush/nexush.go
+++ b/nexush/nexush.go
@@ -11,6 +11,7 @@ import (
 	"syscall"
 
 	nc "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/nexusclient"
+	u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/utils"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/libclient/version"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/buildversion"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmd"
@@ -20,7 +21,6 @@ import (
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdUser"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVM"
 	"gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/cmdVersion"
-	u "gitedu.hesge.ch/flg_projects/nexus_vdi/nexus/nexush/utils"
 	"github.com/peterh/liner"
 	"golang.org/x/term"
 )