diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a927b6..8f28cc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -116,11 +116,11 @@ include_directories( ${PROJECT_BINARY_DIR}
 
 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
diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index d07eb40..27c9a02 100644
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -24,7 +24,7 @@ set(SOURCES ../util/common.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
diff --git a/src/util/common.c b/src/util/common.c
index b0ae1d6..80bcf13 100644
--- a/src/util/common.c
+++ b/src/util/common.c
@@ -31,7 +31,7 @@
 #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>
diff --git a/src/server.c b/src/util/server.c
similarity index 100%
rename from src/server.c
rename to src/util/server.c
diff --git a/src/server.h b/src/util/server.h
similarity index 100%
rename from src/server.h
rename to src/util/server.h
diff --git a/src/signals.c b/src/util/signals.c
similarity index 100%
rename from src/signals.c
rename to src/util/signals.c
diff --git a/src/signals.h b/src/util/signals.h
similarity index 100%
rename from src/signals.h
rename to src/util/signals.h
diff --git a/src/tracing.c b/src/util/tracing.c
similarity index 100%
rename from src/tracing.c
rename to src/util/tracing.c
diff --git a/src/tracing.h b/src/util/tracing.h
similarity index 100%
rename from src/tracing.h
rename to src/util/tracing.h
diff --git a/tint2.files b/tint2.files
index 5a714e2..8ed4c36 100644
--- a/tint2.files
+++ b/tint2.files
@@ -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