diff --git a/CMakeLists.txt b/CMakeLists.txt
index 438f646..70366b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -104,13 +104,13 @@ target_link_libraries(sj3stat
 )
 
 add_executable(sj3serv
-    server/comuni.c
-    server/error.c
-    server/execute.c
-    server/main.c
-    server/setup.c
-    server/time_stamp.c
-    server/version.c
+    sj3serv/comuni.c
+    sj3serv/error.c
+    sj3serv/execute.c
+    sj3serv/main.c
+    sj3serv/setup.c
+    sj3serv/time_stamp.c
+    sj3serv/version.c
 )
 target_include_directories(sj3serv
     PRIVATE include sj3lib
diff --git a/server/Imakefile b/sj3serv/Imakefile
similarity index 100%
rename from server/Imakefile
rename to sj3serv/Imakefile
diff --git a/server/comuni.c b/sj3serv/comuni.c
similarity index 100%
rename from server/comuni.c
rename to sj3serv/comuni.c
diff --git a/server/error.c b/sj3serv/error.c
similarity index 100%
rename from server/error.c
rename to sj3serv/error.c
diff --git a/server/execute.c b/sj3serv/execute.c
similarity index 100%
rename from server/execute.c
rename to sj3serv/execute.c
diff --git a/server/main.c b/sj3serv/main.c
similarity index 100%
rename from server/main.c
rename to sj3serv/main.c
diff --git a/server/rc.sj3serv b/sj3serv/rc.sj3serv
similarity index 100%
rename from server/rc.sj3serv
rename to sj3serv/rc.sj3serv
diff --git a/server/rc.sj3serv.FreeBSD b/sj3serv/rc.sj3serv.FreeBSD
similarity index 100%
rename from server/rc.sj3serv.FreeBSD
rename to sj3serv/rc.sj3serv.FreeBSD
diff --git a/server/serverrc b/sj3serv/serverrc
similarity index 100%
rename from server/serverrc
rename to sj3serv/serverrc
diff --git a/server/setup.c b/sj3serv/setup.c
similarity index 100%
rename from server/setup.c
rename to sj3serv/setup.c
diff --git a/server/time_stamp.c b/sj3serv/time_stamp.c
similarity index 100%
rename from server/time_stamp.c
rename to sj3serv/time_stamp.c
diff --git a/server/version.c b/sj3serv/version.c
similarity index 100%
rename from server/version.c
rename to sj3serv/version.c