diff --git a/reactos/subsystems/win32/csrss/CMakeLists.txt b/reactos/subsystems/win32/csrss/CMakeLists.txt
index 7d993c48c20..649f95ab82c 100644
--- a/reactos/subsystems/win32/csrss/CMakeLists.txt
+++ b/reactos/subsystems/win32/csrss/CMakeLists.txt
@@ -13,4 +13,3 @@ add_dependencies(csrss psdk bugcodes)
 add_cd_file(TARGET csrss DESTINATION reactos/system32 FOR all)
 
 add_subdirectory(csrsrv)
-add_subdirectory(win32csr)
diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index d247170ba76..dff1d87bf86 100644
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -3,3 +3,4 @@ add_subdirectory(drivers)
 add_subdirectory(gdi/gdi32)
 add_subdirectory(reactx)
 add_subdirectory(user/user32)
+add_subdirectory(user/win32csr)
diff --git a/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt b/reactos/win32ss/user/win32csr/CMakeLists.txt
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt
rename to reactos/win32ss/user/win32csr/CMakeLists.txt
diff --git a/reactos/subsystems/win32/csrss/win32csr/alias.c b/reactos/win32ss/user/win32csr/alias.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/alias.c
rename to reactos/win32ss/user/win32csr/alias.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/coninput.c b/reactos/win32ss/user/win32csr/coninput.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/coninput.c
rename to reactos/win32ss/user/win32csr/coninput.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.h b/reactos/win32ss/user/win32csr/conio.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/conio.h
rename to reactos/win32ss/user/win32csr/conio.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/conoutput.c b/reactos/win32ss/user/win32csr/conoutput.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/conoutput.c
rename to reactos/win32ss/user/win32csr/conoutput.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/console.c b/reactos/win32ss/user/win32csr/console.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/console.c
rename to reactos/win32ss/user/win32csr/console.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/desktopbg.c b/reactos/win32ss/user/win32csr/desktopbg.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/desktopbg.c
rename to reactos/win32ss/user/win32csr/desktopbg.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/desktopbg.h b/reactos/win32ss/user/win32csr/desktopbg.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/desktopbg.h
rename to reactos/win32ss/user/win32csr/desktopbg.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/win32ss/user/win32csr/dllmain.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/dllmain.c
rename to reactos/win32ss/user/win32csr/dllmain.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/exitros.c b/reactos/win32ss/user/win32csr/exitros.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/exitros.c
rename to reactos/win32ss/user/win32csr/exitros.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/file.c b/reactos/win32ss/user/win32csr/file.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/file.c
rename to reactos/win32ss/user/win32csr/file.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/file.h b/reactos/win32ss/user/win32csr/file.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/file.h
rename to reactos/win32ss/user/win32csr/file.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/guiconsole.c b/reactos/win32ss/user/win32csr/guiconsole.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/guiconsole.c
rename to reactos/win32ss/user/win32csr/guiconsole.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/guiconsole.h b/reactos/win32ss/user/win32csr/guiconsole.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/guiconsole.h
rename to reactos/win32ss/user/win32csr/guiconsole.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/handle.c b/reactos/win32ss/user/win32csr/handle.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/handle.c
rename to reactos/win32ss/user/win32csr/handle.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/harderror.c b/reactos/win32ss/user/win32csr/harderror.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/harderror.c
rename to reactos/win32ss/user/win32csr/harderror.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc b/reactos/win32ss/user/win32csr/lang/bg-BG.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/bg-BG.rc
rename to reactos/win32ss/user/win32csr/lang/bg-BG.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/cs-CZ.rc b/reactos/win32ss/user/win32csr/lang/cs-CZ.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/cs-CZ.rc
rename to reactos/win32ss/user/win32csr/lang/cs-CZ.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc b/reactos/win32ss/user/win32csr/lang/de-DE.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/de-DE.rc
rename to reactos/win32ss/user/win32csr/lang/de-DE.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc b/reactos/win32ss/user/win32csr/lang/el-GR.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/el-GR.rc
rename to reactos/win32ss/user/win32csr/lang/el-GR.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc b/reactos/win32ss/user/win32csr/lang/en-US.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/en-US.rc
rename to reactos/win32ss/user/win32csr/lang/en-US.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc b/reactos/win32ss/user/win32csr/lang/es-ES.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/es-ES.rc
rename to reactos/win32ss/user/win32csr/lang/es-ES.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc b/reactos/win32ss/user/win32csr/lang/fr-FR.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc
rename to reactos/win32ss/user/win32csr/lang/fr-FR.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc b/reactos/win32ss/user/win32csr/lang/id-ID.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/id-ID.rc
rename to reactos/win32ss/user/win32csr/lang/id-ID.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc b/reactos/win32ss/user/win32csr/lang/it-IT.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/it-IT.rc
rename to reactos/win32ss/user/win32csr/lang/it-IT.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc b/reactos/win32ss/user/win32csr/lang/ja-JP.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/ja-JP.rc
rename to reactos/win32ss/user/win32csr/lang/ja-JP.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc b/reactos/win32ss/user/win32csr/lang/no-NO.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/no-NO.rc
rename to reactos/win32ss/user/win32csr/lang/no-NO.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc b/reactos/win32ss/user/win32csr/lang/pl-PL.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/pl-PL.rc
rename to reactos/win32ss/user/win32csr/lang/pl-PL.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc b/reactos/win32ss/user/win32csr/lang/ro-RO.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/ro-RO.rc
rename to reactos/win32ss/user/win32csr/lang/ro-RO.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc b/reactos/win32ss/user/win32csr/lang/ru-RU.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/ru-RU.rc
rename to reactos/win32ss/user/win32csr/lang/ru-RU.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc b/reactos/win32ss/user/win32csr/lang/sk-SK.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/sk-SK.rc
rename to reactos/win32ss/user/win32csr/lang/sk-SK.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc b/reactos/win32ss/user/win32csr/lang/sv-SE.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/sv-SE.rc
rename to reactos/win32ss/user/win32csr/lang/sv-SE.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc b/reactos/win32ss/user/win32csr/lang/uk-UA.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/uk-UA.rc
rename to reactos/win32ss/user/win32csr/lang/uk-UA.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc b/reactos/win32ss/user/win32csr/lang/zh-CN.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/zh-CN.rc
rename to reactos/win32ss/user/win32csr/lang/zh-CN.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc b/reactos/win32ss/user/win32csr/lang/zh-TW.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lang/zh-TW.rc
rename to reactos/win32ss/user/win32csr/lang/zh-TW.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/lineinput.c b/reactos/win32ss/user/win32csr/lineinput.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/lineinput.c
rename to reactos/win32ss/user/win32csr/lineinput.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/res/terminal.ico b/reactos/win32ss/user/win32csr/res/terminal.ico
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/res/terminal.ico
rename to reactos/win32ss/user/win32csr/res/terminal.ico
diff --git a/reactos/subsystems/win32/csrss/win32csr/resource.h b/reactos/win32ss/user/win32csr/resource.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/resource.h
rename to reactos/win32ss/user/win32csr/resource.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/rsrc.rc b/reactos/win32ss/user/win32csr/rsrc.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/rsrc.rc
rename to reactos/win32ss/user/win32csr/rsrc.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c b/reactos/win32ss/user/win32csr/tuiconsole.c
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/tuiconsole.c
rename to reactos/win32ss/user/win32csr/tuiconsole.c
diff --git a/reactos/subsystems/win32/csrss/win32csr/tuiconsole.h b/reactos/win32ss/user/win32csr/tuiconsole.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/tuiconsole.h
rename to reactos/win32ss/user/win32csr/tuiconsole.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/w32csr.h b/reactos/win32ss/user/win32csr/w32csr.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/w32csr.h
rename to reactos/win32ss/user/win32csr/w32csr.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.h b/reactos/win32ss/user/win32csr/win32csr.h
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/win32csr.h
rename to reactos/win32ss/user/win32csr/win32csr.h
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.rc b/reactos/win32ss/user/win32csr/win32csr.rc
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/win32csr.rc
rename to reactos/win32ss/user/win32csr/win32csr.rc
diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.spec b/reactos/win32ss/user/win32csr/win32csr.spec
similarity index 100%
rename from reactos/subsystems/win32/csrss/win32csr/win32csr.spec
rename to reactos/win32ss/user/win32csr/win32csr.spec