diff --git a/subsystems/win32/CMakeLists.txt b/subsystems/win32/CMakeLists.txt
index 5c1ee84174d..59bf8c3511c 100644
--- a/subsystems/win32/CMakeLists.txt
+++ b/subsystems/win32/CMakeLists.txt
@@ -1,2 +1,3 @@
 
+add_subdirectory(csrsrv)
 add_subdirectory(csrss)
diff --git a/subsystems/win32/csrss/csrsrv/CMakeLists.txt b/subsystems/win32/csrsrv/CMakeLists.txt
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/CMakeLists.txt
rename to subsystems/win32/csrsrv/CMakeLists.txt
diff --git a/subsystems/win32/csrss/csrsrv/api/process.c b/subsystems/win32/csrsrv/api/process.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/api/process.c
rename to subsystems/win32/csrsrv/api/process.c
diff --git a/subsystems/win32/csrss/csrsrv/api/user.c b/subsystems/win32/csrsrv/api/user.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/api/user.c
rename to subsystems/win32/csrsrv/api/user.c
diff --git a/subsystems/win32/csrss/csrsrv/api/wapi.c b/subsystems/win32/csrsrv/api/wapi.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/api/wapi.c
rename to subsystems/win32/csrsrv/api/wapi.c
diff --git a/subsystems/win32/csrss/csrsrv/csrsrv.rc b/subsystems/win32/csrsrv/csrsrv.rc
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/csrsrv.rc
rename to subsystems/win32/csrsrv/csrsrv.rc
diff --git a/subsystems/win32/csrss/csrsrv/csrsrv.spec b/subsystems/win32/csrsrv/csrsrv.spec
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/csrsrv.spec
rename to subsystems/win32/csrsrv/csrsrv.spec
diff --git a/subsystems/win32/csrss/include/api.h b/subsystems/win32/csrsrv/include/api.h
similarity index 100%
rename from subsystems/win32/csrss/include/api.h
rename to subsystems/win32/csrsrv/include/api.h
diff --git a/subsystems/win32/csrss/include/csrplugin.h b/subsystems/win32/csrsrv/include/csrplugin.h
similarity index 100%
rename from subsystems/win32/csrss/include/csrplugin.h
rename to subsystems/win32/csrsrv/include/csrplugin.h
diff --git a/subsystems/win32/csrss/csrsrv/init.c b/subsystems/win32/csrsrv/init.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/init.c
rename to subsystems/win32/csrsrv/init.c
diff --git a/subsystems/win32/csrss/csrsrv/procsup.c b/subsystems/win32/csrsrv/procsup.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/procsup.c
rename to subsystems/win32/csrsrv/procsup.c
diff --git a/subsystems/win32/csrss/csrsrv/server.c b/subsystems/win32/csrsrv/server.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/server.c
rename to subsystems/win32/csrsrv/server.c
diff --git a/subsystems/win32/csrss/csrsrv/session.c b/subsystems/win32/csrsrv/session.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/session.c
rename to subsystems/win32/csrsrv/session.c
diff --git a/subsystems/win32/csrss/csrsrv/srv.h b/subsystems/win32/csrsrv/srv.h
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/srv.h
rename to subsystems/win32/csrsrv/srv.h
diff --git a/subsystems/win32/csrss/csrsrv/thredsup.c b/subsystems/win32/csrsrv/thredsup.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/thredsup.c
rename to subsystems/win32/csrsrv/thredsup.c
diff --git a/subsystems/win32/csrss/csrsrv/wait.c b/subsystems/win32/csrsrv/wait.c
similarity index 100%
rename from subsystems/win32/csrss/csrsrv/wait.c
rename to subsystems/win32/csrsrv/wait.c
diff --git a/subsystems/win32/csrss/CMakeLists.txt b/subsystems/win32/csrss/CMakeLists.txt
index ca8a5778429..6aa701dd919 100644
--- a/subsystems/win32/csrss/CMakeLists.txt
+++ b/subsystems/win32/csrss/CMakeLists.txt
@@ -10,5 +10,3 @@ target_link_libraries(csrss nt)
 add_importlibs(csrss ntdll csrsrv)
 add_dependencies(csrss psdk bugcodes)
 add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all)
-
-add_subdirectory(csrsrv)