diff --git a/reactos/subsys/csrss/api/handle.c b/reactos/subsystems/win32/csrss/api/handle.c
similarity index 100%
rename from reactos/subsys/csrss/api/handle.c
rename to reactos/subsystems/win32/csrss/api/handle.c
diff --git a/reactos/subsys/csrss/api/process.c b/reactos/subsystems/win32/csrss/api/process.c
similarity index 100%
rename from reactos/subsys/csrss/api/process.c
rename to reactos/subsystems/win32/csrss/api/process.c
diff --git a/reactos/subsys/csrss/api/user.c b/reactos/subsystems/win32/csrss/api/user.c
similarity index 100%
rename from reactos/subsys/csrss/api/user.c
rename to reactos/subsystems/win32/csrss/api/user.c
diff --git a/reactos/subsys/csrss/api/wapi.c b/reactos/subsystems/win32/csrss/api/wapi.c
similarity index 100%
rename from reactos/subsys/csrss/api/wapi.c
rename to reactos/subsystems/win32/csrss/api/wapi.c
diff --git a/reactos/subsys/csrss/csrss.c b/reactos/subsystems/win32/csrss/csrss.c
similarity index 100%
rename from reactos/subsys/csrss/csrss.c
rename to reactos/subsystems/win32/csrss/csrss.c
diff --git a/reactos/subsys/csrss/csrss.h b/reactos/subsystems/win32/csrss/csrss.h
similarity index 100%
rename from reactos/subsys/csrss/csrss.h
rename to reactos/subsystems/win32/csrss/csrss.h
diff --git a/reactos/subsys/csrss/csrss.rc b/reactos/subsystems/win32/csrss/csrss.rc
similarity index 100%
rename from reactos/subsys/csrss/csrss.rc
rename to reactos/subsystems/win32/csrss/csrss.rc
diff --git a/reactos/subsys/csrss/csrss.xml b/reactos/subsystems/win32/csrss/csrss.xml
similarity index 100%
rename from reactos/subsys/csrss/csrss.xml
rename to reactos/subsystems/win32/csrss/csrss.xml
diff --git a/reactos/subsys/csrss/include/api.h b/reactos/subsystems/win32/csrss/include/api.h
similarity index 100%
rename from reactos/subsys/csrss/include/api.h
rename to reactos/subsystems/win32/csrss/include/api.h
diff --git a/reactos/subsys/csrss/include/conio.h b/reactos/subsystems/win32/csrss/include/conio.h
similarity index 100%
rename from reactos/subsys/csrss/include/conio.h
rename to reactos/subsystems/win32/csrss/include/conio.h
diff --git a/reactos/subsys/csrss/include/csrplugin.h b/reactos/subsystems/win32/csrss/include/csrplugin.h
similarity index 100%
rename from reactos/subsys/csrss/include/csrplugin.h
rename to reactos/subsystems/win32/csrss/include/csrplugin.h
diff --git a/reactos/subsys/csrss/include/desktopbg.h b/reactos/subsystems/win32/csrss/include/desktopbg.h
similarity index 100%
rename from reactos/subsys/csrss/include/desktopbg.h
rename to reactos/subsystems/win32/csrss/include/desktopbg.h
diff --git a/reactos/subsys/csrss/include/win32csr.h b/reactos/subsystems/win32/csrss/include/win32csr.h
similarity index 100%
rename from reactos/subsys/csrss/include/win32csr.h
rename to reactos/subsystems/win32/csrss/include/win32csr.h
diff --git a/reactos/subsys/csrss/init.c b/reactos/subsystems/win32/csrss/init.c
similarity index 100%
rename from reactos/subsys/csrss/init.c
rename to reactos/subsystems/win32/csrss/init.c
diff --git a/reactos/subsys/csrss/print.c b/reactos/subsystems/win32/csrss/print.c
similarity index 100%
rename from reactos/subsys/csrss/print.c
rename to reactos/subsystems/win32/csrss/print.c
diff --git a/reactos/subsys/csrss/video.c b/reactos/subsystems/win32/csrss/video.c
similarity index 100%
rename from reactos/subsys/csrss/video.c
rename to reactos/subsystems/win32/csrss/video.c
diff --git a/reactos/subsys/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/conio.c
rename to reactos/subsystems/win32/csrss/win32csr/conio.c
diff --git a/reactos/subsys/csrss/win32csr/desktopbg.c b/reactos/subsystems/win32/csrss/win32csr/desktopbg.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/desktopbg.c
rename to reactos/subsystems/win32/csrss/win32csr/desktopbg.c
diff --git a/reactos/subsys/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/dllmain.c
rename to reactos/subsystems/win32/csrss/win32csr/dllmain.c
diff --git a/reactos/subsys/csrss/win32csr/exitros.c b/reactos/subsystems/win32/csrss/win32csr/exitros.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/exitros.c
rename to reactos/subsystems/win32/csrss/win32csr/exitros.c
diff --git a/reactos/subsys/csrss/win32csr/guiconsole.c b/reactos/subsystems/win32/csrss/win32csr/guiconsole.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/guiconsole.c
rename to reactos/subsystems/win32/csrss/win32csr/guiconsole.c
diff --git a/reactos/subsys/csrss/win32csr/guiconsole.h b/reactos/subsystems/win32/csrss/win32csr/guiconsole.h
similarity index 100%
rename from reactos/subsys/csrss/win32csr/guiconsole.h
rename to reactos/subsystems/win32/csrss/win32csr/guiconsole.h
diff --git a/reactos/subsys/csrss/win32csr/res/terminal.ico b/reactos/subsystems/win32/csrss/win32csr/res/terminal.ico
similarity index 100%
rename from reactos/subsys/csrss/win32csr/res/terminal.ico
rename to reactos/subsystems/win32/csrss/win32csr/res/terminal.ico
diff --git a/reactos/subsys/csrss/win32csr/resource.h b/reactos/subsystems/win32/csrss/win32csr/resource.h
similarity index 100%
rename from reactos/subsys/csrss/win32csr/resource.h
rename to reactos/subsystems/win32/csrss/win32csr/resource.h
diff --git a/reactos/subsys/csrss/win32csr/tuiconsole.c b/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c
similarity index 100%
rename from reactos/subsys/csrss/win32csr/tuiconsole.c
rename to reactos/subsystems/win32/csrss/win32csr/tuiconsole.c
diff --git a/reactos/subsys/csrss/win32csr/tuiconsole.h b/reactos/subsystems/win32/csrss/win32csr/tuiconsole.h
similarity index 100%
rename from reactos/subsys/csrss/win32csr/tuiconsole.h
rename to reactos/subsystems/win32/csrss/win32csr/tuiconsole.h
diff --git a/reactos/subsys/csrss/win32csr/w32csr.h b/reactos/subsystems/win32/csrss/win32csr/w32csr.h
similarity index 100%
rename from reactos/subsys/csrss/win32csr/w32csr.h
rename to reactos/subsystems/win32/csrss/win32csr/w32csr.h
diff --git a/reactos/subsys/csrss/win32csr/win32csr.def b/reactos/subsystems/win32/csrss/win32csr/win32csr.def
similarity index 100%
rename from reactos/subsys/csrss/win32csr/win32csr.def
rename to reactos/subsystems/win32/csrss/win32csr/win32csr.def
diff --git a/reactos/subsys/csrss/win32csr/win32csr.rc b/reactos/subsystems/win32/csrss/win32csr/win32csr.rc
similarity index 100%
rename from reactos/subsys/csrss/win32csr/win32csr.rc
rename to reactos/subsystems/win32/csrss/win32csr/win32csr.rc
diff --git a/reactos/subsys/csrss/win32csr/win32csr.xml b/reactos/subsystems/win32/csrss/win32csr/win32csr.xml
similarity index 100%
rename from reactos/subsys/csrss/win32csr/win32csr.xml
rename to reactos/subsystems/win32/csrss/win32csr/win32csr.xml