@@ -116,11 +116,11 @@ ${SN_INCLUDE_DIRS} )
 
 set( SOURCES src/config.c
              src/panel.c
-             src/server.c
+             src/util/server.c
              src/main.c
              src/init.c
-             src/signals.c
-             src/tracing.c
+             src/util/signals.c
+             src/util/tracing.c
              src/mouse_actions.c
              src/drag_and_drop.c
              src/clock/clock.c

@@ -24,7 +24,7 @@ ../util/strnatcmp.c
             ../util/cache.c
             ../util/timer.c
             ../config.c
-            ../server.c
+            ../util/server.c
             ../launcher/apps-common.c
             ../launcher/icon-theme-common.c
             md4.c

@@ -31,7 +31,7 @@ #include <unistd.h>
 #include <glib.h>
 #include <glib/gstdio.h>
 #include "common.h"
-#include "../server.h"
+#include "server.h"
 #include <sys/wait.h>
 #include <sys/types.h>
 #include <pwd.h>

@@ -245,3 +245,7 @@ src/util/print.c
 src/util/print.h
 src/util/test.c
 src/util/test.h
+src/util/tracing.h
+src/util/tracing.c
+src/util/signals.h
+src/util/signals.c