Revert tree-restructure attempt: r66583, r66582, r66581, r66578, sauf ntdll changes...

svn path=/trunk/; revision=66588

diff --git a/reactos/base/services/CMakeLists.txt b/reactos/base/services/CMakeLists.txt
index c30d6aa..535e851 100644 (file)
--- a/reactos/base/services/CMakeLists.txt
+++ b/reactos/base/services/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(audiosrv)
 add_subdirectory(eventlog)
 add_subdirectory(rpcss)
 add_subdirectory(spoolsv)
+add_subdirectory(svchost)
 add_subdirectory(tcpsvcs)
 add_subdirectory(telnetd)
 #add_subdirectory(tftpd)

diff --git a/reactos/win32ss/base/scm/svchost/CMakeLists.txt b/reactos/base/services/svchost/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/CMakeLists.txt
rename to reactos/base/services/svchost/CMakeLists.txt

diff --git a/reactos/win32ss/base/scm/svchost/globals.c b/reactos/base/services/svchost/globals.c
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/globals.c
rename to reactos/base/services/svchost/globals.c

diff --git a/reactos/win32ss/base/scm/svchost/netbios.c b/reactos/base/services/svchost/netbios.c
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/netbios.c
rename to reactos/base/services/svchost/netbios.c

diff --git a/reactos/win32ss/base/scm/svchost/registry.c b/reactos/base/services/svchost/registry.c
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/registry.c
rename to reactos/base/services/svchost/registry.c

diff --git a/reactos/win32ss/base/scm/svchost/rpcsrv.c b/reactos/base/services/svchost/rpcsrv.c
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/rpcsrv.c
rename to reactos/base/services/svchost/rpcsrv.c

diff --git a/reactos/win32ss/base/scm/svchost/security.cxx b/reactos/base/services/svchost/security.cxx
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/security.cxx
rename to reactos/base/services/svchost/security.cxx

diff --git a/reactos/win32ss/base/scm/svchost/svchost.c b/reactos/base/services/svchost/svchost.c
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/svchost.c
rename to reactos/base/services/svchost/svchost.c

diff --git a/reactos/win32ss/base/scm/svchost/svchost.h b/reactos/base/services/svchost/svchost.h
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/svchost.h
rename to reactos/base/services/svchost/svchost.h

diff --git a/reactos/win32ss/base/scm/svchost/svchost.rc b/reactos/base/services/svchost/svchost.rc
similarity index 100%
rename from reactos/win32ss/base/scm/svchost/svchost.rc
rename to reactos/base/services/svchost/svchost.rc

diff --git a/reactos/base/shell/CMakeLists.txt b/reactos/base/shell/CMakeLists.txt
index a84afd1..81b2d4f 100644 (file)
--- a/reactos/base/shell/CMakeLists.txt
+++ b/reactos/base/shell/CMakeLists.txt
@@ -1,11 +1,5 @@
 
-add_subdirectory(browseui)
 add_subdirectory(cmd)
 add_subdirectory(explorer)
 add_subdirectory(filebrowser)
-add_subdirectory(ie)
 add_subdirectory(rshell)
-add_subdirectory(shell32)
-add_subdirectory(shfolder)
-add_subdirectory(shlwapi)
-add_subdirectory(shellext)

diff --git a/reactos/base/shell/ie/CMakeLists.txt b/reactos/base/shell/ie/CMakeLists.txt
deleted file mode 100644 (file)
index 81418b6..0000000
--- a/reactos/base/shell/ie/CMakeLists.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-
-add_subdirectory(ieframe)
-add_subdirectory(mshtml)
-add_subdirectory(mshtml.tlb)
-add_subdirectory(shdoclc)
-add_subdirectory(shdocvw)
-add_subdirectory(url)
-add_subdirectory(urlmon)

diff --git a/reactos/base/system/CMakeLists.txt b/reactos/base/system/CMakeLists.txt
index ba69714..e92a506 100644 (file)
--- a/reactos/base/system/CMakeLists.txt
+++ b/reactos/base/system/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(msiexec)
 add_subdirectory(regsvr32)
 add_subdirectory(rundll32)
 add_subdirectory(runonce)
+add_subdirectory(services)
 add_subdirectory(smss)
 add_subdirectory(subst)
 add_subdirectory(userinit)

diff --git a/reactos/win32ss/base/scm/services/CMakeLists.txt b/reactos/base/system/services/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/scm/services/CMakeLists.txt
rename to reactos/base/system/services/CMakeLists.txt

diff --git a/reactos/win32ss/base/scm/services/config.c b/reactos/base/system/services/config.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/config.c
rename to reactos/base/system/services/config.c

diff --git a/reactos/win32ss/base/scm/services/controlset.c b/reactos/base/system/services/controlset.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/controlset.c
rename to reactos/base/system/services/controlset.c

diff --git a/reactos/win32ss/base/scm/services/database.c b/reactos/base/system/services/database.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/database.c
rename to reactos/base/system/services/database.c

diff --git a/reactos/win32ss/base/scm/services/driver.c b/reactos/base/system/services/driver.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/driver.c
rename to reactos/base/system/services/driver.c

diff --git a/reactos/win32ss/base/scm/services/groupdb.c b/reactos/base/system/services/groupdb.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/groupdb.c
rename to reactos/base/system/services/groupdb.c

diff --git a/reactos/win32ss/base/scm/services/lang/de-DE.rc b/reactos/base/system/services/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/base/scm/services/lang/de-DE.rc
rename to reactos/base/system/services/lang/de-DE.rc

diff --git a/reactos/win32ss/base/scm/services/lang/en-US.rc b/reactos/base/system/services/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/base/scm/services/lang/en-US.rc
rename to reactos/base/system/services/lang/en-US.rc

diff --git a/reactos/win32ss/base/scm/services/lang/ro-RO.rc b/reactos/base/system/services/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/base/scm/services/lang/ro-RO.rc
rename to reactos/base/system/services/lang/ro-RO.rc

diff --git a/reactos/win32ss/base/scm/services/lock.c b/reactos/base/system/services/lock.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/lock.c
rename to reactos/base/system/services/lock.c

diff --git a/reactos/win32ss/base/scm/services/resource.h b/reactos/base/system/services/resource.h
similarity index 100%
rename from reactos/win32ss/base/scm/services/resource.h
rename to reactos/base/system/services/resource.h

diff --git a/reactos/win32ss/base/scm/services/rpcserver.c b/reactos/base/system/services/rpcserver.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/rpcserver.c
rename to reactos/base/system/services/rpcserver.c

diff --git a/reactos/win32ss/base/scm/services/services.c b/reactos/base/system/services/services.c
similarity index 100%
rename from reactos/win32ss/base/scm/services/services.c
rename to reactos/base/system/services/services.c

diff --git a/reactos/win32ss/base/scm/services/services.h b/reactos/base/system/services/services.h
similarity index 100%
rename from reactos/win32ss/base/scm/services/services.h
rename to reactos/base/system/services/services.h

diff --git a/reactos/win32ss/base/scm/services/services.rc b/reactos/base/system/services/services.rc
similarity index 100%
rename from reactos/win32ss/base/scm/services/services.rc
rename to reactos/base/system/services/services.rc

diff --git a/reactos/dll/CMakeLists.txt b/reactos/dll/CMakeLists.txt
index 17ba29b..1fc9498 100644 (file)
--- a/reactos/dll/CMakeLists.txt
+++ b/reactos/dll/CMakeLists.txt
@@ -5,4 +5,5 @@ add_subdirectory(directx)
 add_subdirectory(keyboard)
 add_subdirectory(ntdll)
 add_subdirectory(opengl)
+add_subdirectory(shellext)
 add_subdirectory(win32)

diff --git a/reactos/dll/cpl/console/CMakeLists.txt b/reactos/dll/cpl/console/CMakeLists.txt
index 809a6ba..c65229a 100644 (file)
--- a/reactos/dll/cpl/console/CMakeLists.txt
+++ b/reactos/dll/cpl/console/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
-    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv
-    ${REACTOS_SOURCE_DIR}/win32ss/core/user/winsrv/consrv/frontends/gui)
+    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv
+    ${REACTOS_SOURCE_DIR}/win32ss/user/winsrv/consrv/frontends/gui)
 
 spec2def(console.dll console.spec)
 

diff --git a/reactos/base/shell/shellext/CMakeLists.txt b/reactos/dll/shellext/CMakeLists.txt
similarity index 78%
rename from reactos/base/shell/shellext/CMakeLists.txt
rename to reactos/dll/shellext/CMakeLists.txt
index 563ef23..07c20ef 100644 (file)
--- a/reactos/base/shell/shellext/CMakeLists.txt
+++ b/reactos/dll/shellext/CMakeLists.txt
@@ -5,6 +5,5 @@ add_subdirectory(devcpux)
 add_subdirectory(fontext)
 add_subdirectory(netshell)
 add_subdirectory(ntobjshex)
-add_subdirectory(shimgvw)
 add_subdirectory(slayer)
 add_subdirectory(stobject)
\ No newline at end of file

diff --git a/reactos/base/shell/shellext/deskadp/CMakeLists.txt b/reactos/dll/shellext/deskadp/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/CMakeLists.txt
rename to reactos/dll/shellext/deskadp/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/deskadp/deskadp.c b/reactos/dll/shellext/deskadp/deskadp.c
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/deskadp.c
rename to reactos/dll/shellext/deskadp/deskadp.c

diff --git a/reactos/base/shell/shellext/deskadp/deskadp.h b/reactos/dll/shellext/deskadp/deskadp.h
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/deskadp.h
rename to reactos/dll/shellext/deskadp/deskadp.h

diff --git a/reactos/base/shell/shellext/deskadp/deskadp.rc b/reactos/dll/shellext/deskadp/deskadp.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/deskadp.rc
rename to reactos/dll/shellext/deskadp/deskadp.rc

diff --git a/reactos/base/shell/shellext/deskadp/deskadp.spec b/reactos/dll/shellext/deskadp/deskadp.spec
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/deskadp.spec
rename to reactos/dll/shellext/deskadp/deskadp.spec

diff --git a/reactos/base/shell/shellext/deskadp/lang/bg-BG.rc b/reactos/dll/shellext/deskadp/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/bg-BG.rc
rename to reactos/dll/shellext/deskadp/lang/bg-BG.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/cs-CZ.rc b/reactos/dll/shellext/deskadp/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/cs-CZ.rc
rename to reactos/dll/shellext/deskadp/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/de-DE.rc b/reactos/dll/shellext/deskadp/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/de-DE.rc
rename to reactos/dll/shellext/deskadp/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/el-GR.rc b/reactos/dll/shellext/deskadp/lang/el-GR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/el-GR.rc
rename to reactos/dll/shellext/deskadp/lang/el-GR.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/en-US.rc b/reactos/dll/shellext/deskadp/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/en-US.rc
rename to reactos/dll/shellext/deskadp/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/es-ES.rc b/reactos/dll/shellext/deskadp/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/es-ES.rc
rename to reactos/dll/shellext/deskadp/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/eu-ES.rc b/reactos/dll/shellext/deskadp/lang/eu-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/eu-ES.rc
rename to reactos/dll/shellext/deskadp/lang/eu-ES.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/fr-FR.rc b/reactos/dll/shellext/deskadp/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/fr-FR.rc
rename to reactos/dll/shellext/deskadp/lang/fr-FR.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/he-IL.rc b/reactos/dll/shellext/deskadp/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/he-IL.rc
rename to reactos/dll/shellext/deskadp/lang/he-IL.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/it-IT.rc b/reactos/dll/shellext/deskadp/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/it-IT.rc
rename to reactos/dll/shellext/deskadp/lang/it-IT.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/no-NO.rc b/reactos/dll/shellext/deskadp/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/no-NO.rc
rename to reactos/dll/shellext/deskadp/lang/no-NO.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/pl-PL.rc b/reactos/dll/shellext/deskadp/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/pl-PL.rc
rename to reactos/dll/shellext/deskadp/lang/pl-PL.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/ro-RO.rc b/reactos/dll/shellext/deskadp/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/ro-RO.rc
rename to reactos/dll/shellext/deskadp/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/ru-RU.rc b/reactos/dll/shellext/deskadp/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/ru-RU.rc
rename to reactos/dll/shellext/deskadp/lang/ru-RU.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/sk-SK.rc b/reactos/dll/shellext/deskadp/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/sk-SK.rc
rename to reactos/dll/shellext/deskadp/lang/sk-SK.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/sq-AL.rc b/reactos/dll/shellext/deskadp/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/sq-AL.rc
rename to reactos/dll/shellext/deskadp/lang/sq-AL.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/tr-TR.rc b/reactos/dll/shellext/deskadp/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/tr-TR.rc
rename to reactos/dll/shellext/deskadp/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/deskadp/lang/uk-UA.rc b/reactos/dll/shellext/deskadp/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/lang/uk-UA.rc
rename to reactos/dll/shellext/deskadp/lang/uk-UA.rc

diff --git a/reactos/base/shell/shellext/deskadp/precomp.h b/reactos/dll/shellext/deskadp/precomp.h
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/precomp.h
rename to reactos/dll/shellext/deskadp/precomp.h

diff --git a/reactos/base/shell/shellext/deskadp/resource.h b/reactos/dll/shellext/deskadp/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/resource.h
rename to reactos/dll/shellext/deskadp/resource.h

diff --git a/reactos/base/shell/shellext/deskadp/shxiface.c b/reactos/dll/shellext/deskadp/shxiface.c
similarity index 100%
rename from reactos/base/shell/shellext/deskadp/shxiface.c
rename to reactos/dll/shellext/deskadp/shxiface.c

diff --git a/reactos/base/shell/shellext/deskmon/CMakeLists.txt b/reactos/dll/shellext/deskmon/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/CMakeLists.txt
rename to reactos/dll/shellext/deskmon/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/deskmon/deskmon.c b/reactos/dll/shellext/deskmon/deskmon.c
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/deskmon.c
rename to reactos/dll/shellext/deskmon/deskmon.c

diff --git a/reactos/base/shell/shellext/deskmon/deskmon.h b/reactos/dll/shellext/deskmon/deskmon.h
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/deskmon.h
rename to reactos/dll/shellext/deskmon/deskmon.h

diff --git a/reactos/base/shell/shellext/deskmon/deskmon.rc b/reactos/dll/shellext/deskmon/deskmon.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/deskmon.rc
rename to reactos/dll/shellext/deskmon/deskmon.rc

diff --git a/reactos/base/shell/shellext/deskmon/deskmon.spec b/reactos/dll/shellext/deskmon/deskmon.spec
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/deskmon.spec
rename to reactos/dll/shellext/deskmon/deskmon.spec

diff --git a/reactos/base/shell/shellext/deskmon/lang/bg-BG.rc b/reactos/dll/shellext/deskmon/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/bg-BG.rc
rename to reactos/dll/shellext/deskmon/lang/bg-BG.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/cs-CZ.rc b/reactos/dll/shellext/deskmon/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/cs-CZ.rc
rename to reactos/dll/shellext/deskmon/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/de-DE.rc b/reactos/dll/shellext/deskmon/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/de-DE.rc
rename to reactos/dll/shellext/deskmon/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/el-GR.rc b/reactos/dll/shellext/deskmon/lang/el-GR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/el-GR.rc
rename to reactos/dll/shellext/deskmon/lang/el-GR.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/en-US.rc b/reactos/dll/shellext/deskmon/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/en-US.rc
rename to reactos/dll/shellext/deskmon/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/es-ES.rc b/reactos/dll/shellext/deskmon/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/es-ES.rc
rename to reactos/dll/shellext/deskmon/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/eu-ES.rc b/reactos/dll/shellext/deskmon/lang/eu-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/eu-ES.rc
rename to reactos/dll/shellext/deskmon/lang/eu-ES.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/fr-FR.rc b/reactos/dll/shellext/deskmon/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/fr-FR.rc
rename to reactos/dll/shellext/deskmon/lang/fr-FR.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/he-IL.rc b/reactos/dll/shellext/deskmon/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/he-IL.rc
rename to reactos/dll/shellext/deskmon/lang/he-IL.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/it-IT.rc b/reactos/dll/shellext/deskmon/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/it-IT.rc
rename to reactos/dll/shellext/deskmon/lang/it-IT.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/no-NO.rc b/reactos/dll/shellext/deskmon/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/no-NO.rc
rename to reactos/dll/shellext/deskmon/lang/no-NO.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/pl-PL.rc b/reactos/dll/shellext/deskmon/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/pl-PL.rc
rename to reactos/dll/shellext/deskmon/lang/pl-PL.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/ro-RO.rc b/reactos/dll/shellext/deskmon/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/ro-RO.rc
rename to reactos/dll/shellext/deskmon/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/ru-RU.rc b/reactos/dll/shellext/deskmon/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/ru-RU.rc
rename to reactos/dll/shellext/deskmon/lang/ru-RU.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/sk-SK.rc b/reactos/dll/shellext/deskmon/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/sk-SK.rc
rename to reactos/dll/shellext/deskmon/lang/sk-SK.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/sq-AL.rc b/reactos/dll/shellext/deskmon/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/sq-AL.rc
rename to reactos/dll/shellext/deskmon/lang/sq-AL.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/tr-TR.rc b/reactos/dll/shellext/deskmon/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/tr-TR.rc
rename to reactos/dll/shellext/deskmon/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/deskmon/lang/uk-UA.rc b/reactos/dll/shellext/deskmon/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/lang/uk-UA.rc
rename to reactos/dll/shellext/deskmon/lang/uk-UA.rc

diff --git a/reactos/base/shell/shellext/deskmon/precomp.h b/reactos/dll/shellext/deskmon/precomp.h
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/precomp.h
rename to reactos/dll/shellext/deskmon/precomp.h

diff --git a/reactos/base/shell/shellext/deskmon/resource.h b/reactos/dll/shellext/deskmon/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/resource.h
rename to reactos/dll/shellext/deskmon/resource.h

diff --git a/reactos/base/shell/shellext/deskmon/shxiface.c b/reactos/dll/shellext/deskmon/shxiface.c
similarity index 100%
rename from reactos/base/shell/shellext/deskmon/shxiface.c
rename to reactos/dll/shellext/deskmon/shxiface.c

diff --git a/reactos/base/shell/shellext/devcpux/CMakeLists.txt b/reactos/dll/shellext/devcpux/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/devcpux/CMakeLists.txt
rename to reactos/dll/shellext/devcpux/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/devcpux/devcpux.spec b/reactos/dll/shellext/devcpux/devcpux.spec
similarity index 100%
rename from reactos/base/shell/shellext/devcpux/devcpux.spec
rename to reactos/dll/shellext/devcpux/devcpux.spec

diff --git a/reactos/base/shell/shellext/devcpux/processor.c b/reactos/dll/shellext/devcpux/processor.c
similarity index 100%
rename from reactos/base/shell/shellext/devcpux/processor.c
rename to reactos/dll/shellext/devcpux/processor.c

diff --git a/reactos/base/shell/shellext/devcpux/processor.rc b/reactos/dll/shellext/devcpux/processor.rc
similarity index 100%
rename from reactos/base/shell/shellext/devcpux/processor.rc
rename to reactos/dll/shellext/devcpux/processor.rc

diff --git a/reactos/base/shell/shellext/devcpux/resource.h b/reactos/dll/shellext/devcpux/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/devcpux/resource.h
rename to reactos/dll/shellext/devcpux/resource.h

diff --git a/reactos/base/shell/shellext/fontext/CMakeLists.txt b/reactos/dll/shellext/fontext/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/fontext/CMakeLists.txt
rename to reactos/dll/shellext/fontext/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/fontext/fontext.c b/reactos/dll/shellext/fontext/fontext.c
similarity index 100%
rename from reactos/base/shell/shellext/fontext/fontext.c
rename to reactos/dll/shellext/fontext/fontext.c

diff --git a/reactos/base/shell/shellext/fontext/fontext.h b/reactos/dll/shellext/fontext/fontext.h
similarity index 100%
rename from reactos/base/shell/shellext/fontext/fontext.h
rename to reactos/dll/shellext/fontext/fontext.h

diff --git a/reactos/base/shell/shellext/fontext/fontext.rc b/reactos/dll/shellext/fontext/fontext.rc
similarity index 100%
rename from reactos/base/shell/shellext/fontext/fontext.rc
rename to reactos/dll/shellext/fontext/fontext.rc

diff --git a/reactos/base/shell/shellext/fontext/fontext.spec b/reactos/dll/shellext/fontext/fontext.spec
similarity index 100%
rename from reactos/base/shell/shellext/fontext/fontext.spec
rename to reactos/dll/shellext/fontext/fontext.spec

diff --git a/reactos/base/shell/shellext/fontext/lang/en-US.rc b/reactos/dll/shellext/fontext/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/fontext/lang/en-US.rc
rename to reactos/dll/shellext/fontext/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/fontext/regsvr.c b/reactos/dll/shellext/fontext/regsvr.c
similarity index 100%
rename from reactos/base/shell/shellext/fontext/regsvr.c
rename to reactos/dll/shellext/fontext/regsvr.c

diff --git a/reactos/base/shell/shellext/fontext/resource.h b/reactos/dll/shellext/fontext/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/fontext/resource.h
rename to reactos/dll/shellext/fontext/resource.h

diff --git a/reactos/base/shell/shellext/netshell/CMakeLists.txt b/reactos/dll/shellext/netshell/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/netshell/CMakeLists.txt
rename to reactos/dll/shellext/netshell/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/netshell/README b/reactos/dll/shellext/netshell/README
similarity index 100%
rename from reactos/base/shell/shellext/netshell/README
rename to reactos/dll/shellext/netshell/README

diff --git a/reactos/base/shell/shellext/netshell/classfactory.cpp b/reactos/dll/shellext/netshell/classfactory.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/classfactory.cpp
rename to reactos/dll/shellext/netshell/classfactory.cpp

diff --git a/reactos/base/shell/shellext/netshell/connectmanager.cpp b/reactos/dll/shellext/netshell/connectmanager.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/connectmanager.cpp
rename to reactos/dll/shellext/netshell/connectmanager.cpp

diff --git a/reactos/base/shell/shellext/netshell/enumlist.cpp b/reactos/dll/shellext/netshell/enumlist.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/enumlist.cpp
rename to reactos/dll/shellext/netshell/enumlist.cpp

diff --git a/reactos/base/shell/shellext/netshell/enumlist.h b/reactos/dll/shellext/netshell/enumlist.h
similarity index 100%
rename from reactos/base/shell/shellext/netshell/enumlist.h
rename to reactos/dll/shellext/netshell/enumlist.h

diff --git a/reactos/base/shell/shellext/netshell/lanconnectui.cpp b/reactos/dll/shellext/netshell/lanconnectui.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lanconnectui.cpp
rename to reactos/dll/shellext/netshell/lanconnectui.cpp

diff --git a/reactos/base/shell/shellext/netshell/lang/bg-BG.rc b/reactos/dll/shellext/netshell/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/bg-BG.rc
rename to reactos/dll/shellext/netshell/lang/bg-BG.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/cs-CZ.rc b/reactos/dll/shellext/netshell/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/cs-CZ.rc
rename to reactos/dll/shellext/netshell/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/da-DK.rc b/reactos/dll/shellext/netshell/lang/da-DK.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/da-DK.rc
rename to reactos/dll/shellext/netshell/lang/da-DK.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/de-DE.rc b/reactos/dll/shellext/netshell/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/de-DE.rc
rename to reactos/dll/shellext/netshell/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/el-GR.rc b/reactos/dll/shellext/netshell/lang/el-GR.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/el-GR.rc
rename to reactos/dll/shellext/netshell/lang/el-GR.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/en-US.rc b/reactos/dll/shellext/netshell/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/en-US.rc
rename to reactos/dll/shellext/netshell/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/es-ES.rc b/reactos/dll/shellext/netshell/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/es-ES.rc
rename to reactos/dll/shellext/netshell/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/fr-FR.rc b/reactos/dll/shellext/netshell/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/fr-FR.rc
rename to reactos/dll/shellext/netshell/lang/fr-FR.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/he-IL.rc b/reactos/dll/shellext/netshell/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/he-IL.rc
rename to reactos/dll/shellext/netshell/lang/he-IL.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/hu-HU.rc b/reactos/dll/shellext/netshell/lang/hu-HU.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/hu-HU.rc
rename to reactos/dll/shellext/netshell/lang/hu-HU.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/id-ID.rc b/reactos/dll/shellext/netshell/lang/id-ID.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/id-ID.rc
rename to reactos/dll/shellext/netshell/lang/id-ID.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/it-IT.rc b/reactos/dll/shellext/netshell/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/it-IT.rc
rename to reactos/dll/shellext/netshell/lang/it-IT.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/ja-JP.rc b/reactos/dll/shellext/netshell/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/ja-JP.rc
rename to reactos/dll/shellext/netshell/lang/ja-JP.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/nl-NL.rc b/reactos/dll/shellext/netshell/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/nl-NL.rc
rename to reactos/dll/shellext/netshell/lang/nl-NL.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/no-NO.rc b/reactos/dll/shellext/netshell/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/no-NO.rc
rename to reactos/dll/shellext/netshell/lang/no-NO.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/pl-PL.rc b/reactos/dll/shellext/netshell/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/pl-PL.rc
rename to reactos/dll/shellext/netshell/lang/pl-PL.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/ro-RO.rc b/reactos/dll/shellext/netshell/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/ro-RO.rc
rename to reactos/dll/shellext/netshell/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/ru-RU.rc b/reactos/dll/shellext/netshell/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/ru-RU.rc
rename to reactos/dll/shellext/netshell/lang/ru-RU.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/sk-SK.rc b/reactos/dll/shellext/netshell/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/sk-SK.rc
rename to reactos/dll/shellext/netshell/lang/sk-SK.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/sq-AL.rc b/reactos/dll/shellext/netshell/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/sq-AL.rc
rename to reactos/dll/shellext/netshell/lang/sq-AL.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/sv-SE.rc b/reactos/dll/shellext/netshell/lang/sv-SE.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/sv-SE.rc
rename to reactos/dll/shellext/netshell/lang/sv-SE.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/tr-TR.rc b/reactos/dll/shellext/netshell/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/tr-TR.rc
rename to reactos/dll/shellext/netshell/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/uk-UA.rc b/reactos/dll/shellext/netshell/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/uk-UA.rc
rename to reactos/dll/shellext/netshell/lang/uk-UA.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/zh-CN.rc b/reactos/dll/shellext/netshell/lang/zh-CN.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/zh-CN.rc
rename to reactos/dll/shellext/netshell/lang/zh-CN.rc

diff --git a/reactos/base/shell/shellext/netshell/lang/zh-TW.rc b/reactos/dll/shellext/netshell/lang/zh-TW.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lang/zh-TW.rc
rename to reactos/dll/shellext/netshell/lang/zh-TW.rc

diff --git a/reactos/base/shell/shellext/netshell/lanstatusui.cpp b/reactos/dll/shellext/netshell/lanstatusui.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/lanstatusui.cpp
rename to reactos/dll/shellext/netshell/lanstatusui.cpp

diff --git a/reactos/base/shell/shellext/netshell/netshell.cpp b/reactos/dll/shellext/netshell/netshell.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/netshell.cpp
rename to reactos/dll/shellext/netshell/netshell.cpp

diff --git a/reactos/base/shell/shellext/netshell/netshell.rc b/reactos/dll/shellext/netshell/netshell.rc
similarity index 100%
rename from reactos/base/shell/shellext/netshell/netshell.rc
rename to reactos/dll/shellext/netshell/netshell.rc

diff --git a/reactos/base/shell/shellext/netshell/netshell.spec b/reactos/dll/shellext/netshell/netshell.spec
similarity index 100%
rename from reactos/base/shell/shellext/netshell/netshell.spec
rename to reactos/dll/shellext/netshell/netshell.spec

diff --git a/reactos/base/shell/shellext/netshell/precomp.h b/reactos/dll/shellext/netshell/precomp.h
similarity index 100%
rename from reactos/base/shell/shellext/netshell/precomp.h
rename to reactos/dll/shellext/netshell/precomp.h

diff --git a/reactos/base/shell/shellext/netshell/res/neterror.ico b/reactos/dll/shellext/netshell/res/neterror.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/neterror.ico
rename to reactos/dll/shellext/netshell/res/neterror.ico

diff --git a/reactos/base/shell/shellext/netshell/res/netidle.ico b/reactos/dll/shellext/netshell/res/netidle.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/netidle.ico
rename to reactos/dll/shellext/netshell/res/netidle.ico

diff --git a/reactos/base/shell/shellext/netshell/res/netoff.ico b/reactos/dll/shellext/netshell/res/netoff.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/netoff.ico
rename to reactos/dll/shellext/netshell/res/netoff.ico

diff --git a/reactos/base/shell/shellext/netshell/res/netrec.ico b/reactos/dll/shellext/netshell/res/netrec.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/netrec.ico
rename to reactos/dll/shellext/netshell/res/netrec.ico

diff --git a/reactos/base/shell/shellext/netshell/res/netshell.ico b/reactos/dll/shellext/netshell/res/netshell.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/netshell.ico
rename to reactos/dll/shellext/netshell/res/netshell.ico

diff --git a/reactos/base/shell/shellext/netshell/res/netshell.rgs b/reactos/dll/shellext/netshell/res/netshell.rgs
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/netshell.rgs
rename to reactos/dll/shellext/netshell/res/netshell.rgs

diff --git a/reactos/base/shell/shellext/netshell/res/nettrans.ico b/reactos/dll/shellext/netshell/res/nettrans.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/nettrans.ico
rename to reactos/dll/shellext/netshell/res/nettrans.ico

diff --git a/reactos/base/shell/shellext/netshell/res/nettrrec.ico b/reactos/dll/shellext/netshell/res/nettrrec.ico
similarity index 100%
rename from reactos/base/shell/shellext/netshell/res/nettrrec.ico
rename to reactos/dll/shellext/netshell/res/nettrrec.ico

diff --git a/reactos/base/shell/shellext/netshell/resource.h b/reactos/dll/shellext/netshell/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/netshell/resource.h
rename to reactos/dll/shellext/netshell/resource.h

diff --git a/reactos/base/shell/shellext/netshell/shfldr_netconnect.cpp b/reactos/dll/shellext/netshell/shfldr_netconnect.cpp
similarity index 100%
rename from reactos/base/shell/shellext/netshell/shfldr_netconnect.cpp
rename to reactos/dll/shellext/netshell/shfldr_netconnect.cpp

diff --git a/reactos/base/shell/shellext/ntobjshex/CMakeLists.txt b/reactos/dll/shellext/ntobjshex/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/CMakeLists.txt
rename to reactos/dll/shellext/ntobjshex/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/ntobjshex/lang/en-US.rc b/reactos/dll/shellext/ntobjshex/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/lang/en-US.rc
rename to reactos/dll/shellext/ntobjshex/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/ntobjshex/lang/ro-RO.rc b/reactos/dll/shellext/ntobjshex/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/lang/ro-RO.rc
rename to reactos/dll/shellext/ntobjshex/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjns.cpp b/reactos/dll/shellext/ntobjshex/ntobjns.cpp
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjns.cpp
rename to reactos/dll/shellext/ntobjshex/ntobjns.cpp

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjns.h b/reactos/dll/shellext/ntobjshex/ntobjns.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjns.h
rename to reactos/dll/shellext/ntobjshex/ntobjns.h

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjshex.cpp b/reactos/dll/shellext/ntobjshex/ntobjshex.cpp
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjshex.cpp
rename to reactos/dll/shellext/ntobjshex/ntobjshex.cpp

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjshex.rc b/reactos/dll/shellext/ntobjshex/ntobjshex.rc
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjshex.rc
rename to reactos/dll/shellext/ntobjshex/ntobjshex.rc

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjshex.spec b/reactos/dll/shellext/ntobjshex/ntobjshex.spec
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjshex.spec
rename to reactos/dll/shellext/ntobjshex/ntobjshex.spec

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjutil.cpp b/reactos/dll/shellext/ntobjshex/ntobjutil.cpp
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjutil.cpp
rename to reactos/dll/shellext/ntobjshex/ntobjutil.cpp

diff --git a/reactos/base/shell/shellext/ntobjshex/ntobjutil.h b/reactos/dll/shellext/ntobjshex/ntobjutil.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/ntobjutil.h
rename to reactos/dll/shellext/ntobjshex/ntobjutil.h

diff --git a/reactos/base/shell/shellext/ntobjshex/precomp.h b/reactos/dll/shellext/ntobjshex/precomp.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/precomp.h
rename to reactos/dll/shellext/ntobjshex/precomp.h

diff --git a/reactos/base/shell/shellext/ntobjshex/regfolder.cpp b/reactos/dll/shellext/ntobjshex/regfolder.cpp
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/regfolder.cpp
rename to reactos/dll/shellext/ntobjshex/regfolder.cpp

diff --git a/reactos/base/shell/shellext/ntobjshex/regfolder.h b/reactos/dll/shellext/ntobjshex/regfolder.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/regfolder.h
rename to reactos/dll/shellext/ntobjshex/regfolder.h

diff --git a/reactos/base/shell/shellext/ntobjshex/resource.h b/reactos/dll/shellext/ntobjshex/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resource.h
rename to reactos/dll/shellext/ntobjshex/resource.h

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/1.ico b/reactos/dll/shellext/ntobjshex/resources/1.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/1.ico
rename to reactos/dll/shellext/ntobjshex/resources/1.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/2.ico b/reactos/dll/shellext/ntobjshex/resources/2.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/2.ico
rename to reactos/dll/shellext/ntobjshex/resources/2.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/3.ico b/reactos/dll/shellext/ntobjshex/resources/3.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/3.ico
rename to reactos/dll/shellext/ntobjshex/resources/3.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/4.ico b/reactos/dll/shellext/ntobjshex/resources/4.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/4.ico
rename to reactos/dll/shellext/ntobjshex/resources/4.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/5.ico b/reactos/dll/shellext/ntobjshex/resources/5.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/5.ico
rename to reactos/dll/shellext/ntobjshex/resources/5.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/6.ico b/reactos/dll/shellext/ntobjshex/resources/6.ico
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/6.ico
rename to reactos/dll/shellext/ntobjshex/resources/6.ico

diff --git a/reactos/base/shell/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs b/reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs
rename to reactos/dll/shellext/ntobjshex/resources/rgs/ntobjectfolder.rgs

diff --git a/reactos/base/shell/shellext/ntobjshex/util.h b/reactos/dll/shellext/ntobjshex/util.h
similarity index 100%
rename from reactos/base/shell/shellext/ntobjshex/util.h
rename to reactos/dll/shellext/ntobjshex/util.h

diff --git a/reactos/base/shell/shellext/slayer/CMakeLists.txt b/reactos/dll/shellext/slayer/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/slayer/CMakeLists.txt
rename to reactos/dll/shellext/slayer/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/slayer/lang/bg-BG.rc b/reactos/dll/shellext/slayer/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/bg-BG.rc
rename to reactos/dll/shellext/slayer/lang/bg-BG.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/cs-CZ.rc b/reactos/dll/shellext/slayer/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/cs-CZ.rc
rename to reactos/dll/shellext/slayer/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/de-DE.rc b/reactos/dll/shellext/slayer/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/de-DE.rc
rename to reactos/dll/shellext/slayer/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/en-US.rc b/reactos/dll/shellext/slayer/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/en-US.rc
rename to reactos/dll/shellext/slayer/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/es-ES.rc b/reactos/dll/shellext/slayer/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/es-ES.rc
rename to reactos/dll/shellext/slayer/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/eu-ES.rc b/reactos/dll/shellext/slayer/lang/eu-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/eu-ES.rc
rename to reactos/dll/shellext/slayer/lang/eu-ES.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/fr-FR.rc b/reactos/dll/shellext/slayer/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/fr-FR.rc
rename to reactos/dll/shellext/slayer/lang/fr-FR.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/he-IL.rc b/reactos/dll/shellext/slayer/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/he-IL.rc
rename to reactos/dll/shellext/slayer/lang/he-IL.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/hu-HU.rc b/reactos/dll/shellext/slayer/lang/hu-HU.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/hu-HU.rc
rename to reactos/dll/shellext/slayer/lang/hu-HU.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/id-ID.rc b/reactos/dll/shellext/slayer/lang/id-ID.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/id-ID.rc
rename to reactos/dll/shellext/slayer/lang/id-ID.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/it-IT.rc b/reactos/dll/shellext/slayer/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/it-IT.rc
rename to reactos/dll/shellext/slayer/lang/it-IT.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/nl-NL.rc b/reactos/dll/shellext/slayer/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/nl-NL.rc
rename to reactos/dll/shellext/slayer/lang/nl-NL.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/no-NO.rc b/reactos/dll/shellext/slayer/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/no-NO.rc
rename to reactos/dll/shellext/slayer/lang/no-NO.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/pl-PL.rc b/reactos/dll/shellext/slayer/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/pl-PL.rc
rename to reactos/dll/shellext/slayer/lang/pl-PL.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/ro-RO.rc b/reactos/dll/shellext/slayer/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/ro-RO.rc
rename to reactos/dll/shellext/slayer/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/ru-RU.rc b/reactos/dll/shellext/slayer/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/ru-RU.rc
rename to reactos/dll/shellext/slayer/lang/ru-RU.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/sk-SK.rc b/reactos/dll/shellext/slayer/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/sk-SK.rc
rename to reactos/dll/shellext/slayer/lang/sk-SK.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/sq-AL.rc b/reactos/dll/shellext/slayer/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/sq-AL.rc
rename to reactos/dll/shellext/slayer/lang/sq-AL.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/sv-SE.rc b/reactos/dll/shellext/slayer/lang/sv-SE.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/sv-SE.rc
rename to reactos/dll/shellext/slayer/lang/sv-SE.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/tr-TR.rc b/reactos/dll/shellext/slayer/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/tr-TR.rc
rename to reactos/dll/shellext/slayer/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/slayer/lang/uk-UA.rc b/reactos/dll/shellext/slayer/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/lang/uk-UA.rc
rename to reactos/dll/shellext/slayer/lang/uk-UA.rc

diff --git a/reactos/base/shell/shellext/slayer/resource.h b/reactos/dll/shellext/slayer/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/slayer/resource.h
rename to reactos/dll/shellext/slayer/resource.h

diff --git a/reactos/base/shell/shellext/slayer/slayer.c b/reactos/dll/shellext/slayer/slayer.c
similarity index 100%
rename from reactos/base/shell/shellext/slayer/slayer.c
rename to reactos/dll/shellext/slayer/slayer.c

diff --git a/reactos/base/shell/shellext/slayer/slayer.h b/reactos/dll/shellext/slayer/slayer.h
similarity index 100%
rename from reactos/base/shell/shellext/slayer/slayer.h
rename to reactos/dll/shellext/slayer/slayer.h

diff --git a/reactos/base/shell/shellext/slayer/slayer.rc b/reactos/dll/shellext/slayer/slayer.rc
similarity index 100%
rename from reactos/base/shell/shellext/slayer/slayer.rc
rename to reactos/dll/shellext/slayer/slayer.rc

diff --git a/reactos/base/shell/shellext/slayer/slayer.spec b/reactos/dll/shellext/slayer/slayer.spec
similarity index 100%
rename from reactos/base/shell/shellext/slayer/slayer.spec
rename to reactos/dll/shellext/slayer/slayer.spec

diff --git a/reactos/base/shell/shellext/stobject/CMakeLists.txt b/reactos/dll/shellext/stobject/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/stobject/CMakeLists.txt
rename to reactos/dll/shellext/stobject/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/stobject/csystray.cpp b/reactos/dll/shellext/stobject/csystray.cpp
similarity index 100%
rename from reactos/base/shell/shellext/stobject/csystray.cpp
rename to reactos/dll/shellext/stobject/csystray.cpp

diff --git a/reactos/base/shell/shellext/stobject/csystray.h b/reactos/dll/shellext/stobject/csystray.h
similarity index 100%
rename from reactos/base/shell/shellext/stobject/csystray.h
rename to reactos/dll/shellext/stobject/csystray.h

diff --git a/reactos/base/shell/shellext/stobject/lang/de-DE.rc b/reactos/dll/shellext/stobject/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/lang/de-DE.rc
rename to reactos/dll/shellext/stobject/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/stobject/lang/en-US.rc b/reactos/dll/shellext/stobject/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/lang/en-US.rc
rename to reactos/dll/shellext/stobject/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/stobject/lang/es-ES.rc b/reactos/dll/shellext/stobject/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/lang/es-ES.rc
rename to reactos/dll/shellext/stobject/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/stobject/lang/ro-RO.rc b/reactos/dll/shellext/stobject/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/lang/ro-RO.rc
rename to reactos/dll/shellext/stobject/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/stobject/lang/tr-TR.rc b/reactos/dll/shellext/stobject/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/lang/tr-TR.rc
rename to reactos/dll/shellext/stobject/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/stobject/precomp.h b/reactos/dll/shellext/stobject/precomp.h
similarity index 100%
rename from reactos/base/shell/shellext/stobject/precomp.h
rename to reactos/dll/shellext/stobject/precomp.h

diff --git a/reactos/base/shell/shellext/stobject/resource.h b/reactos/dll/shellext/stobject/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resource.h
rename to reactos/dll/shellext/stobject/resource.h

diff --git a/reactos/base/shell/shellext/stobject/resources/1.ico b/reactos/dll/shellext/stobject/resources/1.ico
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resources/1.ico
rename to reactos/dll/shellext/stobject/resources/1.ico

diff --git a/reactos/base/shell/shellext/stobject/resources/2.ico b/reactos/dll/shellext/stobject/resources/2.ico
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resources/2.ico
rename to reactos/dll/shellext/stobject/resources/2.ico

diff --git a/reactos/base/shell/shellext/stobject/resources/3.ico b/reactos/dll/shellext/stobject/resources/3.ico
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resources/3.ico
rename to reactos/dll/shellext/stobject/resources/3.ico

diff --git a/reactos/base/shell/shellext/stobject/resources/4.ico b/reactos/dll/shellext/stobject/resources/4.ico
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resources/4.ico
rename to reactos/dll/shellext/stobject/resources/4.ico

diff --git a/reactos/base/shell/shellext/stobject/resources/rgs/systray.rgs b/reactos/dll/shellext/stobject/resources/rgs/systray.rgs
similarity index 100%
rename from reactos/base/shell/shellext/stobject/resources/rgs/systray.rgs
rename to reactos/dll/shellext/stobject/resources/rgs/systray.rgs

diff --git a/reactos/base/shell/shellext/stobject/stobject.cpp b/reactos/dll/shellext/stobject/stobject.cpp
similarity index 100%
rename from reactos/base/shell/shellext/stobject/stobject.cpp
rename to reactos/dll/shellext/stobject/stobject.cpp

diff --git a/reactos/base/shell/shellext/stobject/stobject.rc b/reactos/dll/shellext/stobject/stobject.rc
similarity index 100%
rename from reactos/base/shell/shellext/stobject/stobject.rc
rename to reactos/dll/shellext/stobject/stobject.rc

diff --git a/reactos/base/shell/shellext/stobject/stobject.spec b/reactos/dll/shellext/stobject/stobject.spec
similarity index 100%
rename from reactos/base/shell/shellext/stobject/stobject.spec
rename to reactos/dll/shellext/stobject/stobject.spec

diff --git a/reactos/base/shell/shellext/stobject/volume.cpp b/reactos/dll/shellext/stobject/volume.cpp
similarity index 100%
rename from reactos/base/shell/shellext/stobject/volume.cpp
rename to reactos/dll/shellext/stobject/volume.cpp

diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index acce4e4..e2b135b 100644 (file)
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(acledit)
 add_subdirectory(aclui)
 add_subdirectory(activeds)
 add_subdirectory(actxprxy)
+add_subdirectory(advapi32)
 add_subdirectory(advpack)
 add_subdirectory(atl)
 add_subdirectory(atl100)
@@ -13,6 +14,7 @@ add_subdirectory(avifil32)
 add_subdirectory(batt)
 add_subdirectory(bcrypt)
 add_subdirectory(beepmidi)
+add_subdirectory(browseui)
 add_subdirectory(cabinet)
 add_subdirectory(cards)
 add_subdirectory(cfgmgr32)
@@ -50,6 +52,7 @@ add_subdirectory(hnetcfg)
 add_subdirectory(httpapi)
 add_subdirectory(iccvid)
 add_subdirectory(icmp)
+add_subdirectory(ieframe)
 add_subdirectory(iernonce)
 add_subdirectory(imaadp32.acm)
 add_subdirectory(imagehlp)
@@ -65,6 +68,8 @@ add_subdirectory(itircl)
 add_subdirectory(itss)
 add_subdirectory(jscript)
 add_subdirectory(jsproxy)
+add_subdirectory(kernel32)
+add_subdirectory(kernel32_vista)
 add_subdirectory(loadperf)
 add_subdirectory(localspl)
 add_subdirectory(localui)
@@ -95,7 +100,9 @@ add_subdirectory(msftedit)
 add_subdirectory(msg711.acm)
 add_subdirectory(msgina)
 add_subdirectory(msgsm32.acm)
+add_subdirectory(mshtml)
 add_subdirectory(msi)
+add_subdirectory(mshtml.tlb)
 add_subdirectory(msimg32)
 add_subdirectory(msimtf)
 add_subdirectory(msisip)
@@ -173,6 +180,12 @@ add_subdirectory(serialui)
 add_subdirectory(setupapi)
 add_subdirectory(sfc)
 add_subdirectory(sfc_os)
+add_subdirectory(shdoclc)
+add_subdirectory(shdocvw)
+add_subdirectory(shell32)
+add_subdirectory(shfolder)
+add_subdirectory(shimgvw)
+add_subdirectory(shlwapi)
 add_subdirectory(slbcsp)
 add_subdirectory(smdll)
 add_subdirectory(sndblst)
@@ -197,6 +210,8 @@ add_subdirectory(ufatx)
 add_subdirectory(unicows)
 add_subdirectory(untfs)
 add_subdirectory(updspapi)
+add_subdirectory(url)
+add_subdirectory(urlmon)
 add_subdirectory(userenv)
 add_subdirectory(usp10)
 add_subdirectory(uxtheme)

diff --git a/reactos/win32ss/base/advapi32/CMakeLists.txt b/reactos/dll/win32/advapi32/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/advapi32/CMakeLists.txt
rename to reactos/dll/win32/advapi32/CMakeLists.txt

diff --git a/reactos/win32ss/base/advapi32/advapi32.h b/reactos/dll/win32/advapi32/advapi32.h
similarity index 100%
rename from reactos/win32ss/base/advapi32/advapi32.h
rename to reactos/dll/win32/advapi32/advapi32.h

diff --git a/reactos/win32ss/base/advapi32/advapi32.rc b/reactos/dll/win32/advapi32/advapi32.rc
similarity index 100%
rename from reactos/win32ss/base/advapi32/advapi32.rc
rename to reactos/dll/win32/advapi32/advapi32.rc

diff --git a/reactos/win32ss/base/advapi32/advapi32.spec b/reactos/dll/win32/advapi32/advapi32.spec
similarity index 100%
rename from reactos/win32ss/base/advapi32/advapi32.spec
rename to reactos/dll/win32/advapi32/advapi32.spec

diff --git a/reactos/win32ss/base/advapi32/misc/dllmain.c b/reactos/dll/win32/advapi32/misc/dllmain.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/dllmain.c
rename to reactos/dll/win32/advapi32/misc/dllmain.c

diff --git a/reactos/win32ss/base/advapi32/misc/efs.c b/reactos/dll/win32/advapi32/misc/efs.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/efs.c
rename to reactos/dll/win32/advapi32/misc/efs.c

diff --git a/reactos/win32ss/base/advapi32/misc/hwprofiles.c b/reactos/dll/win32/advapi32/misc/hwprofiles.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/hwprofiles.c
rename to reactos/dll/win32/advapi32/misc/hwprofiles.c

diff --git a/reactos/win32ss/base/advapi32/misc/logon.c b/reactos/dll/win32/advapi32/misc/logon.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/logon.c
rename to reactos/dll/win32/advapi32/misc/logon.c

diff --git a/reactos/win32ss/base/advapi32/misc/msi.c b/reactos/dll/win32/advapi32/misc/msi.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/msi.c
rename to reactos/dll/win32/advapi32/misc/msi.c

diff --git a/reactos/win32ss/base/advapi32/misc/shutdown.c b/reactos/dll/win32/advapi32/misc/shutdown.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/shutdown.c
rename to reactos/dll/win32/advapi32/misc/shutdown.c

diff --git a/reactos/win32ss/base/advapi32/misc/sysfunc.c b/reactos/dll/win32/advapi32/misc/sysfunc.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/misc/sysfunc.c
rename to reactos/dll/win32/advapi32/misc/sysfunc.c

diff --git a/reactos/win32ss/base/advapi32/reg/hkcr.c b/reactos/dll/win32/advapi32/reg/hkcr.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/reg/hkcr.c
rename to reactos/dll/win32/advapi32/reg/hkcr.c

diff --git a/reactos/win32ss/base/advapi32/reg/reg.c b/reactos/dll/win32/advapi32/reg/reg.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/reg/reg.c
rename to reactos/dll/win32/advapi32/reg/reg.c

diff --git a/reactos/win32ss/base/advapi32/reg/reg.h b/reactos/dll/win32/advapi32/reg/reg.h
similarity index 100%
rename from reactos/win32ss/base/advapi32/reg/reg.h
rename to reactos/dll/win32/advapi32/reg/reg.h

diff --git a/reactos/win32ss/base/advapi32/sec/ac.c b/reactos/dll/win32/advapi32/sec/ac.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/ac.c
rename to reactos/dll/win32/advapi32/sec/ac.c

diff --git a/reactos/win32ss/base/advapi32/sec/audit.c b/reactos/dll/win32/advapi32/sec/audit.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/audit.c
rename to reactos/dll/win32/advapi32/sec/audit.c

diff --git a/reactos/win32ss/base/advapi32/sec/lsa.c b/reactos/dll/win32/advapi32/sec/lsa.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/lsa.c
rename to reactos/dll/win32/advapi32/sec/lsa.c

diff --git a/reactos/win32ss/base/advapi32/sec/misc.c b/reactos/dll/win32/advapi32/sec/misc.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/misc.c
rename to reactos/dll/win32/advapi32/sec/misc.c

diff --git a/reactos/win32ss/base/advapi32/sec/safer.c b/reactos/dll/win32/advapi32/sec/safer.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/safer.c
rename to reactos/dll/win32/advapi32/sec/safer.c

diff --git a/reactos/win32ss/base/advapi32/sec/sec.c b/reactos/dll/win32/advapi32/sec/sec.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/sec.c
rename to reactos/dll/win32/advapi32/sec/sec.c

diff --git a/reactos/win32ss/base/advapi32/sec/trustee.c b/reactos/dll/win32/advapi32/sec/trustee.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/sec/trustee.c
rename to reactos/dll/win32/advapi32/sec/trustee.c

diff --git a/reactos/win32ss/base/advapi32/service/eventlog.c b/reactos/dll/win32/advapi32/service/eventlog.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/service/eventlog.c
rename to reactos/dll/win32/advapi32/service/eventlog.c

diff --git a/reactos/win32ss/base/advapi32/service/rpc.c b/reactos/dll/win32/advapi32/service/rpc.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/service/rpc.c
rename to reactos/dll/win32/advapi32/service/rpc.c

diff --git a/reactos/win32ss/base/advapi32/service/scm.c b/reactos/dll/win32/advapi32/service/scm.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/service/scm.c
rename to reactos/dll/win32/advapi32/service/scm.c

diff --git a/reactos/win32ss/base/advapi32/service/sctrl.c b/reactos/dll/win32/advapi32/service/sctrl.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/service/sctrl.c
rename to reactos/dll/win32/advapi32/service/sctrl.c

diff --git a/reactos/win32ss/base/advapi32/token/token.c b/reactos/dll/win32/advapi32/token/token.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/token/token.c
rename to reactos/dll/win32/advapi32/token/token.c

diff --git a/reactos/win32ss/base/advapi32/wine/cred.c b/reactos/dll/win32/advapi32/wine/cred.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/cred.c
rename to reactos/dll/win32/advapi32/wine/cred.c

diff --git a/reactos/win32ss/base/advapi32/wine/crypt.c b/reactos/dll/win32/advapi32/wine/crypt.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/crypt.c
rename to reactos/dll/win32/advapi32/wine/crypt.c

diff --git a/reactos/win32ss/base/advapi32/wine/crypt.h b/reactos/dll/win32/advapi32/wine/crypt.h
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/crypt.h
rename to reactos/dll/win32/advapi32/wine/crypt.h

diff --git a/reactos/win32ss/base/advapi32/wine/crypt_des.c b/reactos/dll/win32/advapi32/wine/crypt_des.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/crypt_des.c
rename to reactos/dll/win32/advapi32/wine/crypt_des.c

diff --git a/reactos/win32ss/base/advapi32/wine/crypt_lmhash.c b/reactos/dll/win32/advapi32/wine/crypt_lmhash.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/crypt_lmhash.c
rename to reactos/dll/win32/advapi32/wine/crypt_lmhash.c

diff --git a/reactos/win32ss/base/advapi32/wine/ros_diff.patch b/reactos/dll/win32/advapi32/wine/ros_diff.patch
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/ros_diff.patch
rename to reactos/dll/win32/advapi32/wine/ros_diff.patch

diff --git a/reactos/win32ss/base/advapi32/wine/security.c b/reactos/dll/win32/advapi32/wine/security.c
similarity index 100%
rename from reactos/win32ss/base/advapi32/wine/security.c
rename to reactos/dll/win32/advapi32/wine/security.c

diff --git a/reactos/base/shell/browseui/CAutoComplete.cpp b/reactos/dll/win32/browseui/CAutoComplete.cpp
similarity index 100%
rename from reactos/base/shell/browseui/CAutoComplete.cpp
rename to reactos/dll/win32/browseui/CAutoComplete.cpp

diff --git a/reactos/base/shell/browseui/CAutoComplete.h b/reactos/dll/win32/browseui/CAutoComplete.h
similarity index 100%
rename from reactos/base/shell/browseui/CAutoComplete.h
rename to reactos/dll/win32/browseui/CAutoComplete.h

diff --git a/reactos/base/shell/browseui/CMakeLists.txt b/reactos/dll/win32/browseui/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/browseui/CMakeLists.txt
rename to reactos/dll/win32/browseui/CMakeLists.txt

diff --git a/reactos/base/shell/browseui/CProgressDialog.cpp b/reactos/dll/win32/browseui/CProgressDialog.cpp
similarity index 100%
rename from reactos/base/shell/browseui/CProgressDialog.cpp
rename to reactos/dll/win32/browseui/CProgressDialog.cpp

diff --git a/reactos/base/shell/browseui/CProgressDialog.h b/reactos/dll/win32/browseui/CProgressDialog.h
similarity index 100%
rename from reactos/base/shell/browseui/CProgressDialog.h
rename to reactos/dll/win32/browseui/CProgressDialog.h

diff --git a/reactos/base/shell/browseui/aclmulti.cpp b/reactos/dll/win32/browseui/aclmulti.cpp
similarity index 100%
rename from reactos/base/shell/browseui/aclmulti.cpp
rename to reactos/dll/win32/browseui/aclmulti.cpp

diff --git a/reactos/base/shell/browseui/aclmulti.h b/reactos/dll/win32/browseui/aclmulti.h
similarity index 100%
rename from reactos/base/shell/browseui/aclmulti.h
rename to reactos/dll/win32/browseui/aclmulti.h

diff --git a/reactos/base/shell/browseui/addressband.cpp b/reactos/dll/win32/browseui/addressband.cpp
similarity index 100%
rename from reactos/base/shell/browseui/addressband.cpp
rename to reactos/dll/win32/browseui/addressband.cpp

diff --git a/reactos/base/shell/browseui/addressband.h b/reactos/dll/win32/browseui/addressband.h
similarity index 100%
rename from reactos/base/shell/browseui/addressband.h
rename to reactos/dll/win32/browseui/addressband.h

diff --git a/reactos/base/shell/browseui/addresseditbox.cpp b/reactos/dll/win32/browseui/addresseditbox.cpp
similarity index 100%
rename from reactos/base/shell/browseui/addresseditbox.cpp
rename to reactos/dll/win32/browseui/addresseditbox.cpp

diff --git a/reactos/base/shell/browseui/addresseditbox.h b/reactos/dll/win32/browseui/addresseditbox.h
similarity index 100%
rename from reactos/base/shell/browseui/addresseditbox.h
rename to reactos/dll/win32/browseui/addresseditbox.h

diff --git a/reactos/base/shell/browseui/bandproxy.cpp b/reactos/dll/win32/browseui/bandproxy.cpp
similarity index 100%
rename from reactos/base/shell/browseui/bandproxy.cpp
rename to reactos/dll/win32/browseui/bandproxy.cpp

diff --git a/reactos/base/shell/browseui/bandproxy.h b/reactos/dll/win32/browseui/bandproxy.h
similarity index 100%
rename from reactos/base/shell/browseui/bandproxy.h
rename to reactos/dll/win32/browseui/bandproxy.h

diff --git a/reactos/base/shell/browseui/bandsite.cpp b/reactos/dll/win32/browseui/bandsite.cpp
similarity index 100%
rename from reactos/base/shell/browseui/bandsite.cpp
rename to reactos/dll/win32/browseui/bandsite.cpp

diff --git a/reactos/base/shell/browseui/bandsite.h b/reactos/dll/win32/browseui/bandsite.h
similarity index 100%
rename from reactos/base/shell/browseui/bandsite.h
rename to reactos/dll/win32/browseui/bandsite.h

diff --git a/reactos/base/shell/browseui/bandsitemenu.cpp b/reactos/dll/win32/browseui/bandsitemenu.cpp
similarity index 100%
rename from reactos/base/shell/browseui/bandsitemenu.cpp
rename to reactos/dll/win32/browseui/bandsitemenu.cpp

diff --git a/reactos/base/shell/browseui/bandsitemenu.h b/reactos/dll/win32/browseui/bandsitemenu.h
similarity index 100%
rename from reactos/base/shell/browseui/bandsitemenu.h
rename to reactos/dll/win32/browseui/bandsitemenu.h

diff --git a/reactos/base/shell/browseui/basebar.cpp b/reactos/dll/win32/browseui/basebar.cpp
similarity index 100%
rename from reactos/base/shell/browseui/basebar.cpp
rename to reactos/dll/win32/browseui/basebar.cpp

diff --git a/reactos/base/shell/browseui/basebarsite.cpp b/reactos/dll/win32/browseui/basebarsite.cpp
similarity index 100%
rename from reactos/base/shell/browseui/basebarsite.cpp
rename to reactos/dll/win32/browseui/basebarsite.cpp

diff --git a/reactos/base/shell/browseui/brandband.cpp b/reactos/dll/win32/browseui/brandband.cpp
similarity index 100%
rename from reactos/base/shell/browseui/brandband.cpp
rename to reactos/dll/win32/browseui/brandband.cpp

diff --git a/reactos/base/shell/browseui/brandband.h b/reactos/dll/win32/browseui/brandband.h
similarity index 100%
rename from reactos/base/shell/browseui/brandband.h
rename to reactos/dll/win32/browseui/brandband.h

diff --git a/reactos/base/shell/browseui/browseui.cpp b/reactos/dll/win32/browseui/browseui.cpp
similarity index 100%
rename from reactos/base/shell/browseui/browseui.cpp
rename to reactos/dll/win32/browseui/browseui.cpp

diff --git a/reactos/base/shell/browseui/browseui.rc b/reactos/dll/win32/browseui/browseui.rc
similarity index 100%
rename from reactos/base/shell/browseui/browseui.rc
rename to reactos/dll/win32/browseui/browseui.rc

diff --git a/reactos/base/shell/browseui/browseui.spec b/reactos/dll/win32/browseui/browseui.spec
similarity index 100%
rename from reactos/base/shell/browseui/browseui.spec
rename to reactos/dll/win32/browseui/browseui.spec

diff --git a/reactos/base/shell/browseui/browseuiord.cpp b/reactos/dll/win32/browseui/browseuiord.cpp
similarity index 100%
rename from reactos/base/shell/browseui/browseuiord.cpp
rename to reactos/dll/win32/browseui/browseuiord.cpp

diff --git a/reactos/base/shell/browseui/commonbrowser.cpp b/reactos/dll/win32/browseui/commonbrowser.cpp
similarity index 100%
rename from reactos/base/shell/browseui/commonbrowser.cpp
rename to reactos/dll/win32/browseui/commonbrowser.cpp

diff --git a/reactos/base/shell/browseui/commonbrowser.h b/reactos/dll/win32/browseui/commonbrowser.h
similarity index 100%
rename from reactos/base/shell/browseui/commonbrowser.h
rename to reactos/dll/win32/browseui/commonbrowser.h

diff --git a/reactos/base/shell/browseui/desktopipc.cpp b/reactos/dll/win32/browseui/desktopipc.cpp
similarity index 100%
rename from reactos/base/shell/browseui/desktopipc.cpp
rename to reactos/dll/win32/browseui/desktopipc.cpp

diff --git a/reactos/base/shell/browseui/dllinstall.c b/reactos/dll/win32/browseui/dllinstall.c
similarity index 100%
rename from reactos/base/shell/browseui/dllinstall.c
rename to reactos/dll/win32/browseui/dllinstall.c

diff --git a/reactos/base/shell/browseui/explorerband.cpp b/reactos/dll/win32/browseui/explorerband.cpp
similarity index 100%
rename from reactos/base/shell/browseui/explorerband.cpp
rename to reactos/dll/win32/browseui/explorerband.cpp

diff --git a/reactos/base/shell/browseui/explorerband.h b/reactos/dll/win32/browseui/explorerband.h
similarity index 100%
rename from reactos/base/shell/browseui/explorerband.h
rename to reactos/dll/win32/browseui/explorerband.h

diff --git a/reactos/base/shell/browseui/globalfoldersettings.cpp b/reactos/dll/win32/browseui/globalfoldersettings.cpp
similarity index 100%
rename from reactos/base/shell/browseui/globalfoldersettings.cpp
rename to reactos/dll/win32/browseui/globalfoldersettings.cpp

diff --git a/reactos/base/shell/browseui/globalfoldersettings.h b/reactos/dll/win32/browseui/globalfoldersettings.h
similarity index 100%
rename from reactos/base/shell/browseui/globalfoldersettings.h
rename to reactos/dll/win32/browseui/globalfoldersettings.h

diff --git a/reactos/base/shell/browseui/internettoolbar.cpp b/reactos/dll/win32/browseui/internettoolbar.cpp
similarity index 100%
rename from reactos/base/shell/browseui/internettoolbar.cpp
rename to reactos/dll/win32/browseui/internettoolbar.cpp

diff --git a/reactos/base/shell/browseui/internettoolbar.h b/reactos/dll/win32/browseui/internettoolbar.h
similarity index 100%
rename from reactos/base/shell/browseui/internettoolbar.h
rename to reactos/dll/win32/browseui/internettoolbar.h

diff --git a/reactos/base/shell/browseui/lang/bg-BG.rc b/reactos/dll/win32/browseui/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/bg-BG.rc
rename to reactos/dll/win32/browseui/lang/bg-BG.rc

diff --git a/reactos/base/shell/browseui/lang/de-DE.rc b/reactos/dll/win32/browseui/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/de-DE.rc
rename to reactos/dll/win32/browseui/lang/de-DE.rc

diff --git a/reactos/base/shell/browseui/lang/en-US.rc b/reactos/dll/win32/browseui/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/en-US.rc
rename to reactos/dll/win32/browseui/lang/en-US.rc

diff --git a/reactos/base/shell/browseui/lang/es-ES.rc b/reactos/dll/win32/browseui/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/es-ES.rc
rename to reactos/dll/win32/browseui/lang/es-ES.rc

diff --git a/reactos/base/shell/browseui/lang/he-IL.rc b/reactos/dll/win32/browseui/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/he-IL.rc
rename to reactos/dll/win32/browseui/lang/he-IL.rc

diff --git a/reactos/base/shell/browseui/lang/it-IT.rc b/reactos/dll/win32/browseui/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/it-IT.rc
rename to reactos/dll/win32/browseui/lang/it-IT.rc

diff --git a/reactos/base/shell/browseui/lang/pl-PL.rc b/reactos/dll/win32/browseui/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/pl-PL.rc
rename to reactos/dll/win32/browseui/lang/pl-PL.rc

diff --git a/reactos/base/shell/browseui/lang/ro-RO.rc b/reactos/dll/win32/browseui/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/ro-RO.rc
rename to reactos/dll/win32/browseui/lang/ro-RO.rc

diff --git a/reactos/base/shell/browseui/lang/ru-RU.rc b/reactos/dll/win32/browseui/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/ru-RU.rc
rename to reactos/dll/win32/browseui/lang/ru-RU.rc

diff --git a/reactos/base/shell/browseui/lang/sq-AL.rc b/reactos/dll/win32/browseui/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/sq-AL.rc
rename to reactos/dll/win32/browseui/lang/sq-AL.rc

diff --git a/reactos/base/shell/browseui/lang/tr-TR.rc b/reactos/dll/win32/browseui/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/tr-TR.rc
rename to reactos/dll/win32/browseui/lang/tr-TR.rc

diff --git a/reactos/base/shell/browseui/lang/uk-UA.rc b/reactos/dll/win32/browseui/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/browseui/lang/uk-UA.rc
rename to reactos/dll/win32/browseui/lang/uk-UA.rc

diff --git a/reactos/base/shell/browseui/newatlinterfaces.h b/reactos/dll/win32/browseui/newatlinterfaces.h
similarity index 100%
rename from reactos/base/shell/browseui/newatlinterfaces.h
rename to reactos/dll/win32/browseui/newatlinterfaces.h

diff --git a/reactos/base/shell/browseui/parsecmdline.cpp b/reactos/dll/win32/browseui/parsecmdline.cpp
similarity index 100%
rename from reactos/base/shell/browseui/parsecmdline.cpp
rename to reactos/dll/win32/browseui/parsecmdline.cpp

diff --git a/reactos/base/shell/browseui/precomp.h b/reactos/dll/win32/browseui/precomp.h
similarity index 100%
rename from reactos/base/shell/browseui/precomp.h
rename to reactos/dll/win32/browseui/precomp.h

diff --git a/reactos/base/shell/browseui/regtreeoptions.cpp b/reactos/dll/win32/browseui/regtreeoptions.cpp
similarity index 100%
rename from reactos/base/shell/browseui/regtreeoptions.cpp
rename to reactos/dll/win32/browseui/regtreeoptions.cpp

diff --git a/reactos/base/shell/browseui/regtreeoptions.h b/reactos/dll/win32/browseui/regtreeoptions.h
similarity index 100%
rename from reactos/base/shell/browseui/regtreeoptions.h
rename to reactos/dll/win32/browseui/regtreeoptions.h

diff --git a/reactos/base/shell/browseui/res/addressband.rgs b/reactos/dll/win32/browseui/res/addressband.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/addressband.rgs
rename to reactos/dll/win32/browseui/res/addressband.rgs

diff --git a/reactos/base/shell/browseui/res/addresseditbox.rgs b/reactos/dll/win32/browseui/res/addresseditbox.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/addresseditbox.rgs
rename to reactos/dll/win32/browseui/res/addresseditbox.rgs

diff --git a/reactos/base/shell/browseui/res/autocomplete.rgs b/reactos/dll/win32/browseui/res/autocomplete.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/autocomplete.rgs
rename to reactos/dll/win32/browseui/res/autocomplete.rgs

diff --git a/reactos/base/shell/browseui/res/autocompletecontainer.rgs b/reactos/dll/win32/browseui/res/autocompletecontainer.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/autocompletecontainer.rgs
rename to reactos/dll/win32/browseui/res/autocompletecontainer.rgs

diff --git a/reactos/base/shell/browseui/res/bandproxy.rgs b/reactos/dll/win32/browseui/res/bandproxy.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/bandproxy.rgs
rename to reactos/dll/win32/browseui/res/bandproxy.rgs

diff --git a/reactos/base/shell/browseui/res/bandsitemenu.rgs b/reactos/dll/win32/browseui/res/bandsitemenu.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/bandsitemenu.rgs
rename to reactos/dll/win32/browseui/res/bandsitemenu.rgs

diff --git a/reactos/base/shell/browseui/res/brandband.rgs b/reactos/dll/win32/browseui/res/brandband.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/brandband.rgs
rename to reactos/dll/win32/browseui/res/brandband.rgs

diff --git a/reactos/base/shell/browseui/res/commonbrowser.rgs b/reactos/dll/win32/browseui/res/commonbrowser.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/commonbrowser.rgs
rename to reactos/dll/win32/browseui/res/commonbrowser.rgs

diff --git a/reactos/base/shell/browseui/res/explorerband.rgs b/reactos/dll/win32/browseui/res/explorerband.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/explorerband.rgs
rename to reactos/dll/win32/browseui/res/explorerband.rgs

diff --git a/reactos/base/shell/browseui/res/globalfoldersettings.rgs b/reactos/dll/win32/browseui/res/globalfoldersettings.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/globalfoldersettings.rgs
rename to reactos/dll/win32/browseui/res/globalfoldersettings.rgs

diff --git a/reactos/base/shell/browseui/res/internettoolbar.rgs b/reactos/dll/win32/browseui/res/internettoolbar.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/internettoolbar.rgs
rename to reactos/dll/win32/browseui/res/internettoolbar.rgs

diff --git a/reactos/base/shell/browseui/res/progressdialog.rgs b/reactos/dll/win32/browseui/res/progressdialog.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/progressdialog.rgs
rename to reactos/dll/win32/browseui/res/progressdialog.rgs

diff --git a/reactos/base/shell/browseui/res/rebarbandsite.rgs b/reactos/dll/win32/browseui/res/rebarbandsite.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/rebarbandsite.rgs
rename to reactos/dll/win32/browseui/res/rebarbandsite.rgs

diff --git a/reactos/base/shell/browseui/res/regtreeoptions.rgs b/reactos/dll/win32/browseui/res/regtreeoptions.rgs
similarity index 100%
rename from reactos/base/shell/browseui/res/regtreeoptions.rgs
rename to reactos/dll/win32/browseui/res/regtreeoptions.rgs

diff --git a/reactos/base/shell/browseui/resource.h b/reactos/dll/win32/browseui/resource.h
similarity index 100%
rename from reactos/base/shell/browseui/resource.h
rename to reactos/dll/win32/browseui/resource.h

diff --git a/reactos/base/shell/browseui/shellbrowser.cpp b/reactos/dll/win32/browseui/shellbrowser.cpp
similarity index 100%
rename from reactos/base/shell/browseui/shellbrowser.cpp
rename to reactos/dll/win32/browseui/shellbrowser.cpp

diff --git a/reactos/base/shell/browseui/toolsband.cpp b/reactos/dll/win32/browseui/toolsband.cpp
similarity index 100%
rename from reactos/base/shell/browseui/toolsband.cpp
rename to reactos/dll/win32/browseui/toolsband.cpp

diff --git a/reactos/base/shell/browseui/travellog.cpp b/reactos/dll/win32/browseui/travellog.cpp
similarity index 100%
rename from reactos/base/shell/browseui/travellog.cpp
rename to reactos/dll/win32/browseui/travellog.cpp

diff --git a/reactos/base/shell/browseui/utility.cpp b/reactos/dll/win32/browseui/utility.cpp
similarity index 100%
rename from reactos/base/shell/browseui/utility.cpp
rename to reactos/dll/win32/browseui/utility.cpp

diff --git a/reactos/base/shell/browseui/utility.h b/reactos/dll/win32/browseui/utility.h
similarity index 100%
rename from reactos/base/shell/browseui/utility.h
rename to reactos/dll/win32/browseui/utility.h

diff --git a/reactos/base/shell/browseui/version.rc b/reactos/dll/win32/browseui/version.rc
similarity index 100%
rename from reactos/base/shell/browseui/version.rc
rename to reactos/dll/win32/browseui/version.rc

diff --git a/reactos/base/shell/ie/ieframe/CMakeLists.txt b/reactos/dll/win32/ieframe/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/ieframe/CMakeLists.txt
rename to reactos/dll/win32/ieframe/CMakeLists.txt

diff --git a/reactos/base/shell/ie/ieframe/classinfo.c b/reactos/dll/win32/ieframe/classinfo.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/classinfo.c
rename to reactos/dll/win32/ieframe/classinfo.c

diff --git a/reactos/base/shell/ie/ieframe/client.c b/reactos/dll/win32/ieframe/client.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/client.c
rename to reactos/dll/win32/ieframe/client.c

diff --git a/reactos/base/shell/ie/ieframe/dochost.c b/reactos/dll/win32/ieframe/dochost.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/dochost.c
rename to reactos/dll/win32/ieframe/dochost.c

diff --git a/reactos/base/shell/ie/ieframe/events.c b/reactos/dll/win32/ieframe/events.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/events.c
rename to reactos/dll/win32/ieframe/events.c

diff --git a/reactos/base/shell/ie/ieframe/frame.c b/reactos/dll/win32/ieframe/frame.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/frame.c
rename to reactos/dll/win32/ieframe/frame.c

diff --git a/reactos/base/shell/ie/ieframe/ie.c b/reactos/dll/win32/ieframe/ie.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ie.c
rename to reactos/dll/win32/ieframe/ie.c

diff --git a/reactos/base/shell/ie/ieframe/ieframe.h b/reactos/dll/win32/ieframe/ieframe.h
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe.h
rename to reactos/dll/win32/ieframe/ieframe.h

diff --git a/reactos/base/shell/ie/ieframe/ieframe.rc b/reactos/dll/win32/ieframe/ieframe.rc
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe.rc
rename to reactos/dll/win32/ieframe/ieframe.rc

diff --git a/reactos/base/shell/ie/ieframe/ieframe.rgs b/reactos/dll/win32/ieframe/ieframe.rgs
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe.rgs
rename to reactos/dll/win32/ieframe/ieframe.rgs

diff --git a/reactos/base/shell/ie/ieframe/ieframe.spec b/reactos/dll/win32/ieframe/ieframe.spec
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe.spec
rename to reactos/dll/win32/ieframe/ieframe.spec

diff --git a/reactos/base/shell/ie/ieframe/ieframe_main.c b/reactos/dll/win32/ieframe/ieframe_main.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe_main.c
rename to reactos/dll/win32/ieframe/ieframe_main.c

diff --git a/reactos/base/shell/ie/ieframe/ieframe_v1.idl b/reactos/dll/win32/ieframe/ieframe_v1.idl
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe_v1.idl
rename to reactos/dll/win32/ieframe/ieframe_v1.idl

diff --git a/reactos/base/shell/ie/ieframe/ieframe_v1.rgs b/reactos/dll/win32/ieframe/ieframe_v1.rgs
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe_v1.rgs
rename to reactos/dll/win32/ieframe/ieframe_v1.rgs

diff --git a/reactos/base/shell/ie/ieframe/ieframe_v1.tlb.rgs b/reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ieframe_v1.tlb.rgs
rename to reactos/dll/win32/ieframe/ieframe_v1.tlb.rgs

diff --git a/reactos/base/shell/ie/ieframe/iehtmlwnd.c b/reactos/dll/win32/ieframe/iehtmlwnd.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/iehtmlwnd.c
rename to reactos/dll/win32/ieframe/iehtmlwnd.c

diff --git a/reactos/base/shell/ie/ieframe/ietoolbar.bmp b/reactos/dll/win32/ieframe/ietoolbar.bmp
similarity index 100%
rename from reactos/base/shell/ie/ieframe/ietoolbar.bmp
rename to reactos/dll/win32/ieframe/ietoolbar.bmp

diff --git a/reactos/base/shell/ie/ieframe/iexplore.c b/reactos/dll/win32/ieframe/iexplore.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/iexplore.c
rename to reactos/dll/win32/ieframe/iexplore.c

diff --git a/reactos/base/shell/ie/ieframe/intshcut.c b/reactos/dll/win32/ieframe/intshcut.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/intshcut.c
rename to reactos/dll/win32/ieframe/intshcut.c

diff --git a/reactos/base/shell/ie/ieframe/navigate.c b/reactos/dll/win32/ieframe/navigate.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/navigate.c
rename to reactos/dll/win32/ieframe/navigate.c

diff --git a/reactos/base/shell/ie/ieframe/oleobject.c b/reactos/dll/win32/ieframe/oleobject.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/oleobject.c
rename to reactos/dll/win32/ieframe/oleobject.c

diff --git a/reactos/base/shell/ie/ieframe/persist.c b/reactos/dll/win32/ieframe/persist.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/persist.c
rename to reactos/dll/win32/ieframe/persist.c

diff --git a/reactos/base/shell/ie/ieframe/resource.h b/reactos/dll/win32/ieframe/resource.h
similarity index 100%
rename from reactos/base/shell/ie/ieframe/resource.h
rename to reactos/dll/win32/ieframe/resource.h

diff --git a/reactos/base/shell/ie/ieframe/shellbrowser.c b/reactos/dll/win32/ieframe/shellbrowser.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/shellbrowser.c
rename to reactos/dll/win32/ieframe/shellbrowser.c

diff --git a/reactos/base/shell/ie/ieframe/shelluihelper.c b/reactos/dll/win32/ieframe/shelluihelper.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/shelluihelper.c
rename to reactos/dll/win32/ieframe/shelluihelper.c

diff --git a/reactos/base/shell/ie/ieframe/urlhist.c b/reactos/dll/win32/ieframe/urlhist.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/urlhist.c
rename to reactos/dll/win32/ieframe/urlhist.c

diff --git a/reactos/base/shell/ie/ieframe/view.c b/reactos/dll/win32/ieframe/view.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/view.c
rename to reactos/dll/win32/ieframe/view.c

diff --git a/reactos/base/shell/ie/ieframe/webbrowser.c b/reactos/dll/win32/ieframe/webbrowser.c
similarity index 100%
rename from reactos/base/shell/ie/ieframe/webbrowser.c
rename to reactos/dll/win32/ieframe/webbrowser.c

diff --git a/reactos/win32ss/base/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/kernel32/CMakeLists.txt
rename to reactos/dll/win32/kernel32/CMakeLists.txt

diff --git a/reactos/win32ss/base/kernel32/client/actctx.c b/reactos/dll/win32/kernel32/client/actctx.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/actctx.c
rename to reactos/dll/win32/kernel32/client/actctx.c

diff --git a/reactos/win32ss/base/kernel32/client/amd64/fiber.S b/reactos/dll/win32/kernel32/client/amd64/fiber.S
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/amd64/fiber.S
rename to reactos/dll/win32/kernel32/client/amd64/fiber.S

diff --git a/reactos/win32ss/base/kernel32/client/amd64/thread.S b/reactos/dll/win32/kernel32/client/amd64/thread.S
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/amd64/thread.S
rename to reactos/dll/win32/kernel32/client/amd64/thread.S

diff --git a/reactos/win32ss/base/kernel32/client/appcache.c b/reactos/dll/win32/kernel32/client/appcache.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/appcache.c
rename to reactos/dll/win32/kernel32/client/appcache.c

diff --git a/reactos/win32ss/base/kernel32/client/atom.c b/reactos/dll/win32/kernel32/client/atom.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/atom.c
rename to reactos/dll/win32/kernel32/client/atom.c

diff --git a/reactos/win32ss/base/kernel32/client/compname.c b/reactos/dll/win32/kernel32/client/compname.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/compname.c
rename to reactos/dll/win32/kernel32/client/compname.c

diff --git a/reactos/win32ss/base/kernel32/client/console/alias.c b/reactos/dll/win32/kernel32/client/console/alias.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/alias.c
rename to reactos/dll/win32/kernel32/client/console/alias.c

diff --git a/reactos/win32ss/base/kernel32/client/console/console.c b/reactos/dll/win32/kernel32/client/console/console.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/console.c
rename to reactos/dll/win32/kernel32/client/console/console.c

diff --git a/reactos/win32ss/base/kernel32/client/console/history.c b/reactos/dll/win32/kernel32/client/console/history.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/history.c
rename to reactos/dll/win32/kernel32/client/console/history.c

diff --git a/reactos/win32ss/base/kernel32/client/console/init.c b/reactos/dll/win32/kernel32/client/console/init.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/init.c
rename to reactos/dll/win32/kernel32/client/console/init.c

diff --git a/reactos/win32ss/base/kernel32/client/console/readwrite.c b/reactos/dll/win32/kernel32/client/console/readwrite.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/readwrite.c
rename to reactos/dll/win32/kernel32/client/console/readwrite.c

diff --git a/reactos/win32ss/base/kernel32/client/console/vista.c b/reactos/dll/win32/kernel32/client/console/vista.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/console/vista.c
rename to reactos/dll/win32/kernel32/client/console/vista.c

diff --git a/reactos/win32ss/base/kernel32/client/debugger.c b/reactos/dll/win32/kernel32/client/debugger.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/debugger.c
rename to reactos/dll/win32/kernel32/client/debugger.c

diff --git a/reactos/win32ss/base/kernel32/client/dllmain.c b/reactos/dll/win32/kernel32/client/dllmain.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/dllmain.c
rename to reactos/dll/win32/kernel32/client/dllmain.c

diff --git a/reactos/win32ss/base/kernel32/client/dosdev.c b/reactos/dll/win32/kernel32/client/dosdev.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/dosdev.c
rename to reactos/dll/win32/kernel32/client/dosdev.c

diff --git a/reactos/win32ss/base/kernel32/client/environ.c b/reactos/dll/win32/kernel32/client/environ.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/environ.c
rename to reactos/dll/win32/kernel32/client/environ.c

diff --git a/reactos/win32ss/base/kernel32/client/except.c b/reactos/dll/win32/kernel32/client/except.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/except.c
rename to reactos/dll/win32/kernel32/client/except.c

diff --git a/reactos/win32ss/base/kernel32/client/fiber.c b/reactos/dll/win32/kernel32/client/fiber.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/fiber.c
rename to reactos/dll/win32/kernel32/client/fiber.c

diff --git a/reactos/win32ss/base/kernel32/client/file/backup.c b/reactos/dll/win32/kernel32/client/file/backup.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/backup.c
rename to reactos/dll/win32/kernel32/client/file/backup.c

diff --git a/reactos/win32ss/base/kernel32/client/file/cnotify.c b/reactos/dll/win32/kernel32/client/file/cnotify.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/cnotify.c
rename to reactos/dll/win32/kernel32/client/file/cnotify.c

diff --git a/reactos/win32ss/base/kernel32/client/file/copy.c b/reactos/dll/win32/kernel32/client/file/copy.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/copy.c
rename to reactos/dll/win32/kernel32/client/file/copy.c

diff --git a/reactos/win32ss/base/kernel32/client/file/create.c b/reactos/dll/win32/kernel32/client/file/create.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/create.c
rename to reactos/dll/win32/kernel32/client/file/create.c

diff --git a/reactos/win32ss/base/kernel32/client/file/delete.c b/reactos/dll/win32/kernel32/client/file/delete.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/delete.c
rename to reactos/dll/win32/kernel32/client/file/delete.c

diff --git a/reactos/win32ss/base/kernel32/client/file/deviceio.c b/reactos/dll/win32/kernel32/client/file/deviceio.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/deviceio.c
rename to reactos/dll/win32/kernel32/client/file/deviceio.c

diff --git a/reactos/win32ss/base/kernel32/client/file/dir.c b/reactos/dll/win32/kernel32/client/file/dir.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/dir.c
rename to reactos/dll/win32/kernel32/client/file/dir.c

diff --git a/reactos/win32ss/base/kernel32/client/file/disk.c b/reactos/dll/win32/kernel32/client/file/disk.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/disk.c
rename to reactos/dll/win32/kernel32/client/file/disk.c

diff --git a/reactos/win32ss/base/kernel32/client/file/fileinfo.c b/reactos/dll/win32/kernel32/client/file/fileinfo.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/fileinfo.c
rename to reactos/dll/win32/kernel32/client/file/fileinfo.c

diff --git a/reactos/win32ss/base/kernel32/client/file/filemap.c b/reactos/dll/win32/kernel32/client/file/filemap.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/filemap.c
rename to reactos/dll/win32/kernel32/client/file/filemap.c

diff --git a/reactos/win32ss/base/kernel32/client/file/filename.c b/reactos/dll/win32/kernel32/client/file/filename.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/filename.c
rename to reactos/dll/win32/kernel32/client/file/filename.c

diff --git a/reactos/win32ss/base/kernel32/client/file/find.c b/reactos/dll/win32/kernel32/client/file/find.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/find.c
rename to reactos/dll/win32/kernel32/client/file/find.c

diff --git a/reactos/win32ss/base/kernel32/client/file/hardlink.c b/reactos/dll/win32/kernel32/client/file/hardlink.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/hardlink.c
rename to reactos/dll/win32/kernel32/client/file/hardlink.c

diff --git a/reactos/win32ss/base/kernel32/client/file/iocompl.c b/reactos/dll/win32/kernel32/client/file/iocompl.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/iocompl.c
rename to reactos/dll/win32/kernel32/client/file/iocompl.c

diff --git a/reactos/win32ss/base/kernel32/client/file/lfile.c b/reactos/dll/win32/kernel32/client/file/lfile.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/lfile.c
rename to reactos/dll/win32/kernel32/client/file/lfile.c

diff --git a/reactos/win32ss/base/kernel32/client/file/lock.c b/reactos/dll/win32/kernel32/client/file/lock.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/lock.c
rename to reactos/dll/win32/kernel32/client/file/lock.c

diff --git a/reactos/win32ss/base/kernel32/client/file/mailslot.c b/reactos/dll/win32/kernel32/client/file/mailslot.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/mailslot.c
rename to reactos/dll/win32/kernel32/client/file/mailslot.c

diff --git a/reactos/win32ss/base/kernel32/client/file/mntpoint.c b/reactos/dll/win32/kernel32/client/file/mntpoint.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/mntpoint.c
rename to reactos/dll/win32/kernel32/client/file/mntpoint.c

diff --git a/reactos/win32ss/base/kernel32/client/file/move.c b/reactos/dll/win32/kernel32/client/file/move.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/move.c
rename to reactos/dll/win32/kernel32/client/file/move.c

diff --git a/reactos/win32ss/base/kernel32/client/file/npipe.c b/reactos/dll/win32/kernel32/client/file/npipe.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/npipe.c
rename to reactos/dll/win32/kernel32/client/file/npipe.c

diff --git a/reactos/win32ss/base/kernel32/client/file/rw.c b/reactos/dll/win32/kernel32/client/file/rw.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/rw.c
rename to reactos/dll/win32/kernel32/client/file/rw.c

diff --git a/reactos/win32ss/base/kernel32/client/file/tape.c b/reactos/dll/win32/kernel32/client/file/tape.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/tape.c
rename to reactos/dll/win32/kernel32/client/file/tape.c

diff --git a/reactos/win32ss/base/kernel32/client/file/volume.c b/reactos/dll/win32/kernel32/client/file/volume.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/file/volume.c
rename to reactos/dll/win32/kernel32/client/file/volume.c

diff --git a/reactos/win32ss/base/kernel32/client/handle.c b/reactos/dll/win32/kernel32/client/handle.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/handle.c
rename to reactos/dll/win32/kernel32/client/handle.c

diff --git a/reactos/win32ss/base/kernel32/client/heapmem.c b/reactos/dll/win32/kernel32/client/heapmem.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/heapmem.c
rename to reactos/dll/win32/kernel32/client/heapmem.c

diff --git a/reactos/win32ss/base/kernel32/client/i386/fiber.S b/reactos/dll/win32/kernel32/client/i386/fiber.S
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/i386/fiber.S
rename to reactos/dll/win32/kernel32/client/i386/fiber.S

diff --git a/reactos/win32ss/base/kernel32/client/i386/thread.S b/reactos/dll/win32/kernel32/client/i386/thread.S
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/i386/thread.S
rename to reactos/dll/win32/kernel32/client/i386/thread.S

diff --git a/reactos/win32ss/base/kernel32/client/job.c b/reactos/dll/win32/kernel32/client/job.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/job.c
rename to reactos/dll/win32/kernel32/client/job.c

diff --git a/reactos/win32ss/base/kernel32/client/loader.c b/reactos/dll/win32/kernel32/client/loader.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/loader.c
rename to reactos/dll/win32/kernel32/client/loader.c

diff --git a/reactos/win32ss/base/kernel32/client/path.c b/reactos/dll/win32/kernel32/client/path.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/path.c
rename to reactos/dll/win32/kernel32/client/path.c

diff --git a/reactos/win32ss/base/kernel32/client/perfcnt.c b/reactos/dll/win32/kernel32/client/perfcnt.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/perfcnt.c
rename to reactos/dll/win32/kernel32/client/perfcnt.c

diff --git a/reactos/win32ss/base/kernel32/client/power.c b/reactos/dll/win32/kernel32/client/power.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/power.c
rename to reactos/dll/win32/kernel32/client/power.c

diff --git a/reactos/win32ss/base/kernel32/client/proc.c b/reactos/dll/win32/kernel32/client/proc.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/proc.c
rename to reactos/dll/win32/kernel32/client/proc.c

diff --git a/reactos/win32ss/base/kernel32/client/resntfy.c b/reactos/dll/win32/kernel32/client/resntfy.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/resntfy.c
rename to reactos/dll/win32/kernel32/client/resntfy.c

diff --git a/reactos/win32ss/base/kernel32/client/session.c b/reactos/dll/win32/kernel32/client/session.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/session.c
rename to reactos/dll/win32/kernel32/client/session.c

diff --git a/reactos/win32ss/base/kernel32/client/synch.c b/reactos/dll/win32/kernel32/client/synch.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/synch.c
rename to reactos/dll/win32/kernel32/client/synch.c

diff --git a/reactos/win32ss/base/kernel32/client/sysinfo.c b/reactos/dll/win32/kernel32/client/sysinfo.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/sysinfo.c
rename to reactos/dll/win32/kernel32/client/sysinfo.c

diff --git a/reactos/win32ss/base/kernel32/client/thread.c b/reactos/dll/win32/kernel32/client/thread.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/thread.c
rename to reactos/dll/win32/kernel32/client/thread.c

diff --git a/reactos/win32ss/base/kernel32/client/time.c b/reactos/dll/win32/kernel32/client/time.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/time.c
rename to reactos/dll/win32/kernel32/client/time.c

diff --git a/reactos/win32ss/base/kernel32/client/timerqueue.c b/reactos/dll/win32/kernel32/client/timerqueue.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/timerqueue.c
rename to reactos/dll/win32/kernel32/client/timerqueue.c

diff --git a/reactos/win32ss/base/kernel32/client/toolhelp.c b/reactos/dll/win32/kernel32/client/toolhelp.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/toolhelp.c
rename to reactos/dll/win32/kernel32/client/toolhelp.c

diff --git a/reactos/win32ss/base/kernel32/client/utils.c b/reactos/dll/win32/kernel32/client/utils.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/utils.c
rename to reactos/dll/win32/kernel32/client/utils.c

diff --git a/reactos/win32ss/base/kernel32/client/vdm.c b/reactos/dll/win32/kernel32/client/vdm.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/vdm.c
rename to reactos/dll/win32/kernel32/client/vdm.c

diff --git a/reactos/win32ss/base/kernel32/client/version.c b/reactos/dll/win32/kernel32/client/version.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/version.c
rename to reactos/dll/win32/kernel32/client/version.c

diff --git a/reactos/win32ss/base/kernel32/client/virtmem.c b/reactos/dll/win32/kernel32/client/virtmem.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/virtmem.c
rename to reactos/dll/win32/kernel32/client/virtmem.c

diff --git a/reactos/win32ss/base/kernel32/client/vista.c b/reactos/dll/win32/kernel32/client/vista.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/client/vista.c
rename to reactos/dll/win32/kernel32/client/vista.c

diff --git a/reactos/win32ss/base/kernel32/include/base_x.h b/reactos/dll/win32/kernel32/include/base_x.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/include/base_x.h
rename to reactos/dll/win32/kernel32/include/base_x.h

diff --git a/reactos/win32ss/base/kernel32/include/baseheap.h b/reactos/dll/win32/kernel32/include/baseheap.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/include/baseheap.h
rename to reactos/dll/win32/kernel32/include/baseheap.h

diff --git a/reactos/win32ss/base/kernel32/include/console.h b/reactos/dll/win32/kernel32/include/console.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/include/console.h
rename to reactos/dll/win32/kernel32/include/console.h

diff --git a/reactos/win32ss/base/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/include/kernel32.h
rename to reactos/dll/win32/kernel32/include/kernel32.h

diff --git a/reactos/win32ss/base/kernel32/include/vdm.h b/reactos/dll/win32/kernel32/include/vdm.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/include/vdm.h
rename to reactos/dll/win32/kernel32/include/vdm.h

diff --git a/reactos/win32ss/base/kernel32/k32.h b/reactos/dll/win32/kernel32/k32.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/k32.h
rename to reactos/dll/win32/kernel32/k32.h

diff --git a/reactos/win32ss/base/kernel32/kernel32.rc b/reactos/dll/win32/kernel32/kernel32.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/kernel32.rc
rename to reactos/dll/win32/kernel32/kernel32.rc

diff --git a/reactos/win32ss/base/kernel32/kernel32.spec b/reactos/dll/win32/kernel32/kernel32.spec
similarity index 100%
rename from reactos/win32ss/base/kernel32/kernel32.spec
rename to reactos/dll/win32/kernel32/kernel32.spec

diff --git a/reactos/win32ss/base/kernel32/wine/actctx.c b/reactos/dll/win32/kernel32/wine/actctx.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/actctx.c
rename to reactos/dll/win32/kernel32/wine/actctx.c

diff --git a/reactos/win32ss/base/kernel32/wine/comm.c b/reactos/dll/win32/kernel32/wine/comm.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/comm.c
rename to reactos/dll/win32/kernel32/wine/comm.c

diff --git a/reactos/win32ss/base/kernel32/wine/lzexpand.c b/reactos/dll/win32/kernel32/wine/lzexpand.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/lzexpand.c
rename to reactos/dll/win32/kernel32/wine/lzexpand.c

diff --git a/reactos/win32ss/base/kernel32/wine/muldiv.c b/reactos/dll/win32/kernel32/wine/muldiv.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/muldiv.c
rename to reactos/dll/win32/kernel32/wine/muldiv.c

diff --git a/reactos/win32ss/base/kernel32/wine/profile.c b/reactos/dll/win32/kernel32/wine/profile.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/profile.c
rename to reactos/dll/win32/kernel32/wine/profile.c

diff --git a/reactos/win32ss/base/kernel32/wine/res.c b/reactos/dll/win32/kernel32/wine/res.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/res.c
rename to reactos/dll/win32/kernel32/wine/res.c

diff --git a/reactos/win32ss/base/kernel32/wine/timezone.c b/reactos/dll/win32/kernel32/wine/timezone.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/wine/timezone.c
rename to reactos/dll/win32/kernel32/wine/timezone.c

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/bg-BG.mc b/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/bg-BG.mc
rename to reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/cs-CZ.rc b/reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/cs-CZ.rc
rename to reactos/dll/win32/kernel32/winnls/lang/cs-CZ.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/de-DE.mc b/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/de-DE.mc
rename to reactos/dll/win32/kernel32/winnls/lang/de-DE.mc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/de-DE.rc b/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/de-DE.rc
rename to reactos/dll/win32/kernel32/winnls/lang/de-DE.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/en-US.rc b/reactos/dll/win32/kernel32/winnls/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/en-US.rc
rename to reactos/dll/win32/kernel32/winnls/lang/en-US.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/es-ES.rc b/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/es-ES.rc
rename to reactos/dll/win32/kernel32/winnls/lang/es-ES.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/fr-FR.rc b/reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/fr-FR.rc
rename to reactos/dll/win32/kernel32/winnls/lang/fr-FR.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/pl-PL.mc b/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/pl-PL.mc
rename to reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/ro-RO.rc b/reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/ro-RO.rc
rename to reactos/dll/win32/kernel32/winnls/lang/ro-RO.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/ru-RU.mc b/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/ru-RU.mc
rename to reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/ru-RU.rc b/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/ru-RU.rc
rename to reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/sq-AL.rc b/reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/sq-AL.rc
rename to reactos/dll/win32/kernel32/winnls/lang/sq-AL.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/tr-TR.rc b/reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/tr-TR.rc
rename to reactos/dll/win32/kernel32/winnls/lang/tr-TR.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/lang/uk-UA.rc b/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/lang/uk-UA.rc
rename to reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/locale_rc.rc b/reactos/dll/win32/kernel32/winnls/locale_rc.rc
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/locale_rc.rc
rename to reactos/dll/win32/kernel32/winnls/locale_rc.rc

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/afk.nls b/reactos/dll/win32/kernel32/winnls/nls/afk.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/afk.nls
rename to reactos/dll/win32/kernel32/winnls/nls/afk.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ara.nls b/reactos/dll/win32/kernel32/winnls/nls/ara.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ara.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ara.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arb.nls b/reactos/dll/win32/kernel32/winnls/nls/arb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/are.nls b/reactos/dll/win32/kernel32/winnls/nls/are.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/are.nls
rename to reactos/dll/win32/kernel32/winnls/nls/are.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arg.nls b/reactos/dll/win32/kernel32/winnls/nls/arg.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arg.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arg.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arh.nls b/reactos/dll/win32/kernel32/winnls/nls/arh.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arh.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arh.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ari.nls b/reactos/dll/win32/kernel32/winnls/nls/ari.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ari.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ari.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arj.nls b/reactos/dll/win32/kernel32/winnls/nls/arj.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arj.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arj.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ark.nls b/reactos/dll/win32/kernel32/winnls/nls/ark.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ark.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ark.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arl.nls b/reactos/dll/win32/kernel32/winnls/nls/arl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arm.nls b/reactos/dll/win32/kernel32/winnls/nls/arm.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arm.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arm.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/aro.nls b/reactos/dll/win32/kernel32/winnls/nls/aro.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/aro.nls
rename to reactos/dll/win32/kernel32/winnls/nls/aro.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/arq.nls b/reactos/dll/win32/kernel32/winnls/nls/arq.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/arq.nls
rename to reactos/dll/win32/kernel32/winnls/nls/arq.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ars.nls b/reactos/dll/win32/kernel32/winnls/nls/ars.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ars.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ars.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/art.nls b/reactos/dll/win32/kernel32/winnls/nls/art.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/art.nls
rename to reactos/dll/win32/kernel32/winnls/nls/art.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/aru.nls b/reactos/dll/win32/kernel32/winnls/nls/aru.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/aru.nls
rename to reactos/dll/win32/kernel32/winnls/nls/aru.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ary.nls b/reactos/dll/win32/kernel32/winnls/nls/ary.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ary.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ary.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/aze.nls b/reactos/dll/win32/kernel32/winnls/nls/aze.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/aze.nls
rename to reactos/dll/win32/kernel32/winnls/nls/aze.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/azl.nls b/reactos/dll/win32/kernel32/winnls/nls/azl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/azl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/azl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/bel.nls b/reactos/dll/win32/kernel32/winnls/nls/bel.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/bel.nls
rename to reactos/dll/win32/kernel32/winnls/nls/bel.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/bgr.nls b/reactos/dll/win32/kernel32/winnls/nls/bgr.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/bgr.nls
rename to reactos/dll/win32/kernel32/winnls/nls/bgr.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/brf.nls b/reactos/dll/win32/kernel32/winnls/nls/brf.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/brf.nls
rename to reactos/dll/win32/kernel32/winnls/nls/brf.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/cat.nls b/reactos/dll/win32/kernel32/winnls/nls/cat.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/cat.nls
rename to reactos/dll/win32/kernel32/winnls/nls/cat.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/chs.nls b/reactos/dll/win32/kernel32/winnls/nls/chs.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/chs.nls
rename to reactos/dll/win32/kernel32/winnls/nls/chs.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/cht.nls b/reactos/dll/win32/kernel32/winnls/nls/cht.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/cht.nls
rename to reactos/dll/win32/kernel32/winnls/nls/cht.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/csy.nls b/reactos/dll/win32/kernel32/winnls/nls/csy.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/csy.nls
rename to reactos/dll/win32/kernel32/winnls/nls/csy.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/cym.nls b/reactos/dll/win32/kernel32/winnls/nls/cym.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/cym.nls
rename to reactos/dll/win32/kernel32/winnls/nls/cym.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/dan.nls b/reactos/dll/win32/kernel32/winnls/nls/dan.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/dan.nls
rename to reactos/dll/win32/kernel32/winnls/nls/dan.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/dea.nls b/reactos/dll/win32/kernel32/winnls/nls/dea.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/dea.nls
rename to reactos/dll/win32/kernel32/winnls/nls/dea.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/dec.nls b/reactos/dll/win32/kernel32/winnls/nls/dec.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/dec.nls
rename to reactos/dll/win32/kernel32/winnls/nls/dec.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/del.nls b/reactos/dll/win32/kernel32/winnls/nls/del.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/del.nls
rename to reactos/dll/win32/kernel32/winnls/nls/del.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/des.nls b/reactos/dll/win32/kernel32/winnls/nls/des.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/des.nls
rename to reactos/dll/win32/kernel32/winnls/nls/des.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/deu.nls b/reactos/dll/win32/kernel32/winnls/nls/deu.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/deu.nls
rename to reactos/dll/win32/kernel32/winnls/nls/deu.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/div.nls b/reactos/dll/win32/kernel32/winnls/nls/div.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/div.nls
rename to reactos/dll/win32/kernel32/winnls/nls/div.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ell.nls b/reactos/dll/win32/kernel32/winnls/nls/ell.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ell.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ell.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ena.nls b/reactos/dll/win32/kernel32/winnls/nls/ena.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ena.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ena.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enb.nls b/reactos/dll/win32/kernel32/winnls/nls/enb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enc.nls b/reactos/dll/win32/kernel32/winnls/nls/enc.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enc.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enc.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/eng.nls b/reactos/dll/win32/kernel32/winnls/nls/eng.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/eng.nls
rename to reactos/dll/win32/kernel32/winnls/nls/eng.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/eni.nls b/reactos/dll/win32/kernel32/winnls/nls/eni.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/eni.nls
rename to reactos/dll/win32/kernel32/winnls/nls/eni.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enj.nls b/reactos/dll/win32/kernel32/winnls/nls/enj.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enj.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enj.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enl.nls b/reactos/dll/win32/kernel32/winnls/nls/enl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enp.nls b/reactos/dll/win32/kernel32/winnls/nls/enp.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enp.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enp.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ens.nls b/reactos/dll/win32/kernel32/winnls/nls/ens.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ens.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ens.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ent.nls b/reactos/dll/win32/kernel32/winnls/nls/ent.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ent.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ent.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enu.nls b/reactos/dll/win32/kernel32/winnls/nls/enu.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enu.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enu.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enw.nls b/reactos/dll/win32/kernel32/winnls/nls/enw.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enw.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enw.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/enz.nls b/reactos/dll/win32/kernel32/winnls/nls/enz.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/enz.nls
rename to reactos/dll/win32/kernel32/winnls/nls/enz.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esa.nls b/reactos/dll/win32/kernel32/winnls/nls/esa.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esa.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esa.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esb.nls b/reactos/dll/win32/kernel32/winnls/nls/esb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esc.nls b/reactos/dll/win32/kernel32/winnls/nls/esc.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esc.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esc.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esd.nls b/reactos/dll/win32/kernel32/winnls/nls/esd.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esd.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esd.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ese.nls b/reactos/dll/win32/kernel32/winnls/nls/ese.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ese.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ese.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esf.nls b/reactos/dll/win32/kernel32/winnls/nls/esf.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esf.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esf.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esg.nls b/reactos/dll/win32/kernel32/winnls/nls/esg.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esg.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esg.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esh.nls b/reactos/dll/win32/kernel32/winnls/nls/esh.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esh.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esh.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esi.nls b/reactos/dll/win32/kernel32/winnls/nls/esi.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esi.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esi.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esl.nls b/reactos/dll/win32/kernel32/winnls/nls/esl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esm.nls b/reactos/dll/win32/kernel32/winnls/nls/esm.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esm.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esm.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esn.nls b/reactos/dll/win32/kernel32/winnls/nls/esn.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esn.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esn.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/eso.nls b/reactos/dll/win32/kernel32/winnls/nls/eso.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/eso.nls
rename to reactos/dll/win32/kernel32/winnls/nls/eso.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esp.nls b/reactos/dll/win32/kernel32/winnls/nls/esp.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esp.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esp.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esr.nls b/reactos/dll/win32/kernel32/winnls/nls/esr.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esr.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esr.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ess.nls b/reactos/dll/win32/kernel32/winnls/nls/ess.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ess.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ess.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esu.nls b/reactos/dll/win32/kernel32/winnls/nls/esu.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esu.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esu.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esv.nls b/reactos/dll/win32/kernel32/winnls/nls/esv.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esv.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esv.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esy.nls b/reactos/dll/win32/kernel32/winnls/nls/esy.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esy.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esy.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/esz.nls b/reactos/dll/win32/kernel32/winnls/nls/esz.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/esz.nls
rename to reactos/dll/win32/kernel32/winnls/nls/esz.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/eti.nls b/reactos/dll/win32/kernel32/winnls/nls/eti.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/eti.nls
rename to reactos/dll/win32/kernel32/winnls/nls/eti.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/euq.nls b/reactos/dll/win32/kernel32/winnls/nls/euq.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/euq.nls
rename to reactos/dll/win32/kernel32/winnls/nls/euq.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/far.nls b/reactos/dll/win32/kernel32/winnls/nls/far.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/far.nls
rename to reactos/dll/win32/kernel32/winnls/nls/far.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/fin.nls b/reactos/dll/win32/kernel32/winnls/nls/fin.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/fin.nls
rename to reactos/dll/win32/kernel32/winnls/nls/fin.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/fos.nls b/reactos/dll/win32/kernel32/winnls/nls/fos.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/fos.nls
rename to reactos/dll/win32/kernel32/winnls/nls/fos.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/fra.nls b/reactos/dll/win32/kernel32/winnls/nls/fra.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/fra.nls
rename to reactos/dll/win32/kernel32/winnls/nls/fra.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/frb.nls b/reactos/dll/win32/kernel32/winnls/nls/frb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/frb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/frb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/frc.nls b/reactos/dll/win32/kernel32/winnls/nls/frc.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/frc.nls
rename to reactos/dll/win32/kernel32/winnls/nls/frc.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/frl.nls b/reactos/dll/win32/kernel32/winnls/nls/frl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/frl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/frl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/frm.nls b/reactos/dll/win32/kernel32/winnls/nls/frm.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/frm.nls
rename to reactos/dll/win32/kernel32/winnls/nls/frm.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/frs.nls b/reactos/dll/win32/kernel32/winnls/nls/frs.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/frs.nls
rename to reactos/dll/win32/kernel32/winnls/nls/frs.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/glc.nls b/reactos/dll/win32/kernel32/winnls/nls/glc.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/glc.nls
rename to reactos/dll/win32/kernel32/winnls/nls/glc.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/guj.nls b/reactos/dll/win32/kernel32/winnls/nls/guj.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/guj.nls
rename to reactos/dll/win32/kernel32/winnls/nls/guj.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/heb.nls b/reactos/dll/win32/kernel32/winnls/nls/heb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/heb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/heb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/hin.nls b/reactos/dll/win32/kernel32/winnls/nls/hin.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/hin.nls
rename to reactos/dll/win32/kernel32/winnls/nls/hin.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/hrv.nls b/reactos/dll/win32/kernel32/winnls/nls/hrv.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/hrv.nls
rename to reactos/dll/win32/kernel32/winnls/nls/hrv.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/hun.nls b/reactos/dll/win32/kernel32/winnls/nls/hun.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/hun.nls
rename to reactos/dll/win32/kernel32/winnls/nls/hun.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/hye.nls b/reactos/dll/win32/kernel32/winnls/nls/hye.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/hye.nls
rename to reactos/dll/win32/kernel32/winnls/nls/hye.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ind.nls b/reactos/dll/win32/kernel32/winnls/nls/ind.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ind.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ind.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/isl.nls b/reactos/dll/win32/kernel32/winnls/nls/isl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/isl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/isl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ita.nls b/reactos/dll/win32/kernel32/winnls/nls/ita.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ita.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ita.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/its.nls b/reactos/dll/win32/kernel32/winnls/nls/its.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/its.nls
rename to reactos/dll/win32/kernel32/winnls/nls/its.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/jpn.nls b/reactos/dll/win32/kernel32/winnls/nls/jpn.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/jpn.nls
rename to reactos/dll/win32/kernel32/winnls/nls/jpn.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/kan.nls b/reactos/dll/win32/kernel32/winnls/nls/kan.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/kan.nls
rename to reactos/dll/win32/kernel32/winnls/nls/kan.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/kat.nls b/reactos/dll/win32/kernel32/winnls/nls/kat.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/kat.nls
rename to reactos/dll/win32/kernel32/winnls/nls/kat.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/kkz.nls b/reactos/dll/win32/kernel32/winnls/nls/kkz.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/kkz.nls
rename to reactos/dll/win32/kernel32/winnls/nls/kkz.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/knk.nls b/reactos/dll/win32/kernel32/winnls/nls/knk.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/knk.nls
rename to reactos/dll/win32/kernel32/winnls/nls/knk.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/kor.nls b/reactos/dll/win32/kernel32/winnls/nls/kor.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/kor.nls
rename to reactos/dll/win32/kernel32/winnls/nls/kor.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/kyr.nls b/reactos/dll/win32/kernel32/winnls/nls/kyr.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/kyr.nls
rename to reactos/dll/win32/kernel32/winnls/nls/kyr.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/lth.nls b/reactos/dll/win32/kernel32/winnls/nls/lth.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/lth.nls
rename to reactos/dll/win32/kernel32/winnls/nls/lth.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/lvi.nls b/reactos/dll/win32/kernel32/winnls/nls/lvi.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/lvi.nls
rename to reactos/dll/win32/kernel32/winnls/nls/lvi.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/mar.nls b/reactos/dll/win32/kernel32/winnls/nls/mar.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/mar.nls
rename to reactos/dll/win32/kernel32/winnls/nls/mar.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/mki.nls b/reactos/dll/win32/kernel32/winnls/nls/mki.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/mki.nls
rename to reactos/dll/win32/kernel32/winnls/nls/mki.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/mon.nls b/reactos/dll/win32/kernel32/winnls/nls/mon.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/mon.nls
rename to reactos/dll/win32/kernel32/winnls/nls/mon.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/msb.nls b/reactos/dll/win32/kernel32/winnls/nls/msb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/msb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/msb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/msl.nls b/reactos/dll/win32/kernel32/winnls/nls/msl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/msl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/msl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/nlb.nls b/reactos/dll/win32/kernel32/winnls/nls/nlb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/nlb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/nlb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/nld.nls b/reactos/dll/win32/kernel32/winnls/nls/nld.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/nld.nls
rename to reactos/dll/win32/kernel32/winnls/nls/nld.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/non.nls b/reactos/dll/win32/kernel32/winnls/nls/non.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/non.nls
rename to reactos/dll/win32/kernel32/winnls/nls/non.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/nor.nls b/reactos/dll/win32/kernel32/winnls/nls/nor.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/nor.nls
rename to reactos/dll/win32/kernel32/winnls/nls/nor.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/pan.nls b/reactos/dll/win32/kernel32/winnls/nls/pan.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/pan.nls
rename to reactos/dll/win32/kernel32/winnls/nls/pan.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/plk.nls b/reactos/dll/win32/kernel32/winnls/nls/plk.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/plk.nls
rename to reactos/dll/win32/kernel32/winnls/nls/plk.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ptb.nls b/reactos/dll/win32/kernel32/winnls/nls/ptb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ptb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ptb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ptg.nls b/reactos/dll/win32/kernel32/winnls/nls/ptg.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ptg.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ptg.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/rmc.nls b/reactos/dll/win32/kernel32/winnls/nls/rmc.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/rmc.nls
rename to reactos/dll/win32/kernel32/winnls/nls/rmc.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/rom.nls b/reactos/dll/win32/kernel32/winnls/nls/rom.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/rom.nls
rename to reactos/dll/win32/kernel32/winnls/nls/rom.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/rus.nls b/reactos/dll/win32/kernel32/winnls/nls/rus.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/rus.nls
rename to reactos/dll/win32/kernel32/winnls/nls/rus.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/san.nls b/reactos/dll/win32/kernel32/winnls/nls/san.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/san.nls
rename to reactos/dll/win32/kernel32/winnls/nls/san.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/sky.nls b/reactos/dll/win32/kernel32/winnls/nls/sky.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/sky.nls
rename to reactos/dll/win32/kernel32/winnls/nls/sky.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/slv.nls b/reactos/dll/win32/kernel32/winnls/nls/slv.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/slv.nls
rename to reactos/dll/win32/kernel32/winnls/nls/slv.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/sqi.nls b/reactos/dll/win32/kernel32/winnls/nls/sqi.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/sqi.nls
rename to reactos/dll/win32/kernel32/winnls/nls/sqi.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/srb.nls b/reactos/dll/win32/kernel32/winnls/nls/srb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/srb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/srb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/srl.nls b/reactos/dll/win32/kernel32/winnls/nls/srl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/srl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/srl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/sve.nls b/reactos/dll/win32/kernel32/winnls/nls/sve.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/sve.nls
rename to reactos/dll/win32/kernel32/winnls/nls/sve.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/svf.nls b/reactos/dll/win32/kernel32/winnls/nls/svf.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/svf.nls
rename to reactos/dll/win32/kernel32/winnls/nls/svf.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/swk.nls b/reactos/dll/win32/kernel32/winnls/nls/swk.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/swk.nls
rename to reactos/dll/win32/kernel32/winnls/nls/swk.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/syr.nls b/reactos/dll/win32/kernel32/winnls/nls/syr.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/syr.nls
rename to reactos/dll/win32/kernel32/winnls/nls/syr.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/tam.nls b/reactos/dll/win32/kernel32/winnls/nls/tam.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/tam.nls
rename to reactos/dll/win32/kernel32/winnls/nls/tam.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/tel.nls b/reactos/dll/win32/kernel32/winnls/nls/tel.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/tel.nls
rename to reactos/dll/win32/kernel32/winnls/nls/tel.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/tha.nls b/reactos/dll/win32/kernel32/winnls/nls/tha.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/tha.nls
rename to reactos/dll/win32/kernel32/winnls/nls/tha.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/trk.nls b/reactos/dll/win32/kernel32/winnls/nls/trk.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/trk.nls
rename to reactos/dll/win32/kernel32/winnls/nls/trk.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ttt.nls b/reactos/dll/win32/kernel32/winnls/nls/ttt.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ttt.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ttt.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/ukr.nls b/reactos/dll/win32/kernel32/winnls/nls/ukr.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/ukr.nls
rename to reactos/dll/win32/kernel32/winnls/nls/ukr.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/urd.nls b/reactos/dll/win32/kernel32/winnls/nls/urd.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/urd.nls
rename to reactos/dll/win32/kernel32/winnls/nls/urd.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/uzb.nls b/reactos/dll/win32/kernel32/winnls/nls/uzb.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/uzb.nls
rename to reactos/dll/win32/kernel32/winnls/nls/uzb.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/uzl.nls b/reactos/dll/win32/kernel32/winnls/nls/uzl.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/uzl.nls
rename to reactos/dll/win32/kernel32/winnls/nls/uzl.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/vit.nls b/reactos/dll/win32/kernel32/winnls/nls/vit.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/vit.nls
rename to reactos/dll/win32/kernel32/winnls/nls/vit.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/zhh.nls b/reactos/dll/win32/kernel32/winnls/nls/zhh.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/zhh.nls
rename to reactos/dll/win32/kernel32/winnls/nls/zhh.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/zhi.nls b/reactos/dll/win32/kernel32/winnls/nls/zhi.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/zhi.nls
rename to reactos/dll/win32/kernel32/winnls/nls/zhi.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/nls/zhm.nls b/reactos/dll/win32/kernel32/winnls/nls/zhm.nls
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/nls/zhm.nls
rename to reactos/dll/win32/kernel32/winnls/nls/zhm.nls

diff --git a/reactos/win32ss/base/kernel32/winnls/string/casemap.c b/reactos/dll/win32/kernel32/winnls/string/casemap.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/casemap.c
rename to reactos/dll/win32/kernel32/winnls/string/casemap.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/collation.c b/reactos/dll/win32/kernel32/winnls/string/collation.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/collation.c
rename to reactos/dll/win32/kernel32/winnls/string/collation.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/fold.c b/reactos/dll/win32/kernel32/winnls/string/fold.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/fold.c
rename to reactos/dll/win32/kernel32/winnls/string/fold.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/format_msg.c b/reactos/dll/win32/kernel32/winnls/string/format_msg.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/format_msg.c
rename to reactos/dll/win32/kernel32/winnls/string/format_msg.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/lang.c b/reactos/dll/win32/kernel32/winnls/string/lang.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/lang.c
rename to reactos/dll/win32/kernel32/winnls/string/lang.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/lcformat.c b/reactos/dll/win32/kernel32/winnls/string/lcformat.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/lcformat.c
rename to reactos/dll/win32/kernel32/winnls/string/lcformat.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/lcformat_private.h b/reactos/dll/win32/kernel32/winnls/string/lcformat_private.h
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/lcformat_private.h
rename to reactos/dll/win32/kernel32/winnls/string/lcformat_private.h

diff --git a/reactos/win32ss/base/kernel32/winnls/string/lstring.c b/reactos/dll/win32/kernel32/winnls/string/lstring.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/lstring.c
rename to reactos/dll/win32/kernel32/winnls/string/lstring.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/nls.c b/reactos/dll/win32/kernel32/winnls/string/nls.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/nls.c
rename to reactos/dll/win32/kernel32/winnls/string/nls.c

diff --git a/reactos/win32ss/base/kernel32/winnls/string/sortkey.c b/reactos/dll/win32/kernel32/winnls/string/sortkey.c
similarity index 100%
rename from reactos/win32ss/base/kernel32/winnls/string/sortkey.c
rename to reactos/dll/win32/kernel32/winnls/string/sortkey.c

diff --git a/reactos/win32ss/base/kernel32_vista/CMakeLists.txt b/reactos/dll/win32/kernel32_vista/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/CMakeLists.txt
rename to reactos/dll/win32/kernel32_vista/CMakeLists.txt

diff --git a/reactos/win32ss/base/kernel32_vista/DllMain.c b/reactos/dll/win32/kernel32_vista/DllMain.c
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/DllMain.c
rename to reactos/dll/win32/kernel32_vista/DllMain.c

diff --git a/reactos/win32ss/base/kernel32_vista/GetTickCount64.c b/reactos/dll/win32/kernel32_vista/GetTickCount64.c
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/GetTickCount64.c
rename to reactos/dll/win32/kernel32_vista/GetTickCount64.c

diff --git a/reactos/win32ss/base/kernel32_vista/InitOnceExecuteOnce.c b/reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/InitOnceExecuteOnce.c
rename to reactos/dll/win32/kernel32_vista/InitOnceExecuteOnce.c

diff --git a/reactos/win32ss/base/kernel32_vista/k32_vista.h b/reactos/dll/win32/kernel32_vista/k32_vista.h
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/k32_vista.h
rename to reactos/dll/win32/kernel32_vista/k32_vista.h

diff --git a/reactos/win32ss/base/kernel32_vista/kernel32_vista.spec b/reactos/dll/win32/kernel32_vista/kernel32_vista.spec
similarity index 100%
rename from reactos/win32ss/base/kernel32_vista/kernel32_vista.spec
rename to reactos/dll/win32/kernel32_vista/kernel32_vista.spec

diff --git a/reactos/base/shell/ie/mshtml.tlb/CMakeLists.txt b/reactos/dll/win32/mshtml.tlb/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/mshtml.tlb/CMakeLists.txt
rename to reactos/dll/win32/mshtml.tlb/CMakeLists.txt

diff --git a/reactos/base/shell/ie/mshtml.tlb/mshtml.tlb.spec b/reactos/dll/win32/mshtml.tlb/mshtml.tlb.spec
similarity index 100%
rename from reactos/base/shell/ie/mshtml.tlb/mshtml.tlb.spec
rename to reactos/dll/win32/mshtml.tlb/mshtml.tlb.spec

diff --git a/reactos/base/shell/ie/mshtml.tlb/mshtml_tlb.idl b/reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl
similarity index 100%
rename from reactos/base/shell/ie/mshtml.tlb/mshtml_tlb.idl
rename to reactos/dll/win32/mshtml.tlb/mshtml_tlb.idl

diff --git a/reactos/base/shell/ie/mshtml.tlb/mshtml_tlb.rgs b/reactos/dll/win32/mshtml.tlb/mshtml_tlb.rgs
similarity index 100%
rename from reactos/base/shell/ie/mshtml.tlb/mshtml_tlb.rgs
rename to reactos/dll/win32/mshtml.tlb/mshtml_tlb.rgs

diff --git a/reactos/base/shell/ie/mshtml.tlb/rsrc.rc b/reactos/dll/win32/mshtml.tlb/rsrc.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml.tlb/rsrc.rc
rename to reactos/dll/win32/mshtml.tlb/rsrc.rc

diff --git a/reactos/base/shell/ie/mshtml/CMakeLists.txt b/reactos/dll/win32/mshtml/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/mshtml/CMakeLists.txt
rename to reactos/dll/win32/mshtml/CMakeLists.txt

diff --git a/reactos/base/shell/ie/mshtml/binding.h b/reactos/dll/win32/mshtml/binding.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/binding.h
rename to reactos/dll/win32/mshtml/binding.h

diff --git a/reactos/base/shell/ie/mshtml/blank.htm b/reactos/dll/win32/mshtml/blank.htm
similarity index 100%
rename from reactos/base/shell/ie/mshtml/blank.htm
rename to reactos/dll/win32/mshtml/blank.htm

diff --git a/reactos/base/shell/ie/mshtml/conpoint.c b/reactos/dll/win32/mshtml/conpoint.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/conpoint.c
rename to reactos/dll/win32/mshtml/conpoint.c

diff --git a/reactos/base/shell/ie/mshtml/dispex.c b/reactos/dll/win32/mshtml/dispex.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/dispex.c
rename to reactos/dll/win32/mshtml/dispex.c

diff --git a/reactos/base/shell/ie/mshtml/editor.c b/reactos/dll/win32/mshtml/editor.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/editor.c
rename to reactos/dll/win32/mshtml/editor.c

diff --git a/reactos/base/shell/ie/mshtml/guid.c b/reactos/dll/win32/mshtml/guid.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/guid.c
rename to reactos/dll/win32/mshtml/guid.c

diff --git a/reactos/base/shell/ie/mshtml/hlink.c b/reactos/dll/win32/mshtml/hlink.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/hlink.c
rename to reactos/dll/win32/mshtml/hlink.c

diff --git a/reactos/base/shell/ie/mshtml/htmlanchor.c b/reactos/dll/win32/mshtml/htmlanchor.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlanchor.c
rename to reactos/dll/win32/mshtml/htmlanchor.c

diff --git a/reactos/base/shell/ie/mshtml/htmlattr.c b/reactos/dll/win32/mshtml/htmlattr.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlattr.c
rename to reactos/dll/win32/mshtml/htmlattr.c

diff --git a/reactos/base/shell/ie/mshtml/htmlbody.c b/reactos/dll/win32/mshtml/htmlbody.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlbody.c
rename to reactos/dll/win32/mshtml/htmlbody.c

diff --git a/reactos/base/shell/ie/mshtml/htmlcomment.c b/reactos/dll/win32/mshtml/htmlcomment.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlcomment.c
rename to reactos/dll/win32/mshtml/htmlcomment.c

diff --git a/reactos/base/shell/ie/mshtml/htmlcurstyle.c b/reactos/dll/win32/mshtml/htmlcurstyle.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlcurstyle.c
rename to reactos/dll/win32/mshtml/htmlcurstyle.c

diff --git a/reactos/base/shell/ie/mshtml/htmldoc.c b/reactos/dll/win32/mshtml/htmldoc.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmldoc.c
rename to reactos/dll/win32/mshtml/htmldoc.c

diff --git a/reactos/base/shell/ie/mshtml/htmlelem.c b/reactos/dll/win32/mshtml/htmlelem.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlelem.c
rename to reactos/dll/win32/mshtml/htmlelem.c

diff --git a/reactos/base/shell/ie/mshtml/htmlelem2.c b/reactos/dll/win32/mshtml/htmlelem2.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlelem2.c
rename to reactos/dll/win32/mshtml/htmlelem2.c

diff --git a/reactos/base/shell/ie/mshtml/htmlelem3.c b/reactos/dll/win32/mshtml/htmlelem3.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlelem3.c
rename to reactos/dll/win32/mshtml/htmlelem3.c

diff --git a/reactos/base/shell/ie/mshtml/htmlelemcol.c b/reactos/dll/win32/mshtml/htmlelemcol.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlelemcol.c
rename to reactos/dll/win32/mshtml/htmlelemcol.c

diff --git a/reactos/base/shell/ie/mshtml/htmlembed.c b/reactos/dll/win32/mshtml/htmlembed.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlembed.c
rename to reactos/dll/win32/mshtml/htmlembed.c

diff --git a/reactos/base/shell/ie/mshtml/htmlevent.c b/reactos/dll/win32/mshtml/htmlevent.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlevent.c
rename to reactos/dll/win32/mshtml/htmlevent.c

diff --git a/reactos/base/shell/ie/mshtml/htmlevent.h b/reactos/dll/win32/mshtml/htmlevent.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlevent.h
rename to reactos/dll/win32/mshtml/htmlevent.h

diff --git a/reactos/base/shell/ie/mshtml/htmlform.c b/reactos/dll/win32/mshtml/htmlform.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlform.c
rename to reactos/dll/win32/mshtml/htmlform.c

diff --git a/reactos/base/shell/ie/mshtml/htmlframe.c b/reactos/dll/win32/mshtml/htmlframe.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlframe.c
rename to reactos/dll/win32/mshtml/htmlframe.c

diff --git a/reactos/base/shell/ie/mshtml/htmlframebase.c b/reactos/dll/win32/mshtml/htmlframebase.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlframebase.c
rename to reactos/dll/win32/mshtml/htmlframebase.c

diff --git a/reactos/base/shell/ie/mshtml/htmlgeneric.c b/reactos/dll/win32/mshtml/htmlgeneric.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlgeneric.c
rename to reactos/dll/win32/mshtml/htmlgeneric.c

diff --git a/reactos/base/shell/ie/mshtml/htmlhead.c b/reactos/dll/win32/mshtml/htmlhead.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlhead.c
rename to reactos/dll/win32/mshtml/htmlhead.c

diff --git a/reactos/base/shell/ie/mshtml/htmliframe.c b/reactos/dll/win32/mshtml/htmliframe.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmliframe.c
rename to reactos/dll/win32/mshtml/htmliframe.c

diff --git a/reactos/base/shell/ie/mshtml/htmlimg.c b/reactos/dll/win32/mshtml/htmlimg.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlimg.c
rename to reactos/dll/win32/mshtml/htmlimg.c

diff --git a/reactos/base/shell/ie/mshtml/htmlinput.c b/reactos/dll/win32/mshtml/htmlinput.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlinput.c
rename to reactos/dll/win32/mshtml/htmlinput.c

diff --git a/reactos/base/shell/ie/mshtml/htmllink.c b/reactos/dll/win32/mshtml/htmllink.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmllink.c
rename to reactos/dll/win32/mshtml/htmllink.c

diff --git a/reactos/base/shell/ie/mshtml/htmllocation.c b/reactos/dll/win32/mshtml/htmllocation.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmllocation.c
rename to reactos/dll/win32/mshtml/htmllocation.c

diff --git a/reactos/base/shell/ie/mshtml/htmlmeta.c b/reactos/dll/win32/mshtml/htmlmeta.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlmeta.c
rename to reactos/dll/win32/mshtml/htmlmeta.c

diff --git a/reactos/base/shell/ie/mshtml/htmlnode.c b/reactos/dll/win32/mshtml/htmlnode.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlnode.c
rename to reactos/dll/win32/mshtml/htmlnode.c

diff --git a/reactos/base/shell/ie/mshtml/htmlobject.c b/reactos/dll/win32/mshtml/htmlobject.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlobject.c
rename to reactos/dll/win32/mshtml/htmlobject.c

diff --git a/reactos/base/shell/ie/mshtml/htmloption.c b/reactos/dll/win32/mshtml/htmloption.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmloption.c
rename to reactos/dll/win32/mshtml/htmloption.c

diff --git a/reactos/base/shell/ie/mshtml/htmlscreen.c b/reactos/dll/win32/mshtml/htmlscreen.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlscreen.c
rename to reactos/dll/win32/mshtml/htmlscreen.c

diff --git a/reactos/base/shell/ie/mshtml/htmlscript.c b/reactos/dll/win32/mshtml/htmlscript.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlscript.c
rename to reactos/dll/win32/mshtml/htmlscript.c

diff --git a/reactos/base/shell/ie/mshtml/htmlscript.h b/reactos/dll/win32/mshtml/htmlscript.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlscript.h
rename to reactos/dll/win32/mshtml/htmlscript.h

diff --git a/reactos/base/shell/ie/mshtml/htmlselect.c b/reactos/dll/win32/mshtml/htmlselect.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlselect.c
rename to reactos/dll/win32/mshtml/htmlselect.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstorage.c b/reactos/dll/win32/mshtml/htmlstorage.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstorage.c
rename to reactos/dll/win32/mshtml/htmlstorage.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstyle.c b/reactos/dll/win32/mshtml/htmlstyle.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstyle.c
rename to reactos/dll/win32/mshtml/htmlstyle.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstyle.h b/reactos/dll/win32/mshtml/htmlstyle.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstyle.h
rename to reactos/dll/win32/mshtml/htmlstyle.h

diff --git a/reactos/base/shell/ie/mshtml/htmlstyle2.c b/reactos/dll/win32/mshtml/htmlstyle2.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstyle2.c
rename to reactos/dll/win32/mshtml/htmlstyle2.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstyle3.c b/reactos/dll/win32/mshtml/htmlstyle3.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstyle3.c
rename to reactos/dll/win32/mshtml/htmlstyle3.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstyleelem.c b/reactos/dll/win32/mshtml/htmlstyleelem.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstyleelem.c
rename to reactos/dll/win32/mshtml/htmlstyleelem.c

diff --git a/reactos/base/shell/ie/mshtml/htmlstylesheet.c b/reactos/dll/win32/mshtml/htmlstylesheet.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlstylesheet.c
rename to reactos/dll/win32/mshtml/htmlstylesheet.c

diff --git a/reactos/base/shell/ie/mshtml/htmltable.c b/reactos/dll/win32/mshtml/htmltable.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltable.c
rename to reactos/dll/win32/mshtml/htmltable.c

diff --git a/reactos/base/shell/ie/mshtml/htmltablecell.c b/reactos/dll/win32/mshtml/htmltablecell.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltablecell.c
rename to reactos/dll/win32/mshtml/htmltablecell.c

diff --git a/reactos/base/shell/ie/mshtml/htmltablerow.c b/reactos/dll/win32/mshtml/htmltablerow.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltablerow.c
rename to reactos/dll/win32/mshtml/htmltablerow.c

diff --git a/reactos/base/shell/ie/mshtml/htmltextarea.c b/reactos/dll/win32/mshtml/htmltextarea.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltextarea.c
rename to reactos/dll/win32/mshtml/htmltextarea.c

diff --git a/reactos/base/shell/ie/mshtml/htmltextcont.c b/reactos/dll/win32/mshtml/htmltextcont.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltextcont.c
rename to reactos/dll/win32/mshtml/htmltextcont.c

diff --git a/reactos/base/shell/ie/mshtml/htmltextnode.c b/reactos/dll/win32/mshtml/htmltextnode.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmltextnode.c
rename to reactos/dll/win32/mshtml/htmltextnode.c

diff --git a/reactos/base/shell/ie/mshtml/htmlwindow.c b/reactos/dll/win32/mshtml/htmlwindow.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/htmlwindow.c
rename to reactos/dll/win32/mshtml/htmlwindow.c

diff --git a/reactos/base/shell/ie/mshtml/ifacewrap.c b/reactos/dll/win32/mshtml/ifacewrap.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/ifacewrap.c
rename to reactos/dll/win32/mshtml/ifacewrap.c

diff --git a/reactos/base/shell/ie/mshtml/ipwindow.c b/reactos/dll/win32/mshtml/ipwindow.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/ipwindow.c
rename to reactos/dll/win32/mshtml/ipwindow.c

diff --git a/reactos/base/shell/ie/mshtml/lang/Bg.rc b/reactos/dll/win32/mshtml/lang/Bg.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Bg.rc
rename to reactos/dll/win32/mshtml/lang/Bg.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Da.rc b/reactos/dll/win32/mshtml/lang/Da.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Da.rc
rename to reactos/dll/win32/mshtml/lang/Da.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/De.rc b/reactos/dll/win32/mshtml/lang/De.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/De.rc
rename to reactos/dll/win32/mshtml/lang/De.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/En.rc b/reactos/dll/win32/mshtml/lang/En.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/En.rc
rename to reactos/dll/win32/mshtml/lang/En.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Es.rc b/reactos/dll/win32/mshtml/lang/Es.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Es.rc
rename to reactos/dll/win32/mshtml/lang/Es.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Fi.rc b/reactos/dll/win32/mshtml/lang/Fi.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Fi.rc
rename to reactos/dll/win32/mshtml/lang/Fi.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Fr.rc b/reactos/dll/win32/mshtml/lang/Fr.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Fr.rc
rename to reactos/dll/win32/mshtml/lang/Fr.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/He.rc b/reactos/dll/win32/mshtml/lang/He.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/He.rc
rename to reactos/dll/win32/mshtml/lang/He.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Hu.rc b/reactos/dll/win32/mshtml/lang/Hu.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Hu.rc
rename to reactos/dll/win32/mshtml/lang/Hu.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/It.rc b/reactos/dll/win32/mshtml/lang/It.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/It.rc
rename to reactos/dll/win32/mshtml/lang/It.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Ja.rc b/reactos/dll/win32/mshtml/lang/Ja.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Ja.rc
rename to reactos/dll/win32/mshtml/lang/Ja.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Ko.rc b/reactos/dll/win32/mshtml/lang/Ko.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Ko.rc
rename to reactos/dll/win32/mshtml/lang/Ko.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Lt.rc b/reactos/dll/win32/mshtml/lang/Lt.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Lt.rc
rename to reactos/dll/win32/mshtml/lang/Lt.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Nl.rc b/reactos/dll/win32/mshtml/lang/Nl.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Nl.rc
rename to reactos/dll/win32/mshtml/lang/Nl.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/No.rc b/reactos/dll/win32/mshtml/lang/No.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/No.rc
rename to reactos/dll/win32/mshtml/lang/No.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Pl.rc b/reactos/dll/win32/mshtml/lang/Pl.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Pl.rc
rename to reactos/dll/win32/mshtml/lang/Pl.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Pt.rc b/reactos/dll/win32/mshtml/lang/Pt.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Pt.rc
rename to reactos/dll/win32/mshtml/lang/Pt.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Ro.rc b/reactos/dll/win32/mshtml/lang/Ro.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Ro.rc
rename to reactos/dll/win32/mshtml/lang/Ro.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Ru.rc b/reactos/dll/win32/mshtml/lang/Ru.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Ru.rc
rename to reactos/dll/win32/mshtml/lang/Ru.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Si.rc b/reactos/dll/win32/mshtml/lang/Si.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Si.rc
rename to reactos/dll/win32/mshtml/lang/Si.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Sq.rc b/reactos/dll/win32/mshtml/lang/Sq.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Sq.rc
rename to reactos/dll/win32/mshtml/lang/Sq.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Sv.rc b/reactos/dll/win32/mshtml/lang/Sv.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Sv.rc
rename to reactos/dll/win32/mshtml/lang/Sv.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Tr.rc b/reactos/dll/win32/mshtml/lang/Tr.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Tr.rc
rename to reactos/dll/win32/mshtml/lang/Tr.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Uk.rc b/reactos/dll/win32/mshtml/lang/Uk.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Uk.rc
rename to reactos/dll/win32/mshtml/lang/Uk.rc

diff --git a/reactos/base/shell/ie/mshtml/lang/Zh.rc b/reactos/dll/win32/mshtml/lang/Zh.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/lang/Zh.rc
rename to reactos/dll/win32/mshtml/lang/Zh.rc

diff --git a/reactos/base/shell/ie/mshtml/loadopts.c b/reactos/dll/win32/mshtml/loadopts.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/loadopts.c
rename to reactos/dll/win32/mshtml/loadopts.c

diff --git a/reactos/base/shell/ie/mshtml/main.c b/reactos/dll/win32/mshtml/main.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/main.c
rename to reactos/dll/win32/mshtml/main.c

diff --git a/reactos/base/shell/ie/mshtml/mshtml.inf b/reactos/dll/win32/mshtml/mshtml.inf
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mshtml.inf
rename to reactos/dll/win32/mshtml/mshtml.inf

diff --git a/reactos/base/shell/ie/mshtml/mshtml.spec b/reactos/dll/win32/mshtml/mshtml.spec
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mshtml.spec
rename to reactos/dll/win32/mshtml/mshtml.spec

diff --git a/reactos/base/shell/ie/mshtml/mshtml_classes.idl b/reactos/dll/win32/mshtml/mshtml_classes.idl
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mshtml_classes.idl
rename to reactos/dll/win32/mshtml/mshtml_classes.idl

diff --git a/reactos/base/shell/ie/mshtml/mshtml_classes.rgs b/reactos/dll/win32/mshtml/mshtml_classes.rgs
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mshtml_classes.rgs
rename to reactos/dll/win32/mshtml/mshtml_classes.rgs

diff --git a/reactos/base/shell/ie/mshtml/mshtml_private.h b/reactos/dll/win32/mshtml/mshtml_private.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mshtml_private.h
rename to reactos/dll/win32/mshtml/mshtml_private.h

diff --git a/reactos/base/shell/ie/mshtml/msvc.S b/reactos/dll/win32/mshtml/msvc.S
similarity index 100%
rename from reactos/base/shell/ie/mshtml/msvc.S
rename to reactos/dll/win32/mshtml/msvc.S

diff --git a/reactos/base/shell/ie/mshtml/mutation.c b/reactos/dll/win32/mshtml/mutation.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/mutation.c
rename to reactos/dll/win32/mshtml/mutation.c

diff --git a/reactos/base/shell/ie/mshtml/navigate.c b/reactos/dll/win32/mshtml/navigate.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/navigate.c
rename to reactos/dll/win32/mshtml/navigate.c

diff --git a/reactos/base/shell/ie/mshtml/npplugin.c b/reactos/dll/win32/mshtml/npplugin.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/npplugin.c
rename to reactos/dll/win32/mshtml/npplugin.c

diff --git a/reactos/base/shell/ie/mshtml/nsembed.c b/reactos/dll/win32/mshtml/nsembed.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/nsembed.c
rename to reactos/dll/win32/mshtml/nsembed.c

diff --git a/reactos/base/shell/ie/mshtml/nsevents.c b/reactos/dll/win32/mshtml/nsevents.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/nsevents.c
rename to reactos/dll/win32/mshtml/nsevents.c

diff --git a/reactos/base/shell/ie/mshtml/nsiface.idl b/reactos/dll/win32/mshtml/nsiface.idl
similarity index 100%
rename from reactos/base/shell/ie/mshtml/nsiface.idl
rename to reactos/dll/win32/mshtml/nsiface.idl

diff --git a/reactos/base/shell/ie/mshtml/nsio.c b/reactos/dll/win32/mshtml/nsio.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/nsio.c
rename to reactos/dll/win32/mshtml/nsio.c

diff --git a/reactos/base/shell/ie/mshtml/nsservice.c b/reactos/dll/win32/mshtml/nsservice.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/nsservice.c
rename to reactos/dll/win32/mshtml/nsservice.c

diff --git a/reactos/base/shell/ie/mshtml/olecmd.c b/reactos/dll/win32/mshtml/olecmd.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/olecmd.c
rename to reactos/dll/win32/mshtml/olecmd.c

diff --git a/reactos/base/shell/ie/mshtml/oleobj.c b/reactos/dll/win32/mshtml/oleobj.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/oleobj.c
rename to reactos/dll/win32/mshtml/oleobj.c

diff --git a/reactos/base/shell/ie/mshtml/olewnd.c b/reactos/dll/win32/mshtml/olewnd.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/olewnd.c
rename to reactos/dll/win32/mshtml/olewnd.c

diff --git a/reactos/base/shell/ie/mshtml/omnavigator.c b/reactos/dll/win32/mshtml/omnavigator.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/omnavigator.c
rename to reactos/dll/win32/mshtml/omnavigator.c

diff --git a/reactos/base/shell/ie/mshtml/persist.c b/reactos/dll/win32/mshtml/persist.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/persist.c
rename to reactos/dll/win32/mshtml/persist.c

diff --git a/reactos/base/shell/ie/mshtml/pluginhost.c b/reactos/dll/win32/mshtml/pluginhost.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/pluginhost.c
rename to reactos/dll/win32/mshtml/pluginhost.c

diff --git a/reactos/base/shell/ie/mshtml/pluginhost.h b/reactos/dll/win32/mshtml/pluginhost.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/pluginhost.h
rename to reactos/dll/win32/mshtml/pluginhost.h

diff --git a/reactos/base/shell/ie/mshtml/propbag.c b/reactos/dll/win32/mshtml/propbag.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/propbag.c
rename to reactos/dll/win32/mshtml/propbag.c

diff --git a/reactos/base/shell/ie/mshtml/protocol.c b/reactos/dll/win32/mshtml/protocol.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/protocol.c
rename to reactos/dll/win32/mshtml/protocol.c

diff --git a/reactos/base/shell/ie/mshtml/resource.h b/reactos/dll/win32/mshtml/resource.h
similarity index 100%
rename from reactos/base/shell/ie/mshtml/resource.h
rename to reactos/dll/win32/mshtml/resource.h

diff --git a/reactos/base/shell/ie/mshtml/ros_diff.patch b/reactos/dll/win32/mshtml/ros_diff.patch
similarity index 100%
rename from reactos/base/shell/ie/mshtml/ros_diff.patch
rename to reactos/dll/win32/mshtml/ros_diff.patch

diff --git a/reactos/base/shell/ie/mshtml/rsrc.rc b/reactos/dll/win32/mshtml/rsrc.rc
similarity index 100%
rename from reactos/base/shell/ie/mshtml/rsrc.rc
rename to reactos/dll/win32/mshtml/rsrc.rc

diff --git a/reactos/base/shell/ie/mshtml/script.c b/reactos/dll/win32/mshtml/script.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/script.c
rename to reactos/dll/win32/mshtml/script.c

diff --git a/reactos/base/shell/ie/mshtml/secmgr.c b/reactos/dll/win32/mshtml/secmgr.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/secmgr.c
rename to reactos/dll/win32/mshtml/secmgr.c

diff --git a/reactos/base/shell/ie/mshtml/selection.c b/reactos/dll/win32/mshtml/selection.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/selection.c
rename to reactos/dll/win32/mshtml/selection.c

diff --git a/reactos/base/shell/ie/mshtml/service.c b/reactos/dll/win32/mshtml/service.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/service.c
rename to reactos/dll/win32/mshtml/service.c

diff --git a/reactos/base/shell/ie/mshtml/task.c b/reactos/dll/win32/mshtml/task.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/task.c
rename to reactos/dll/win32/mshtml/task.c

diff --git a/reactos/base/shell/ie/mshtml/txtrange.c b/reactos/dll/win32/mshtml/txtrange.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/txtrange.c
rename to reactos/dll/win32/mshtml/txtrange.c

diff --git a/reactos/base/shell/ie/mshtml/view.c b/reactos/dll/win32/mshtml/view.c
similarity index 100%
rename from reactos/base/shell/ie/mshtml/view.c
rename to reactos/dll/win32/mshtml/view.c

diff --git a/reactos/base/shell/ie/shdoclc/CMakeLists.txt b/reactos/dll/win32/shdoclc/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/CMakeLists.txt
rename to reactos/dll/win32/shdoclc/CMakeLists.txt

diff --git a/reactos/base/shell/ie/shdoclc/lang/Bg.rc b/reactos/dll/win32/shdoclc/lang/Bg.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Bg.rc
rename to reactos/dll/win32/shdoclc/lang/Bg.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Da.rc b/reactos/dll/win32/shdoclc/lang/Da.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Da.rc
rename to reactos/dll/win32/shdoclc/lang/Da.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/De.rc b/reactos/dll/win32/shdoclc/lang/De.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/De.rc
rename to reactos/dll/win32/shdoclc/lang/De.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/En.rc b/reactos/dll/win32/shdoclc/lang/En.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/En.rc
rename to reactos/dll/win32/shdoclc/lang/En.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Es.rc b/reactos/dll/win32/shdoclc/lang/Es.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Es.rc
rename to reactos/dll/win32/shdoclc/lang/Es.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Fi.rc b/reactos/dll/win32/shdoclc/lang/Fi.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Fi.rc
rename to reactos/dll/win32/shdoclc/lang/Fi.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Fr.rc b/reactos/dll/win32/shdoclc/lang/Fr.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Fr.rc
rename to reactos/dll/win32/shdoclc/lang/Fr.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/He.rc b/reactos/dll/win32/shdoclc/lang/He.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/He.rc
rename to reactos/dll/win32/shdoclc/lang/He.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Hu.rc b/reactos/dll/win32/shdoclc/lang/Hu.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Hu.rc
rename to reactos/dll/win32/shdoclc/lang/Hu.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/It.rc b/reactos/dll/win32/shdoclc/lang/It.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/It.rc
rename to reactos/dll/win32/shdoclc/lang/It.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Ja.rc b/reactos/dll/win32/shdoclc/lang/Ja.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Ja.rc
rename to reactos/dll/win32/shdoclc/lang/Ja.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Ko.rc b/reactos/dll/win32/shdoclc/lang/Ko.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Ko.rc
rename to reactos/dll/win32/shdoclc/lang/Ko.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Lt.rc b/reactos/dll/win32/shdoclc/lang/Lt.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Lt.rc
rename to reactos/dll/win32/shdoclc/lang/Lt.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Nl.rc b/reactos/dll/win32/shdoclc/lang/Nl.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Nl.rc
rename to reactos/dll/win32/shdoclc/lang/Nl.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/No.rc b/reactos/dll/win32/shdoclc/lang/No.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/No.rc
rename to reactos/dll/win32/shdoclc/lang/No.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Pl.rc b/reactos/dll/win32/shdoclc/lang/Pl.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Pl.rc
rename to reactos/dll/win32/shdoclc/lang/Pl.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Pt.rc b/reactos/dll/win32/shdoclc/lang/Pt.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Pt.rc
rename to reactos/dll/win32/shdoclc/lang/Pt.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Ro.rc b/reactos/dll/win32/shdoclc/lang/Ro.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Ro.rc
rename to reactos/dll/win32/shdoclc/lang/Ro.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Ru.rc b/reactos/dll/win32/shdoclc/lang/Ru.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Ru.rc
rename to reactos/dll/win32/shdoclc/lang/Ru.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Si.rc b/reactos/dll/win32/shdoclc/lang/Si.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Si.rc
rename to reactos/dll/win32/shdoclc/lang/Si.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Sq.rc b/reactos/dll/win32/shdoclc/lang/Sq.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Sq.rc
rename to reactos/dll/win32/shdoclc/lang/Sq.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Sv.rc b/reactos/dll/win32/shdoclc/lang/Sv.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Sv.rc
rename to reactos/dll/win32/shdoclc/lang/Sv.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Tr.rc b/reactos/dll/win32/shdoclc/lang/Tr.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Tr.rc
rename to reactos/dll/win32/shdoclc/lang/Tr.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Uk.rc b/reactos/dll/win32/shdoclc/lang/Uk.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Uk.rc
rename to reactos/dll/win32/shdoclc/lang/Uk.rc

diff --git a/reactos/base/shell/ie/shdoclc/lang/Zh.rc b/reactos/dll/win32/shdoclc/lang/Zh.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/lang/Zh.rc
rename to reactos/dll/win32/shdoclc/lang/Zh.rc

diff --git a/reactos/base/shell/ie/shdoclc/rsrc.rc b/reactos/dll/win32/shdoclc/rsrc.rc
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/rsrc.rc
rename to reactos/dll/win32/shdoclc/rsrc.rc

diff --git a/reactos/base/shell/ie/shdoclc/shdoclc.h b/reactos/dll/win32/shdoclc/shdoclc.h
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/shdoclc.h
rename to reactos/dll/win32/shdoclc/shdoclc.h

diff --git a/reactos/base/shell/ie/shdoclc/shdoclc.spec b/reactos/dll/win32/shdoclc/shdoclc.spec
similarity index 100%
rename from reactos/base/shell/ie/shdoclc/shdoclc.spec
rename to reactos/dll/win32/shdoclc/shdoclc.spec

diff --git a/reactos/base/shell/ie/shdocvw/CMakeLists.txt b/reactos/dll/win32/shdocvw/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/CMakeLists.txt
rename to reactos/dll/win32/shdocvw/CMakeLists.txt

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw.h b/reactos/dll/win32/shdocvw/shdocvw.h
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw.h
rename to reactos/dll/win32/shdocvw/shdocvw.h

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw.rc b/reactos/dll/win32/shdocvw/shdocvw.rc
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw.rc
rename to reactos/dll/win32/shdocvw/shdocvw.rc

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw.spec b/reactos/dll/win32/shdocvw/shdocvw.spec
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw.spec
rename to reactos/dll/win32/shdocvw/shdocvw.spec

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw_main.c b/reactos/dll/win32/shdocvw/shdocvw_main.c
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw_main.c
rename to reactos/dll/win32/shdocvw/shdocvw_main.c

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw_v1.idl b/reactos/dll/win32/shdocvw/shdocvw_v1.idl
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw_v1.idl
rename to reactos/dll/win32/shdocvw/shdocvw_v1.idl

diff --git a/reactos/base/shell/ie/shdocvw/shdocvw_v1.rgs b/reactos/dll/win32/shdocvw/shdocvw_v1.rgs
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shdocvw_v1.rgs
rename to reactos/dll/win32/shdocvw/shdocvw_v1.rgs

diff --git a/reactos/base/shell/ie/shdocvw/shlinstobj.c b/reactos/dll/win32/shdocvw/shlinstobj.c
similarity index 100%
rename from reactos/base/shell/ie/shdocvw/shlinstobj.c
rename to reactos/dll/win32/shdocvw/shlinstobj.c

diff --git a/reactos/base/shell/shell32/CDefView.cpp b/reactos/dll/win32/shell32/CDefView.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CDefView.cpp
rename to reactos/dll/win32/shell32/CDefView.cpp

diff --git a/reactos/base/shell/shell32/CDefaultContextMenu.cpp b/reactos/dll/win32/shell32/CDefaultContextMenu.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CDefaultContextMenu.cpp
rename to reactos/dll/win32/shell32/CDefaultContextMenu.cpp

diff --git a/reactos/base/shell/shell32/CDesktopBrowser.cpp b/reactos/dll/win32/shell32/CDesktopBrowser.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CDesktopBrowser.cpp
rename to reactos/dll/win32/shell32/CDesktopBrowser.cpp

diff --git a/reactos/base/shell/shell32/CDropTargetHelper.cpp b/reactos/dll/win32/shell32/CDropTargetHelper.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CDropTargetHelper.cpp
rename to reactos/dll/win32/shell32/CDropTargetHelper.cpp

diff --git a/reactos/base/shell/shell32/CDropTargetHelper.h b/reactos/dll/win32/shell32/CDropTargetHelper.h
similarity index 100%
rename from reactos/base/shell/shell32/CDropTargetHelper.h
rename to reactos/dll/win32/shell32/CDropTargetHelper.h

diff --git a/reactos/base/shell/shell32/CEnumIDListBase.cpp b/reactos/dll/win32/shell32/CEnumIDListBase.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CEnumIDListBase.cpp
rename to reactos/dll/win32/shell32/CEnumIDListBase.cpp

diff --git a/reactos/base/shell/shell32/CEnumIDListBase.h b/reactos/dll/win32/shell32/CEnumIDListBase.h
similarity index 100%
rename from reactos/base/shell/shell32/CEnumIDListBase.h
rename to reactos/dll/win32/shell32/CEnumIDListBase.h

diff --git a/reactos/base/shell/shell32/CExtractIcon.cpp b/reactos/dll/win32/shell32/CExtractIcon.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CExtractIcon.cpp
rename to reactos/dll/win32/shell32/CExtractIcon.cpp

diff --git a/reactos/base/shell/shell32/CFileSysBindData.cpp b/reactos/dll/win32/shell32/CFileSysBindData.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CFileSysBindData.cpp
rename to reactos/dll/win32/shell32/CFileSysBindData.cpp

diff --git a/reactos/base/shell/shell32/CIDLDataObj.cpp b/reactos/dll/win32/shell32/CIDLDataObj.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CIDLDataObj.cpp
rename to reactos/dll/win32/shell32/CIDLDataObj.cpp

diff --git a/reactos/base/shell/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shell32/CMakeLists.txt
rename to reactos/dll/win32/shell32/CMakeLists.txt

diff --git a/reactos/base/shell/shell32/CMenuBand.cpp b/reactos/dll/win32/shell32/CMenuBand.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CMenuBand.cpp
rename to reactos/dll/win32/shell32/CMenuBand.cpp

diff --git a/reactos/base/shell/shell32/CMenuBand.h b/reactos/dll/win32/shell32/CMenuBand.h
similarity index 100%
rename from reactos/base/shell/shell32/CMenuBand.h
rename to reactos/dll/win32/shell32/CMenuBand.h

diff --git a/reactos/base/shell/shell32/CMenuDeskBar.cpp b/reactos/dll/win32/shell32/CMenuDeskBar.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CMenuDeskBar.cpp
rename to reactos/dll/win32/shell32/CMenuDeskBar.cpp

diff --git a/reactos/base/shell/shell32/CMenuDeskBar.h b/reactos/dll/win32/shell32/CMenuDeskBar.h
similarity index 100%
rename from reactos/base/shell/shell32/CMenuDeskBar.h
rename to reactos/dll/win32/shell32/CMenuDeskBar.h

diff --git a/reactos/base/shell/shell32/CNewMenu.cpp b/reactos/dll/win32/shell32/CNewMenu.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CNewMenu.cpp
rename to reactos/dll/win32/shell32/CNewMenu.cpp

diff --git a/reactos/base/shell/shell32/CNewMenu.h b/reactos/dll/win32/shell32/CNewMenu.h
similarity index 100%
rename from reactos/base/shell/shell32/CNewMenu.h
rename to reactos/dll/win32/shell32/CNewMenu.h

diff --git a/reactos/base/shell/shell32/COpenWithMenu.cpp b/reactos/dll/win32/shell32/COpenWithMenu.cpp
similarity index 100%
rename from reactos/base/shell/shell32/COpenWithMenu.cpp
rename to reactos/dll/win32/shell32/COpenWithMenu.cpp

diff --git a/reactos/base/shell/shell32/COpenWithMenu.h b/reactos/dll/win32/shell32/COpenWithMenu.h
similarity index 100%
rename from reactos/base/shell/shell32/COpenWithMenu.h
rename to reactos/dll/win32/shell32/COpenWithMenu.h

diff --git a/reactos/base/shell/shell32/CShellItem.cpp b/reactos/dll/win32/shell32/CShellItem.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CShellItem.cpp
rename to reactos/dll/win32/shell32/CShellItem.cpp

diff --git a/reactos/base/shell/shell32/CShellItem.h b/reactos/dll/win32/shell32/CShellItem.h
similarity index 100%
rename from reactos/base/shell/shell32/CShellItem.h
rename to reactos/dll/win32/shell32/CShellItem.h

diff --git a/reactos/base/shell/shell32/CShellLink.cpp b/reactos/dll/win32/shell32/CShellLink.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CShellLink.cpp
rename to reactos/dll/win32/shell32/CShellLink.cpp

diff --git a/reactos/base/shell/shell32/CShellLink.h b/reactos/dll/win32/shell32/CShellLink.h
similarity index 100%
rename from reactos/base/shell/shell32/CShellLink.h
rename to reactos/dll/win32/shell32/CShellLink.h

diff --git a/reactos/base/shell/shell32/CStartMenu.cpp b/reactos/dll/win32/shell32/CStartMenu.cpp
similarity index 100%
rename from reactos/base/shell/shell32/CStartMenu.cpp
rename to reactos/dll/win32/shell32/CStartMenu.cpp

diff --git a/reactos/base/shell/shell32/CStartMenu.h b/reactos/dll/win32/shell32/CStartMenu.h
similarity index 100%
rename from reactos/base/shell/shell32/CStartMenu.h
rename to reactos/dll/win32/shell32/CStartMenu.h

diff --git a/reactos/base/shell/shell32/avi_res.rc b/reactos/dll/win32/shell32/avi_res.rc
similarity index 100%
rename from reactos/base/shell/shell32/avi_res.rc
rename to reactos/dll/win32/shell32/avi_res.rc

diff --git a/reactos/base/shell/shell32/bitmap_res.rc b/reactos/dll/win32/shell32/bitmap_res.rc
similarity index 100%
rename from reactos/base/shell/shell32/bitmap_res.rc
rename to reactos/dll/win32/shell32/bitmap_res.rc

diff --git a/reactos/base/shell/shell32/cpanel.h b/reactos/dll/win32/shell32/cpanel.h
similarity index 100%
rename from reactos/base/shell/shell32/cpanel.h
rename to reactos/dll/win32/shell32/cpanel.h

diff --git a/reactos/base/shell/shell32/dde.cpp b/reactos/dll/win32/shell32/dde.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dde.cpp
rename to reactos/dll/win32/shell32/dde.cpp

diff --git a/reactos/base/shell/shell32/debughlp.cpp b/reactos/dll/win32/shell32/debughlp.cpp
similarity index 100%
rename from reactos/base/shell/shell32/debughlp.cpp
rename to reactos/dll/win32/shell32/debughlp.cpp

diff --git a/reactos/base/shell/shell32/debughlp.h b/reactos/dll/win32/shell32/debughlp.h
similarity index 100%
rename from reactos/base/shell/shell32/debughlp.h
rename to reactos/dll/win32/shell32/debughlp.h

diff --git a/reactos/base/shell/shell32/dialogs/dialogs.cpp b/reactos/dll/win32/shell32/dialogs/dialogs.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/dialogs.cpp
rename to reactos/dll/win32/shell32/dialogs/dialogs.cpp

diff --git a/reactos/base/shell/shell32/dialogs/drive.cpp b/reactos/dll/win32/shell32/dialogs/drive.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/drive.cpp
rename to reactos/dll/win32/shell32/dialogs/drive.cpp

diff --git a/reactos/base/shell/shell32/dialogs/drvdefext.cpp b/reactos/dll/win32/shell32/dialogs/drvdefext.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/drvdefext.cpp
rename to reactos/dll/win32/shell32/dialogs/drvdefext.cpp

diff --git a/reactos/base/shell/shell32/dialogs/filedefext.cpp b/reactos/dll/win32/shell32/dialogs/filedefext.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/filedefext.cpp
rename to reactos/dll/win32/shell32/dialogs/filedefext.cpp

diff --git a/reactos/base/shell/shell32/dialogs/folder_options.cpp b/reactos/dll/win32/shell32/dialogs/folder_options.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/folder_options.cpp
rename to reactos/dll/win32/shell32/dialogs/folder_options.cpp

diff --git a/reactos/base/shell/shell32/dialogs/fprop.cpp b/reactos/dll/win32/shell32/dialogs/fprop.cpp
similarity index 100%
rename from reactos/base/shell/shell32/dialogs/fprop.cpp
rename to reactos/dll/win32/shell32/dialogs/fprop.cpp

diff --git a/reactos/base/shell/shell32/droptargets/CexeDropHandler.cpp b/reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp
similarity index 100%
rename from reactos/base/shell/shell32/droptargets/CexeDropHandler.cpp
rename to reactos/dll/win32/shell32/droptargets/CexeDropHandler.cpp

diff --git a/reactos/base/shell/shell32/droptargets/CexeDropHandler.h b/reactos/dll/win32/shell32/droptargets/CexeDropHandler.h
similarity index 100%
rename from reactos/base/shell/shell32/droptargets/CexeDropHandler.h
rename to reactos/dll/win32/shell32/droptargets/CexeDropHandler.h

diff --git a/reactos/base/shell/shell32/drvdefext.h b/reactos/dll/win32/shell32/drvdefext.h
similarity index 100%
rename from reactos/base/shell/shell32/drvdefext.h
rename to reactos/dll/win32/shell32/drvdefext.h

diff --git a/reactos/base/shell/shell32/filedefext.h b/reactos/dll/win32/shell32/filedefext.h
similarity index 100%
rename from reactos/base/shell/shell32/filedefext.h
rename to reactos/dll/win32/shell32/filedefext.h

diff --git a/reactos/base/shell/shell32/folders.cpp b/reactos/dll/win32/shell32/folders.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders.cpp
rename to reactos/dll/win32/shell32/folders.cpp

diff --git a/reactos/base/shell/shell32/folders/CAdminToolsFolder.cpp b/reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CAdminToolsFolder.cpp
rename to reactos/dll/win32/shell32/folders/CAdminToolsFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CAdminToolsFolder.h b/reactos/dll/win32/shell32/folders/CAdminToolsFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CAdminToolsFolder.h
rename to reactos/dll/win32/shell32/folders/CAdminToolsFolder.h

diff --git a/reactos/base/shell/shell32/folders/CControlPanelFolder.cpp b/reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CControlPanelFolder.cpp
rename to reactos/dll/win32/shell32/folders/CControlPanelFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CControlPanelFolder.h b/reactos/dll/win32/shell32/folders/CControlPanelFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CControlPanelFolder.h
rename to reactos/dll/win32/shell32/folders/CControlPanelFolder.h

diff --git a/reactos/base/shell/shell32/folders/CDesktopFolder.cpp b/reactos/dll/win32/shell32/folders/CDesktopFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CDesktopFolder.cpp
rename to reactos/dll/win32/shell32/folders/CDesktopFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CDesktopFolder.h b/reactos/dll/win32/shell32/folders/CDesktopFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CDesktopFolder.h
rename to reactos/dll/win32/shell32/folders/CDesktopFolder.h

diff --git a/reactos/base/shell/shell32/folders/CDrivesFolder.cpp b/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CDrivesFolder.cpp
rename to reactos/dll/win32/shell32/folders/CDrivesFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CDrivesFolder.h b/reactos/dll/win32/shell32/folders/CDrivesFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CDrivesFolder.h
rename to reactos/dll/win32/shell32/folders/CDrivesFolder.h

diff --git a/reactos/base/shell/shell32/folders/CFSFolder.cpp b/reactos/dll/win32/shell32/folders/CFSFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CFSFolder.cpp
rename to reactos/dll/win32/shell32/folders/CFSFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CFSFolder.h b/reactos/dll/win32/shell32/folders/CFSFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CFSFolder.h
rename to reactos/dll/win32/shell32/folders/CFSFolder.h

diff --git a/reactos/base/shell/shell32/folders/CFontsFolder.cpp b/reactos/dll/win32/shell32/folders/CFontsFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CFontsFolder.cpp
rename to reactos/dll/win32/shell32/folders/CFontsFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CFontsFolder.h b/reactos/dll/win32/shell32/folders/CFontsFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CFontsFolder.h
rename to reactos/dll/win32/shell32/folders/CFontsFolder.h

diff --git a/reactos/base/shell/shell32/folders/CMyDocsFolder.cpp b/reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CMyDocsFolder.cpp
rename to reactos/dll/win32/shell32/folders/CMyDocsFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CMyDocsFolder.h b/reactos/dll/win32/shell32/folders/CMyDocsFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CMyDocsFolder.h
rename to reactos/dll/win32/shell32/folders/CMyDocsFolder.h

diff --git a/reactos/base/shell/shell32/folders/CNetFolder.cpp b/reactos/dll/win32/shell32/folders/CNetFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CNetFolder.cpp
rename to reactos/dll/win32/shell32/folders/CNetFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CNetFolder.h b/reactos/dll/win32/shell32/folders/CNetFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CNetFolder.h
rename to reactos/dll/win32/shell32/folders/CNetFolder.h

diff --git a/reactos/base/shell/shell32/folders/CPrinterFolder.cpp b/reactos/dll/win32/shell32/folders/CPrinterFolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CPrinterFolder.cpp
rename to reactos/dll/win32/shell32/folders/CPrinterFolder.cpp

diff --git a/reactos/base/shell/shell32/folders/CPrinterFolder.h b/reactos/dll/win32/shell32/folders/CPrinterFolder.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CPrinterFolder.h
rename to reactos/dll/win32/shell32/folders/CPrinterFolder.h

diff --git a/reactos/base/shell/shell32/folders/CRecycleBin.cpp b/reactos/dll/win32/shell32/folders/CRecycleBin.cpp
similarity index 100%
rename from reactos/base/shell/shell32/folders/CRecycleBin.cpp
rename to reactos/dll/win32/shell32/folders/CRecycleBin.cpp

diff --git a/reactos/base/shell/shell32/folders/CRecycleBin.h b/reactos/dll/win32/shell32/folders/CRecycleBin.h
similarity index 100%
rename from reactos/base/shell/shell32/folders/CRecycleBin.h
rename to reactos/dll/win32/shell32/folders/CRecycleBin.h

diff --git a/reactos/base/shell/shell32/icon_res.rc b/reactos/dll/win32/shell32/icon_res.rc
similarity index 100%
rename from reactos/base/shell/shell32/icon_res.rc
rename to reactos/dll/win32/shell32/icon_res.rc

diff --git a/reactos/base/shell/shell32/iconcache.cpp b/reactos/dll/win32/shell32/iconcache.cpp
similarity index 100%
rename from reactos/base/shell/shell32/iconcache.cpp
rename to reactos/dll/win32/shell32/iconcache.cpp

diff --git a/reactos/base/shell/shell32/lang/bg-BG.rc b/reactos/dll/win32/shell32/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/bg-BG.rc
rename to reactos/dll/win32/shell32/lang/bg-BG.rc

diff --git a/reactos/base/shell/shell32/lang/ca-ES.rc b/reactos/dll/win32/shell32/lang/ca-ES.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/ca-ES.rc
rename to reactos/dll/win32/shell32/lang/ca-ES.rc

diff --git a/reactos/base/shell/shell32/lang/cs-CZ.rc b/reactos/dll/win32/shell32/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/cs-CZ.rc
rename to reactos/dll/win32/shell32/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shell32/lang/da-DK.rc b/reactos/dll/win32/shell32/lang/da-DK.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/da-DK.rc
rename to reactos/dll/win32/shell32/lang/da-DK.rc

diff --git a/reactos/base/shell/shell32/lang/de-DE.rc b/reactos/dll/win32/shell32/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/de-DE.rc
rename to reactos/dll/win32/shell32/lang/de-DE.rc

diff --git a/reactos/base/shell/shell32/lang/el-GR.rc b/reactos/dll/win32/shell32/lang/el-GR.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/el-GR.rc
rename to reactos/dll/win32/shell32/lang/el-GR.rc

diff --git a/reactos/base/shell/shell32/lang/en-GB.rc b/reactos/dll/win32/shell32/lang/en-GB.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/en-GB.rc
rename to reactos/dll/win32/shell32/lang/en-GB.rc

diff --git a/reactos/base/shell/shell32/lang/en-US.rc b/reactos/dll/win32/shell32/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/en-US.rc
rename to reactos/dll/win32/shell32/lang/en-US.rc

diff --git a/reactos/base/shell/shell32/lang/es-ES.rc b/reactos/dll/win32/shell32/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/es-ES.rc
rename to reactos/dll/win32/shell32/lang/es-ES.rc

diff --git a/reactos/base/shell/shell32/lang/fi-FI.rc b/reactos/dll/win32/shell32/lang/fi-FI.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/fi-FI.rc
rename to reactos/dll/win32/shell32/lang/fi-FI.rc

diff --git a/reactos/base/shell/shell32/lang/fr-FR.rc b/reactos/dll/win32/shell32/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/fr-FR.rc
rename to reactos/dll/win32/shell32/lang/fr-FR.rc

diff --git a/reactos/base/shell/shell32/lang/he-IL.rc b/reactos/dll/win32/shell32/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/he-IL.rc
rename to reactos/dll/win32/shell32/lang/he-IL.rc

diff --git a/reactos/base/shell/shell32/lang/hu-HU.rc b/reactos/dll/win32/shell32/lang/hu-HU.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/hu-HU.rc
rename to reactos/dll/win32/shell32/lang/hu-HU.rc

diff --git a/reactos/base/shell/shell32/lang/it-IT.rc b/reactos/dll/win32/shell32/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/it-IT.rc
rename to reactos/dll/win32/shell32/lang/it-IT.rc

diff --git a/reactos/base/shell/shell32/lang/ja-JP.rc b/reactos/dll/win32/shell32/lang/ja-JP.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/ja-JP.rc
rename to reactos/dll/win32/shell32/lang/ja-JP.rc

diff --git a/reactos/base/shell/shell32/lang/ko-KR.rc b/reactos/dll/win32/shell32/lang/ko-KR.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/ko-KR.rc
rename to reactos/dll/win32/shell32/lang/ko-KR.rc

diff --git a/reactos/base/shell/shell32/lang/nl-NL.rc b/reactos/dll/win32/shell32/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/nl-NL.rc
rename to reactos/dll/win32/shell32/lang/nl-NL.rc

diff --git a/reactos/base/shell/shell32/lang/no-NO.rc b/reactos/dll/win32/shell32/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/no-NO.rc
rename to reactos/dll/win32/shell32/lang/no-NO.rc

diff --git a/reactos/base/shell/shell32/lang/pl-PL.rc b/reactos/dll/win32/shell32/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/pl-PL.rc
rename to reactos/dll/win32/shell32/lang/pl-PL.rc

diff --git a/reactos/base/shell/shell32/lang/pt-BR.rc b/reactos/dll/win32/shell32/lang/pt-BR.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/pt-BR.rc
rename to reactos/dll/win32/shell32/lang/pt-BR.rc

diff --git a/reactos/base/shell/shell32/lang/pt-PT.rc b/reactos/dll/win32/shell32/lang/pt-PT.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/pt-PT.rc
rename to reactos/dll/win32/shell32/lang/pt-PT.rc

diff --git a/reactos/base/shell/shell32/lang/ro-RO.rc b/reactos/dll/win32/shell32/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/ro-RO.rc
rename to reactos/dll/win32/shell32/lang/ro-RO.rc

diff --git a/reactos/base/shell/shell32/lang/ru-RU.rc b/reactos/dll/win32/shell32/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/ru-RU.rc
rename to reactos/dll/win32/shell32/lang/ru-RU.rc

diff --git a/reactos/base/shell/shell32/lang/sk-SK.rc b/reactos/dll/win32/shell32/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/sk-SK.rc
rename to reactos/dll/win32/shell32/lang/sk-SK.rc

diff --git a/reactos/base/shell/shell32/lang/sl-SI.rc b/reactos/dll/win32/shell32/lang/sl-SI.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/sl-SI.rc
rename to reactos/dll/win32/shell32/lang/sl-SI.rc

diff --git a/reactos/base/shell/shell32/lang/sq-AL.rc b/reactos/dll/win32/shell32/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/sq-AL.rc
rename to reactos/dll/win32/shell32/lang/sq-AL.rc

diff --git a/reactos/base/shell/shell32/lang/sv-SE.rc b/reactos/dll/win32/shell32/lang/sv-SE.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/sv-SE.rc
rename to reactos/dll/win32/shell32/lang/sv-SE.rc

diff --git a/reactos/base/shell/shell32/lang/tr-TR.rc b/reactos/dll/win32/shell32/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/tr-TR.rc
rename to reactos/dll/win32/shell32/lang/tr-TR.rc

diff --git a/reactos/base/shell/shell32/lang/uk-UA.rc b/reactos/dll/win32/shell32/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/uk-UA.rc
rename to reactos/dll/win32/shell32/lang/uk-UA.rc

diff --git a/reactos/base/shell/shell32/lang/zh-CN.rc b/reactos/dll/win32/shell32/lang/zh-CN.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/zh-CN.rc
rename to reactos/dll/win32/shell32/lang/zh-CN.rc

diff --git a/reactos/base/shell/shell32/lang/zh-TW.rc b/reactos/dll/win32/shell32/lang/zh-TW.rc
similarity index 100%
rename from reactos/base/shell/shell32/lang/zh-TW.rc
rename to reactos/dll/win32/shell32/lang/zh-TW.rc

diff --git a/reactos/base/shell/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h
similarity index 100%
rename from reactos/base/shell/shell32/precomp.h
rename to reactos/dll/win32/shell32/precomp.h

diff --git a/reactos/base/shell/shell32/res/avis/160+161+167+168.avi b/reactos/dll/win32/shell32/res/avis/160+161+167+168.avi
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/160+161+167+168.avi
rename to reactos/dll/win32/shell32/res/avis/160+161+167+168.avi

diff --git a/reactos/base/shell/shell32/res/avis/162.avi b/reactos/dll/win32/shell32/res/avis/162.avi
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/162.avi
rename to reactos/dll/win32/shell32/res/avis/162.avi

diff --git a/reactos/base/shell/shell32/res/avis/163.avi b/reactos/dll/win32/shell32/res/avis/163.avi
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/163.avi
rename to reactos/dll/win32/shell32/res/avis/163.avi

diff --git a/reactos/base/shell/shell32/res/avis/164+169.avi b/reactos/dll/win32/shell32/res/avis/164+169.avi
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/164+169.avi
rename to reactos/dll/win32/shell32/res/avis/164+169.avi

diff --git a/reactos/base/shell/shell32/res/avis/170.avi b/reactos/dll/win32/shell32/res/avis/170.avi
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/170.avi
rename to reactos/dll/win32/shell32/res/avis/170.avi

diff --git a/reactos/base/shell/shell32/res/avis/Licence/COPYING b/reactos/dll/win32/shell32/res/avis/Licence/COPYING
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/Licence/COPYING
rename to reactos/dll/win32/shell32/res/avis/Licence/COPYING

diff --git a/reactos/base/shell/shell32/res/avis/Licence/Tango.txt b/reactos/dll/win32/shell32/res/avis/Licence/Tango.txt
similarity index 100%
rename from reactos/base/shell/shell32/res/avis/Licence/Tango.txt
rename to reactos/dll/win32/shell32/res/avis/Licence/Tango.txt

diff --git a/reactos/base/shell/shell32/res/bitmaps/204.bmp b/reactos/dll/win32/shell32/res/bitmaps/204.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/204.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/204.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/205.bmp b/reactos/dll/win32/shell32/res/bitmaps/205.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/205.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/205.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/206.bmp b/reactos/dll/win32/shell32/res/bitmaps/206.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/206.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/206.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/207.bmp b/reactos/dll/win32/shell32/res/bitmaps/207.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/207.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/207.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/214.bmp b/reactos/dll/win32/shell32/res/bitmaps/214.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/214.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/214.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/215.bmp b/reactos/dll/win32/shell32/res/bitmaps/215.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/215.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/215.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/216.bmp b/reactos/dll/win32/shell32/res/bitmaps/216.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/216.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/216.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/217.bmp b/reactos/dll/win32/shell32/res/bitmaps/217.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/217.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/217.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/225.bmp b/reactos/dll/win32/shell32/res/bitmaps/225.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/225.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/225.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/226.bmp b/reactos/dll/win32/shell32/res/bitmaps/226.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/226.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/226.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/227.bmp b/reactos/dll/win32/shell32/res/bitmaps/227.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/227.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/227.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/228.bmp b/reactos/dll/win32/shell32/res/bitmaps/228.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/228.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/228.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/230.bmp b/reactos/dll/win32/shell32/res/bitmaps/230.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/230.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/230.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/231.bmp b/reactos/dll/win32/shell32/res/bitmaps/231.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/231.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/231.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/240.bmp b/reactos/dll/win32/shell32/res/bitmaps/240.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/240.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/240.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/241.bmp b/reactos/dll/win32/shell32/res/bitmaps/241.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/241.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/241.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/242.bmp b/reactos/dll/win32/shell32/res/bitmaps/242.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/242.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/242.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/245.bmp b/reactos/dll/win32/shell32/res/bitmaps/245.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/245.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/245.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/246.bmp b/reactos/dll/win32/shell32/res/bitmaps/246.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/246.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/246.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/247.bmp b/reactos/dll/win32/shell32/res/bitmaps/247.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/247.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/247.bmp

diff --git a/reactos/base/shell/shell32/res/bitmaps/reactos.bmp b/reactos/dll/win32/shell32/res/bitmaps/reactos.bmp
similarity index 100%
rename from reactos/base/shell/shell32/res/bitmaps/reactos.bmp
rename to reactos/dll/win32/shell32/res/bitmaps/reactos.bmp

diff --git a/reactos/base/shell/shell32/res/icons/1.ico b/reactos/dll/win32/shell32/res/icons/1.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/1.ico
rename to reactos/dll/win32/shell32/res/icons/1.ico

diff --git a/reactos/base/shell/shell32/res/icons/10.ico b/reactos/dll/win32/shell32/res/icons/10.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/10.ico
rename to reactos/dll/win32/shell32/res/icons/10.ico

diff --git a/reactos/base/shell/shell32/res/icons/1001.ico b/reactos/dll/win32/shell32/res/icons/1001.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/1001.ico
rename to reactos/dll/win32/shell32/res/icons/1001.ico

diff --git a/reactos/base/shell/shell32/res/icons/1004.ico b/reactos/dll/win32/shell32/res/icons/1004.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/1004.ico
rename to reactos/dll/win32/shell32/res/icons/1004.ico

diff --git a/reactos/base/shell/shell32/res/icons/11.ico b/reactos/dll/win32/shell32/res/icons/11.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/11.ico
rename to reactos/dll/win32/shell32/res/icons/11.ico

diff --git a/reactos/base/shell/shell32/res/icons/12.ico b/reactos/dll/win32/shell32/res/icons/12.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/12.ico
rename to reactos/dll/win32/shell32/res/icons/12.ico

diff --git a/reactos/base/shell/shell32/res/icons/13.ico b/reactos/dll/win32/shell32/res/icons/13.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/13.ico
rename to reactos/dll/win32/shell32/res/icons/13.ico

diff --git a/reactos/base/shell/shell32/res/icons/134.ico b/reactos/dll/win32/shell32/res/icons/134.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/134.ico
rename to reactos/dll/win32/shell32/res/icons/134.ico

diff --git a/reactos/base/shell/shell32/res/icons/135.ico b/reactos/dll/win32/shell32/res/icons/135.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/135.ico
rename to reactos/dll/win32/shell32/res/icons/135.ico

diff --git a/reactos/base/shell/shell32/res/icons/137.ico b/reactos/dll/win32/shell32/res/icons/137.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/137.ico
rename to reactos/dll/win32/shell32/res/icons/137.ico

diff --git a/reactos/base/shell/shell32/res/icons/138.ico b/reactos/dll/win32/shell32/res/icons/138.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/138.ico
rename to reactos/dll/win32/shell32/res/icons/138.ico

diff --git a/reactos/base/shell/shell32/res/icons/14.ico b/reactos/dll/win32/shell32/res/icons/14.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/14.ico
rename to reactos/dll/win32/shell32/res/icons/14.ico

diff --git a/reactos/base/shell/shell32/res/icons/15.ico b/reactos/dll/win32/shell32/res/icons/15.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/15.ico
rename to reactos/dll/win32/shell32/res/icons/15.ico

diff --git a/reactos/base/shell/shell32/res/icons/151.ico b/reactos/dll/win32/shell32/res/icons/151.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/151.ico
rename to reactos/dll/win32/shell32/res/icons/151.ico

diff --git a/reactos/base/shell/shell32/res/icons/152.ico b/reactos/dll/win32/shell32/res/icons/152.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/152.ico
rename to reactos/dll/win32/shell32/res/icons/152.ico

diff --git a/reactos/base/shell/shell32/res/icons/153.ico b/reactos/dll/win32/shell32/res/icons/153.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/153.ico
rename to reactos/dll/win32/shell32/res/icons/153.ico

diff --git a/reactos/base/shell/shell32/res/icons/154.ico b/reactos/dll/win32/shell32/res/icons/154.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/154.ico
rename to reactos/dll/win32/shell32/res/icons/154.ico

diff --git a/reactos/base/shell/shell32/res/icons/155.ico b/reactos/dll/win32/shell32/res/icons/155.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/155.ico
rename to reactos/dll/win32/shell32/res/icons/155.ico

diff --git a/reactos/base/shell/shell32/res/icons/156.ico b/reactos/dll/win32/shell32/res/icons/156.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/156.ico
rename to reactos/dll/win32/shell32/res/icons/156.ico

diff --git a/reactos/base/shell/shell32/res/icons/157.ico b/reactos/dll/win32/shell32/res/icons/157.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/157.ico
rename to reactos/dll/win32/shell32/res/icons/157.ico

diff --git a/reactos/base/shell/shell32/res/icons/16.ico b/reactos/dll/win32/shell32/res/icons/16.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16.ico
rename to reactos/dll/win32/shell32/res/icons/16.ico

diff --git a/reactos/base/shell/shell32/res/icons/160.ico b/reactos/dll/win32/shell32/res/icons/160.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/160.ico
rename to reactos/dll/win32/shell32/res/icons/160.ico

diff --git a/reactos/base/shell/shell32/res/icons/161.ico b/reactos/dll/win32/shell32/res/icons/161.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/161.ico
rename to reactos/dll/win32/shell32/res/icons/161.ico

diff --git a/reactos/base/shell/shell32/res/icons/16710.ico b/reactos/dll/win32/shell32/res/icons/16710.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16710.ico
rename to reactos/dll/win32/shell32/res/icons/16710.ico

diff --git a/reactos/base/shell/shell32/res/icons/16715.ico b/reactos/dll/win32/shell32/res/icons/16715.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16715.ico
rename to reactos/dll/win32/shell32/res/icons/16715.ico

diff --git a/reactos/base/shell/shell32/res/icons/16717.ico b/reactos/dll/win32/shell32/res/icons/16717.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16717.ico
rename to reactos/dll/win32/shell32/res/icons/16717.ico

diff --git a/reactos/base/shell/shell32/res/icons/16718.ico b/reactos/dll/win32/shell32/res/icons/16718.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16718.ico
rename to reactos/dll/win32/shell32/res/icons/16718.ico

diff --git a/reactos/base/shell/shell32/res/icons/16721.ico b/reactos/dll/win32/shell32/res/icons/16721.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/16721.ico
rename to reactos/dll/win32/shell32/res/icons/16721.ico

diff --git a/reactos/base/shell/shell32/res/icons/17.ico b/reactos/dll/win32/shell32/res/icons/17.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/17.ico
rename to reactos/dll/win32/shell32/res/icons/17.ico

diff --git a/reactos/base/shell/shell32/res/icons/1700.ico b/reactos/dll/win32/shell32/res/icons/1700.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/1700.ico
rename to reactos/dll/win32/shell32/res/icons/1700.ico

diff --git a/reactos/base/shell/shell32/res/icons/172.ico b/reactos/dll/win32/shell32/res/icons/172.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/172.ico
rename to reactos/dll/win32/shell32/res/icons/172.ico

diff --git a/reactos/base/shell/shell32/res/icons/173.ico b/reactos/dll/win32/shell32/res/icons/173.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/173.ico
rename to reactos/dll/win32/shell32/res/icons/173.ico

diff --git a/reactos/base/shell/shell32/res/icons/18.ico b/reactos/dll/win32/shell32/res/icons/18.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/18.ico
rename to reactos/dll/win32/shell32/res/icons/18.ico

diff --git a/reactos/base/shell/shell32/res/icons/182.ico b/reactos/dll/win32/shell32/res/icons/182.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/182.ico
rename to reactos/dll/win32/shell32/res/icons/182.ico

diff --git a/reactos/base/shell/shell32/res/icons/183.ico b/reactos/dll/win32/shell32/res/icons/183.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/183.ico
rename to reactos/dll/win32/shell32/res/icons/183.ico

diff --git a/reactos/base/shell/shell32/res/icons/184.ico b/reactos/dll/win32/shell32/res/icons/184.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/184.ico
rename to reactos/dll/win32/shell32/res/icons/184.ico

diff --git a/reactos/base/shell/shell32/res/icons/185.ico b/reactos/dll/win32/shell32/res/icons/185.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/185.ico
rename to reactos/dll/win32/shell32/res/icons/185.ico

diff --git a/reactos/base/shell/shell32/res/icons/186.ico b/reactos/dll/win32/shell32/res/icons/186.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/186.ico
rename to reactos/dll/win32/shell32/res/icons/186.ico

diff --git a/reactos/base/shell/shell32/res/icons/187.ico b/reactos/dll/win32/shell32/res/icons/187.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/187.ico
rename to reactos/dll/win32/shell32/res/icons/187.ico

diff --git a/reactos/base/shell/shell32/res/icons/19.ico b/reactos/dll/win32/shell32/res/icons/19.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/19.ico
rename to reactos/dll/win32/shell32/res/icons/19.ico

diff --git a/reactos/base/shell/shell32/res/icons/191.ico b/reactos/dll/win32/shell32/res/icons/191.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/191.ico
rename to reactos/dll/win32/shell32/res/icons/191.ico

diff --git a/reactos/base/shell/shell32/res/icons/192.ico b/reactos/dll/win32/shell32/res/icons/192.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/192.ico
rename to reactos/dll/win32/shell32/res/icons/192.ico

diff --git a/reactos/base/shell/shell32/res/icons/2.ico b/reactos/dll/win32/shell32/res/icons/2.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/2.ico
rename to reactos/dll/win32/shell32/res/icons/2.ico

diff --git a/reactos/base/shell/shell32/res/icons/20.ico b/reactos/dll/win32/shell32/res/icons/20.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/20.ico
rename to reactos/dll/win32/shell32/res/icons/20.ico

diff --git a/reactos/base/shell/shell32/res/icons/21.ico b/reactos/dll/win32/shell32/res/icons/21.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/21.ico
rename to reactos/dll/win32/shell32/res/icons/21.ico

diff --git a/reactos/base/shell/shell32/res/icons/210.ico b/reactos/dll/win32/shell32/res/icons/210.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/210.ico
rename to reactos/dll/win32/shell32/res/icons/210.ico

diff --git a/reactos/base/shell/shell32/res/icons/22.ico b/reactos/dll/win32/shell32/res/icons/22.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/22.ico
rename to reactos/dll/win32/shell32/res/icons/22.ico

diff --git a/reactos/base/shell/shell32/res/icons/220.ico b/reactos/dll/win32/shell32/res/icons/220.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/220.ico
rename to reactos/dll/win32/shell32/res/icons/220.ico

diff --git a/reactos/base/shell/shell32/res/icons/221.ico b/reactos/dll/win32/shell32/res/icons/221.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/221.ico
rename to reactos/dll/win32/shell32/res/icons/221.ico

diff --git a/reactos/base/shell/shell32/res/icons/222.ico b/reactos/dll/win32/shell32/res/icons/222.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/222.ico
rename to reactos/dll/win32/shell32/res/icons/222.ico

diff --git a/reactos/base/shell/shell32/res/icons/224.ico b/reactos/dll/win32/shell32/res/icons/224.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/224.ico
rename to reactos/dll/win32/shell32/res/icons/224.ico

diff --git a/reactos/base/shell/shell32/res/icons/225.ico b/reactos/dll/win32/shell32/res/icons/225.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/225.ico
rename to reactos/dll/win32/shell32/res/icons/225.ico

diff --git a/reactos/base/shell/shell32/res/icons/226.ico b/reactos/dll/win32/shell32/res/icons/226.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/226.ico
rename to reactos/dll/win32/shell32/res/icons/226.ico

diff --git a/reactos/base/shell/shell32/res/icons/228.ico b/reactos/dll/win32/shell32/res/icons/228.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/228.ico
rename to reactos/dll/win32/shell32/res/icons/228.ico

diff --git a/reactos/base/shell/shell32/res/icons/23.ico b/reactos/dll/win32/shell32/res/icons/23.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/23.ico
rename to reactos/dll/win32/shell32/res/icons/23.ico

diff --git a/reactos/base/shell/shell32/res/icons/233.ico b/reactos/dll/win32/shell32/res/icons/233.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/233.ico
rename to reactos/dll/win32/shell32/res/icons/233.ico

diff --git a/reactos/base/shell/shell32/res/icons/235.ico b/reactos/dll/win32/shell32/res/icons/235.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/235.ico
rename to reactos/dll/win32/shell32/res/icons/235.ico

diff --git a/reactos/base/shell/shell32/res/icons/236.ico b/reactos/dll/win32/shell32/res/icons/236.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/236.ico
rename to reactos/dll/win32/shell32/res/icons/236.ico

diff --git a/reactos/base/shell/shell32/res/icons/237.ico b/reactos/dll/win32/shell32/res/icons/237.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/237.ico
rename to reactos/dll/win32/shell32/res/icons/237.ico

diff --git a/reactos/base/shell/shell32/res/icons/238.ico b/reactos/dll/win32/shell32/res/icons/238.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/238.ico
rename to reactos/dll/win32/shell32/res/icons/238.ico

diff --git a/reactos/base/shell/shell32/res/icons/24.ico b/reactos/dll/win32/shell32/res/icons/24.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/24.ico
rename to reactos/dll/win32/shell32/res/icons/24.ico

diff --git a/reactos/base/shell/shell32/res/icons/240.ico b/reactos/dll/win32/shell32/res/icons/240.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/240.ico
rename to reactos/dll/win32/shell32/res/icons/240.ico

diff --git a/reactos/base/shell/shell32/res/icons/245.ico b/reactos/dll/win32/shell32/res/icons/245.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/245.ico
rename to reactos/dll/win32/shell32/res/icons/245.ico

diff --git a/reactos/base/shell/shell32/res/icons/246.ico b/reactos/dll/win32/shell32/res/icons/246.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/246.ico
rename to reactos/dll/win32/shell32/res/icons/246.ico

diff --git a/reactos/base/shell/shell32/res/icons/248.ico b/reactos/dll/win32/shell32/res/icons/248.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/248.ico
rename to reactos/dll/win32/shell32/res/icons/248.ico

diff --git a/reactos/base/shell/shell32/res/icons/249.ico b/reactos/dll/win32/shell32/res/icons/249.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/249.ico
rename to reactos/dll/win32/shell32/res/icons/249.ico

diff --git a/reactos/base/shell/shell32/res/icons/25.ico b/reactos/dll/win32/shell32/res/icons/25.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/25.ico
rename to reactos/dll/win32/shell32/res/icons/25.ico

diff --git a/reactos/base/shell/shell32/res/icons/250.ico b/reactos/dll/win32/shell32/res/icons/250.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/250.ico
rename to reactos/dll/win32/shell32/res/icons/250.ico

diff --git a/reactos/base/shell/shell32/res/icons/252.ico b/reactos/dll/win32/shell32/res/icons/252.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/252.ico
rename to reactos/dll/win32/shell32/res/icons/252.ico

diff --git a/reactos/base/shell/shell32/res/icons/254.ico b/reactos/dll/win32/shell32/res/icons/254.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/254.ico
rename to reactos/dll/win32/shell32/res/icons/254.ico

diff --git a/reactos/base/shell/shell32/res/icons/255.ico b/reactos/dll/win32/shell32/res/icons/255.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/255.ico
rename to reactos/dll/win32/shell32/res/icons/255.ico

diff --git a/reactos/base/shell/shell32/res/icons/263.ico b/reactos/dll/win32/shell32/res/icons/263.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/263.ico
rename to reactos/dll/win32/shell32/res/icons/263.ico

diff --git a/reactos/base/shell/shell32/res/icons/265.ico b/reactos/dll/win32/shell32/res/icons/265.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/265.ico
rename to reactos/dll/win32/shell32/res/icons/265.ico

diff --git a/reactos/base/shell/shell32/res/icons/268.ico b/reactos/dll/win32/shell32/res/icons/268.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/268.ico
rename to reactos/dll/win32/shell32/res/icons/268.ico

diff --git a/reactos/base/shell/shell32/res/icons/269.ico b/reactos/dll/win32/shell32/res/icons/269.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/269.ico
rename to reactos/dll/win32/shell32/res/icons/269.ico

diff --git a/reactos/base/shell/shell32/res/icons/270.ico b/reactos/dll/win32/shell32/res/icons/270.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/270.ico
rename to reactos/dll/win32/shell32/res/icons/270.ico

diff --git a/reactos/base/shell/shell32/res/icons/271.ico b/reactos/dll/win32/shell32/res/icons/271.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/271.ico
rename to reactos/dll/win32/shell32/res/icons/271.ico

diff --git a/reactos/base/shell/shell32/res/icons/277.ico b/reactos/dll/win32/shell32/res/icons/277.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/277.ico
rename to reactos/dll/win32/shell32/res/icons/277.ico

diff --git a/reactos/base/shell/shell32/res/icons/279.ico b/reactos/dll/win32/shell32/res/icons/279.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/279.ico
rename to reactos/dll/win32/shell32/res/icons/279.ico

diff --git a/reactos/base/shell/shell32/res/icons/28.ico b/reactos/dll/win32/shell32/res/icons/28.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/28.ico
rename to reactos/dll/win32/shell32/res/icons/28.ico

diff --git a/reactos/base/shell/shell32/res/icons/289.ico b/reactos/dll/win32/shell32/res/icons/289.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/289.ico
rename to reactos/dll/win32/shell32/res/icons/289.ico

diff --git a/reactos/base/shell/shell32/res/icons/29.ico b/reactos/dll/win32/shell32/res/icons/29.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/29.ico
rename to reactos/dll/win32/shell32/res/icons/29.ico

diff --git a/reactos/base/shell/shell32/res/icons/290.ico b/reactos/dll/win32/shell32/res/icons/290.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/290.ico
rename to reactos/dll/win32/shell32/res/icons/290.ico

diff --git a/reactos/base/shell/shell32/res/icons/291.ico b/reactos/dll/win32/shell32/res/icons/291.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/291.ico
rename to reactos/dll/win32/shell32/res/icons/291.ico

diff --git a/reactos/base/shell/shell32/res/icons/292.ico b/reactos/dll/win32/shell32/res/icons/292.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/292.ico
rename to reactos/dll/win32/shell32/res/icons/292.ico

diff --git a/reactos/base/shell/shell32/res/icons/293.ico b/reactos/dll/win32/shell32/res/icons/293.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/293.ico
rename to reactos/dll/win32/shell32/res/icons/293.ico

diff --git a/reactos/base/shell/shell32/res/icons/294.ico b/reactos/dll/win32/shell32/res/icons/294.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/294.ico
rename to reactos/dll/win32/shell32/res/icons/294.ico

diff --git a/reactos/base/shell/shell32/res/icons/295.ico b/reactos/dll/win32/shell32/res/icons/295.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/295.ico
rename to reactos/dll/win32/shell32/res/icons/295.ico

diff --git a/reactos/base/shell/shell32/res/icons/296.ico b/reactos/dll/win32/shell32/res/icons/296.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/296.ico
rename to reactos/dll/win32/shell32/res/icons/296.ico

diff --git a/reactos/base/shell/shell32/res/icons/297.ico b/reactos/dll/win32/shell32/res/icons/297.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/297.ico
rename to reactos/dll/win32/shell32/res/icons/297.ico

diff --git a/reactos/base/shell/shell32/res/icons/298.ico b/reactos/dll/win32/shell32/res/icons/298.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/298.ico
rename to reactos/dll/win32/shell32/res/icons/298.ico

diff --git a/reactos/base/shell/shell32/res/icons/299.ico b/reactos/dll/win32/shell32/res/icons/299.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/299.ico
rename to reactos/dll/win32/shell32/res/icons/299.ico

diff --git a/reactos/base/shell/shell32/res/icons/3.ico b/reactos/dll/win32/shell32/res/icons/3.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/3.ico
rename to reactos/dll/win32/shell32/res/icons/3.ico

diff --git a/reactos/base/shell/shell32/res/icons/30.ico b/reactos/dll/win32/shell32/res/icons/30.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/30.ico
rename to reactos/dll/win32/shell32/res/icons/30.ico

diff --git a/reactos/base/shell/shell32/res/icons/302.ico b/reactos/dll/win32/shell32/res/icons/302.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/302.ico
rename to reactos/dll/win32/shell32/res/icons/302.ico

diff --git a/reactos/base/shell/shell32/res/icons/304.ico b/reactos/dll/win32/shell32/res/icons/304.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/304.ico
rename to reactos/dll/win32/shell32/res/icons/304.ico

diff --git a/reactos/base/shell/shell32/res/icons/305.ico b/reactos/dll/win32/shell32/res/icons/305.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/305.ico
rename to reactos/dll/win32/shell32/res/icons/305.ico

diff --git a/reactos/base/shell/shell32/res/icons/309.ico b/reactos/dll/win32/shell32/res/icons/309.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/309.ico
rename to reactos/dll/win32/shell32/res/icons/309.ico

diff --git a/reactos/base/shell/shell32/res/icons/315.ico b/reactos/dll/win32/shell32/res/icons/315.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/315.ico
rename to reactos/dll/win32/shell32/res/icons/315.ico

diff --git a/reactos/base/shell/shell32/res/icons/317.ico b/reactos/dll/win32/shell32/res/icons/317.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/317.ico
rename to reactos/dll/win32/shell32/res/icons/317.ico

diff --git a/reactos/base/shell/shell32/res/icons/318.ico b/reactos/dll/win32/shell32/res/icons/318.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/318.ico
rename to reactos/dll/win32/shell32/res/icons/318.ico

diff --git a/reactos/base/shell/shell32/res/icons/319.ico b/reactos/dll/win32/shell32/res/icons/319.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/319.ico
rename to reactos/dll/win32/shell32/res/icons/319.ico

diff --git a/reactos/base/shell/shell32/res/icons/32.ico b/reactos/dll/win32/shell32/res/icons/32.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/32.ico
rename to reactos/dll/win32/shell32/res/icons/32.ico

diff --git a/reactos/base/shell/shell32/res/icons/322.ico b/reactos/dll/win32/shell32/res/icons/322.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/322.ico
rename to reactos/dll/win32/shell32/res/icons/322.ico

diff --git a/reactos/base/shell/shell32/res/icons/323.ico b/reactos/dll/win32/shell32/res/icons/323.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/323.ico
rename to reactos/dll/win32/shell32/res/icons/323.ico

diff --git a/reactos/base/shell/shell32/res/icons/324.ico b/reactos/dll/win32/shell32/res/icons/324.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/324.ico
rename to reactos/dll/win32/shell32/res/icons/324.ico

diff --git a/reactos/base/shell/shell32/res/icons/325.ico b/reactos/dll/win32/shell32/res/icons/325.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/325.ico
rename to reactos/dll/win32/shell32/res/icons/325.ico

diff --git a/reactos/base/shell/shell32/res/icons/326.ico b/reactos/dll/win32/shell32/res/icons/326.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/326.ico
rename to reactos/dll/win32/shell32/res/icons/326.ico

diff --git a/reactos/base/shell/shell32/res/icons/327.ico b/reactos/dll/win32/shell32/res/icons/327.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/327.ico
rename to reactos/dll/win32/shell32/res/icons/327.ico

diff --git a/reactos/base/shell/shell32/res/icons/328.ico b/reactos/dll/win32/shell32/res/icons/328.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/328.ico
rename to reactos/dll/win32/shell32/res/icons/328.ico

diff --git a/reactos/base/shell/shell32/res/icons/329.ico b/reactos/dll/win32/shell32/res/icons/329.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/329.ico
rename to reactos/dll/win32/shell32/res/icons/329.ico

diff --git a/reactos/base/shell/shell32/res/icons/33.ico b/reactos/dll/win32/shell32/res/icons/33.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/33.ico
rename to reactos/dll/win32/shell32/res/icons/33.ico

diff --git a/reactos/base/shell/shell32/res/icons/330.ico b/reactos/dll/win32/shell32/res/icons/330.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/330.ico
rename to reactos/dll/win32/shell32/res/icons/330.ico

diff --git a/reactos/base/shell/shell32/res/icons/35.ico b/reactos/dll/win32/shell32/res/icons/35.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/35.ico
rename to reactos/dll/win32/shell32/res/icons/35.ico

diff --git a/reactos/base/shell/shell32/res/icons/36.ico b/reactos/dll/win32/shell32/res/icons/36.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/36.ico
rename to reactos/dll/win32/shell32/res/icons/36.ico

diff --git a/reactos/base/shell/shell32/res/icons/37.ico b/reactos/dll/win32/shell32/res/icons/37.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/37.ico
rename to reactos/dll/win32/shell32/res/icons/37.ico

diff --git a/reactos/base/shell/shell32/res/icons/38.ico b/reactos/dll/win32/shell32/res/icons/38.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/38.ico
rename to reactos/dll/win32/shell32/res/icons/38.ico

diff --git a/reactos/base/shell/shell32/res/icons/39.ico b/reactos/dll/win32/shell32/res/icons/39.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/39.ico
rename to reactos/dll/win32/shell32/res/icons/39.ico

diff --git a/reactos/base/shell/shell32/res/icons/4.ico b/reactos/dll/win32/shell32/res/icons/4.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/4.ico
rename to reactos/dll/win32/shell32/res/icons/4.ico

diff --git a/reactos/base/shell/shell32/res/icons/40.ico b/reactos/dll/win32/shell32/res/icons/40.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/40.ico
rename to reactos/dll/win32/shell32/res/icons/40.ico

diff --git a/reactos/base/shell/shell32/res/icons/41.ico b/reactos/dll/win32/shell32/res/icons/41.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/41.ico
rename to reactos/dll/win32/shell32/res/icons/41.ico

diff --git a/reactos/base/shell/shell32/res/icons/44.ico b/reactos/dll/win32/shell32/res/icons/44.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/44.ico
rename to reactos/dll/win32/shell32/res/icons/44.ico

diff --git a/reactos/base/shell/shell32/res/icons/45.ico b/reactos/dll/win32/shell32/res/icons/45.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/45.ico
rename to reactos/dll/win32/shell32/res/icons/45.ico

diff --git a/reactos/base/shell/shell32/res/icons/46.ico b/reactos/dll/win32/shell32/res/icons/46.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/46.ico
rename to reactos/dll/win32/shell32/res/icons/46.ico

diff --git a/reactos/base/shell/shell32/res/icons/47.ico b/reactos/dll/win32/shell32/res/icons/47.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/47.ico
rename to reactos/dll/win32/shell32/res/icons/47.ico

diff --git a/reactos/base/shell/shell32/res/icons/48.ico b/reactos/dll/win32/shell32/res/icons/48.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/48.ico
rename to reactos/dll/win32/shell32/res/icons/48.ico

diff --git a/reactos/base/shell/shell32/res/icons/5.ico b/reactos/dll/win32/shell32/res/icons/5.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/5.ico
rename to reactos/dll/win32/shell32/res/icons/5.ico

diff --git a/reactos/base/shell/shell32/res/icons/54.ico b/reactos/dll/win32/shell32/res/icons/54.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/54.ico
rename to reactos/dll/win32/shell32/res/icons/54.ico

diff --git a/reactos/base/shell/shell32/res/icons/6.ico b/reactos/dll/win32/shell32/res/icons/6.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/6.ico
rename to reactos/dll/win32/shell32/res/icons/6.ico

diff --git a/reactos/base/shell/shell32/res/icons/7.ico b/reactos/dll/win32/shell32/res/icons/7.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/7.ico
rename to reactos/dll/win32/shell32/res/icons/7.ico

diff --git a/reactos/base/shell/shell32/res/icons/8.ico b/reactos/dll/win32/shell32/res/icons/8.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/8.ico
rename to reactos/dll/win32/shell32/res/icons/8.ico

diff --git a/reactos/base/shell/shell32/res/icons/8240.ico b/reactos/dll/win32/shell32/res/icons/8240.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/8240.ico
rename to reactos/dll/win32/shell32/res/icons/8240.ico

diff --git a/reactos/base/shell/shell32/res/icons/9.ico b/reactos/dll/win32/shell32/res/icons/9.ico
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/9.ico
rename to reactos/dll/win32/shell32/res/icons/9.ico

diff --git a/reactos/base/shell/shell32/res/icons/Icon_Licence/COPYING b/reactos/dll/win32/shell32/res/icons/Icon_Licence/COPYING
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/Icon_Licence/COPYING
rename to reactos/dll/win32/shell32/res/icons/Icon_Licence/COPYING

diff --git a/reactos/base/shell/shell32/res/icons/Icon_Licence/Tango.txt b/reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt
similarity index 100%
rename from reactos/base/shell/shell32/res/icons/Icon_Licence/Tango.txt
rename to reactos/dll/win32/shell32/res/icons/Icon_Licence/Tango.txt

diff --git a/reactos/base/shell/shell32/res/rgs/adminfoldershortcut.rgs b/reactos/dll/win32/shell32/res/rgs/adminfoldershortcut.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/adminfoldershortcut.rgs
rename to reactos/dll/win32/shell32/res/rgs/adminfoldershortcut.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/controlpanel.rgs b/reactos/dll/win32/shell32/res/rgs/controlpanel.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/controlpanel.rgs
rename to reactos/dll/win32/shell32/res/rgs/controlpanel.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/dragdrophelper.rgs b/reactos/dll/win32/shell32/res/rgs/dragdrophelper.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/dragdrophelper.rgs
rename to reactos/dll/win32/shell32/res/rgs/dragdrophelper.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/exedrophandler.rgs b/reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/exedrophandler.rgs
rename to reactos/dll/win32/shell32/res/rgs/exedrophandler.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/folderoptions.rgs b/reactos/dll/win32/shell32/res/rgs/folderoptions.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/folderoptions.rgs
rename to reactos/dll/win32/shell32/res/rgs/folderoptions.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/foldershortcut.rgs b/reactos/dll/win32/shell32/res/rgs/foldershortcut.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/foldershortcut.rgs
rename to reactos/dll/win32/shell32/res/rgs/foldershortcut.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/fontsfoldershortcut.rgs b/reactos/dll/win32/shell32/res/rgs/fontsfoldershortcut.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/fontsfoldershortcut.rgs
rename to reactos/dll/win32/shell32/res/rgs/fontsfoldershortcut.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/menuband.rgs b/reactos/dll/win32/shell32/res/rgs/menuband.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/menuband.rgs
rename to reactos/dll/win32/shell32/res/rgs/menuband.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/menubandsite.rgs b/reactos/dll/win32/shell32/res/rgs/menubandsite.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/menubandsite.rgs
rename to reactos/dll/win32/shell32/res/rgs/menubandsite.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/menudeskbar.rgs b/reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/menudeskbar.rgs
rename to reactos/dll/win32/shell32/res/rgs/menudeskbar.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/mycomputer.rgs b/reactos/dll/win32/shell32/res/rgs/mycomputer.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/mycomputer.rgs
rename to reactos/dll/win32/shell32/res/rgs/mycomputer.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/mydocuments.rgs b/reactos/dll/win32/shell32/res/rgs/mydocuments.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/mydocuments.rgs
rename to reactos/dll/win32/shell32/res/rgs/mydocuments.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/networkplaces.rgs b/reactos/dll/win32/shell32/res/rgs/networkplaces.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/networkplaces.rgs
rename to reactos/dll/win32/shell32/res/rgs/networkplaces.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/newmenu.rgs b/reactos/dll/win32/shell32/res/rgs/newmenu.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/newmenu.rgs
rename to reactos/dll/win32/shell32/res/rgs/newmenu.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/openwithmenu.rgs b/reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/openwithmenu.rgs
rename to reactos/dll/win32/shell32/res/rgs/openwithmenu.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/printers.rgs b/reactos/dll/win32/shell32/res/rgs/printers.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/printers.rgs
rename to reactos/dll/win32/shell32/res/rgs/printers.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/recyclebin.rgs b/reactos/dll/win32/shell32/res/rgs/recyclebin.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/recyclebin.rgs
rename to reactos/dll/win32/shell32/res/rgs/recyclebin.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/shelldesktop.rgs b/reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/shelldesktop.rgs
rename to reactos/dll/win32/shell32/res/rgs/shelldesktop.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/shelldrvdefext.rgs b/reactos/dll/win32/shell32/res/rgs/shelldrvdefext.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/shelldrvdefext.rgs
rename to reactos/dll/win32/shell32/res/rgs/shelldrvdefext.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/shellfiledefext.rgs b/reactos/dll/win32/shell32/res/rgs/shellfiledefext.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/shellfiledefext.rgs
rename to reactos/dll/win32/shell32/res/rgs/shellfiledefext.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/shellfsfolder.rgs b/reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/shellfsfolder.rgs
rename to reactos/dll/win32/shell32/res/rgs/shellfsfolder.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/shelllink.rgs b/reactos/dll/win32/shell32/res/rgs/shelllink.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/shelllink.rgs
rename to reactos/dll/win32/shell32/res/rgs/shelllink.rgs

diff --git a/reactos/base/shell/shell32/res/rgs/startmenu.rgs b/reactos/dll/win32/shell32/res/rgs/startmenu.rgs
similarity index 100%
rename from reactos/base/shell/shell32/res/rgs/startmenu.rgs
rename to reactos/dll/win32/shell32/res/rgs/startmenu.rgs

diff --git a/reactos/base/shell/shell32/rgs_res.rc b/reactos/dll/win32/shell32/rgs_res.rc
similarity index 100%
rename from reactos/base/shell/shell32/rgs_res.rc
rename to reactos/dll/win32/shell32/rgs_res.rc

diff --git a/reactos/base/shell/shell32/shell32.cpp b/reactos/dll/win32/shell32/shell32.cpp
similarity index 100%
rename from reactos/base/shell/shell32/shell32.cpp
rename to reactos/dll/win32/shell32/shell32.cpp

diff --git a/reactos/base/shell/shell32/shell32.rc b/reactos/dll/win32/shell32/shell32.rc
similarity index 100%
rename from reactos/base/shell/shell32/shell32.rc
rename to reactos/dll/win32/shell32/shell32.rc

diff --git a/reactos/base/shell/shell32/shell32.spec b/reactos/dll/win32/shell32/shell32.spec
similarity index 100%
rename from reactos/base/shell/shell32/shell32.spec
rename to reactos/dll/win32/shell32/shell32.spec

diff --git a/reactos/base/shell/shell32/shell32_version.h b/reactos/dll/win32/shell32/shell32_version.h
similarity index 100%
rename from reactos/base/shell/shell32/shell32_version.h
rename to reactos/dll/win32/shell32/shell32_version.h

diff --git a/reactos/base/shell/shell32/shell32_version.rc b/reactos/dll/win32/shell32/shell32_version.rc
similarity index 100%
rename from reactos/base/shell/shell32/shell32_version.rc
rename to reactos/dll/win32/shell32/shell32_version.rc

diff --git a/reactos/base/shell/shell32/shellfolder.h b/reactos/dll/win32/shell32/shellfolder.h
similarity index 100%
rename from reactos/base/shell/shell32/shellfolder.h
rename to reactos/dll/win32/shell32/shellfolder.h

diff --git a/reactos/base/shell/shell32/shfldr.h b/reactos/dll/win32/shell32/shfldr.h
similarity index 100%
rename from reactos/base/shell/shell32/shfldr.h
rename to reactos/dll/win32/shell32/shfldr.h

diff --git a/reactos/base/shell/shell32/shlexec.cpp b/reactos/dll/win32/shell32/shlexec.cpp
similarity index 100%
rename from reactos/base/shell/shell32/shlexec.cpp
rename to reactos/dll/win32/shell32/shlexec.cpp

diff --git a/reactos/base/shell/shell32/shlfileop.cpp b/reactos/dll/win32/shell32/shlfileop.cpp
similarity index 100%
rename from reactos/base/shell/shell32/shlfileop.cpp
rename to reactos/dll/win32/shell32/shlfileop.cpp

diff --git a/reactos/base/shell/shell32/shlfolder.cpp b/reactos/dll/win32/shell32/shlfolder.cpp
similarity index 100%
rename from reactos/base/shell/shell32/shlfolder.cpp
rename to reactos/dll/win32/shell32/shlfolder.cpp

diff --git a/reactos/base/shell/shell32/shobjidl_local.idl b/reactos/dll/win32/shell32/shobjidl_local.idl
similarity index 100%
rename from reactos/base/shell/shell32/shobjidl_local.idl
rename to reactos/dll/win32/shell32/shobjidl_local.idl

diff --git a/reactos/base/shell/shell32/shresdef.h b/reactos/dll/win32/shell32/shresdef.h
similarity index 100%
rename from reactos/base/shell/shell32/shresdef.h
rename to reactos/dll/win32/shell32/shresdef.h

diff --git a/reactos/base/shell/shell32/stubs.cpp b/reactos/dll/win32/shell32/stubs.cpp
similarity index 100%
rename from reactos/base/shell/shell32/stubs.cpp
rename to reactos/dll/win32/shell32/stubs.cpp

diff --git a/reactos/base/shell/shell32/systray.cpp b/reactos/dll/win32/shell32/systray.cpp
similarity index 100%
rename from reactos/base/shell/shell32/systray.cpp
rename to reactos/dll/win32/shell32/systray.cpp

diff --git a/reactos/base/shell/shell32/vista.c b/reactos/dll/win32/shell32/vista.c
similarity index 100%
rename from reactos/base/shell/shell32/vista.c
rename to reactos/dll/win32/shell32/vista.c

diff --git a/reactos/base/shell/shell32/wine/brsfolder.c b/reactos/dll/win32/shell32/wine/brsfolder.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/brsfolder.c
rename to reactos/dll/win32/shell32/wine/brsfolder.c

diff --git a/reactos/base/shell/shell32/wine/changenotify.c b/reactos/dll/win32/shell32/wine/changenotify.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/changenotify.c
rename to reactos/dll/win32/shell32/wine/changenotify.c

diff --git a/reactos/base/shell/shell32/wine/classes.c b/reactos/dll/win32/shell32/wine/classes.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/classes.c
rename to reactos/dll/win32/shell32/wine/classes.c

diff --git a/reactos/base/shell/shell32/wine/clipboard.c b/reactos/dll/win32/shell32/wine/clipboard.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/clipboard.c
rename to reactos/dll/win32/shell32/wine/clipboard.c

diff --git a/reactos/base/shell/shell32/wine/control.c b/reactos/dll/win32/shell32/wine/control.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/control.c
rename to reactos/dll/win32/shell32/wine/control.c

diff --git a/reactos/base/shell/shell32/wine/pidl.c b/reactos/dll/win32/shell32/wine/pidl.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/pidl.c
rename to reactos/dll/win32/shell32/wine/pidl.c

diff --git a/reactos/base/shell/shell32/wine/pidl.h b/reactos/dll/win32/shell32/wine/pidl.h
similarity index 100%
rename from reactos/base/shell/shell32/wine/pidl.h
rename to reactos/dll/win32/shell32/wine/pidl.h

diff --git a/reactos/base/shell/shell32/wine/shell32_main.c b/reactos/dll/win32/shell32/wine/shell32_main.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shell32_main.c
rename to reactos/dll/win32/shell32/wine/shell32_main.c

diff --git a/reactos/base/shell/shell32/wine/shell32_main.h b/reactos/dll/win32/shell32/wine/shell32_main.h
similarity index 100%
rename from reactos/base/shell/shell32/wine/shell32_main.h
rename to reactos/dll/win32/shell32/wine/shell32_main.h

diff --git a/reactos/base/shell/shell32/wine/shellole.c b/reactos/dll/win32/shell32/wine/shellole.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shellole.c
rename to reactos/dll/win32/shell32/wine/shellole.c

diff --git a/reactos/base/shell/shell32/wine/shellord.c b/reactos/dll/win32/shell32/wine/shellord.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shellord.c
rename to reactos/dll/win32/shell32/wine/shellord.c

diff --git a/reactos/base/shell/shell32/wine/shellpath.c b/reactos/dll/win32/shell32/wine/shellpath.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shellpath.c
rename to reactos/dll/win32/shell32/wine/shellpath.c

diff --git a/reactos/base/shell/shell32/wine/shellreg.c b/reactos/dll/win32/shell32/wine/shellreg.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shellreg.c
rename to reactos/dll/win32/shell32/wine/shellreg.c

diff --git a/reactos/base/shell/shell32/wine/shellstring.c b/reactos/dll/win32/shell32/wine/shellstring.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shellstring.c
rename to reactos/dll/win32/shell32/wine/shellstring.c

diff --git a/reactos/base/shell/shell32/wine/shlmenu.c b/reactos/dll/win32/shell32/wine/shlmenu.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shlmenu.c
rename to reactos/dll/win32/shell32/wine/shlmenu.c

diff --git a/reactos/base/shell/shell32/wine/shpolicy.c b/reactos/dll/win32/shell32/wine/shpolicy.c
similarity index 100%
rename from reactos/base/shell/shell32/wine/shpolicy.c
rename to reactos/dll/win32/shell32/wine/shpolicy.c

diff --git a/reactos/base/shell/shfolder/CMakeLists.txt b/reactos/dll/win32/shfolder/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shfolder/CMakeLists.txt
rename to reactos/dll/win32/shfolder/CMakeLists.txt

diff --git a/reactos/base/shell/shfolder/shfolder.spec b/reactos/dll/win32/shfolder/shfolder.spec
similarity index 100%
rename from reactos/base/shell/shfolder/shfolder.spec
rename to reactos/dll/win32/shfolder/shfolder.spec

diff --git a/reactos/base/shell/shfolder/version.rc b/reactos/dll/win32/shfolder/version.rc
similarity index 100%
rename from reactos/base/shell/shfolder/version.rc
rename to reactos/dll/win32/shfolder/version.rc

diff --git a/reactos/base/shell/shellext/shimgvw/CMakeLists.txt b/reactos/dll/win32/shimgvw/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/CMakeLists.txt
rename to reactos/dll/win32/shimgvw/CMakeLists.txt

diff --git a/reactos/base/shell/shellext/shimgvw/comsup.c b/reactos/dll/win32/shimgvw/comsup.c
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/comsup.c
rename to reactos/dll/win32/shimgvw/comsup.c

diff --git a/reactos/base/shell/shellext/shimgvw/comsup.h b/reactos/dll/win32/shimgvw/comsup.h
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/comsup.h
rename to reactos/dll/win32/shimgvw/comsup.h

diff --git a/reactos/base/shell/shellext/shimgvw/lang/bg-BG.rc b/reactos/dll/win32/shimgvw/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/bg-BG.rc
rename to reactos/dll/win32/shimgvw/lang/bg-BG.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/cs-CZ.rc b/reactos/dll/win32/shimgvw/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/cs-CZ.rc
rename to reactos/dll/win32/shimgvw/lang/cs-CZ.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/de-DE.rc b/reactos/dll/win32/shimgvw/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/de-DE.rc
rename to reactos/dll/win32/shimgvw/lang/de-DE.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/en-US.rc b/reactos/dll/win32/shimgvw/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/en-US.rc
rename to reactos/dll/win32/shimgvw/lang/en-US.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/es-ES.rc b/reactos/dll/win32/shimgvw/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/es-ES.rc
rename to reactos/dll/win32/shimgvw/lang/es-ES.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/fr-FR.rc b/reactos/dll/win32/shimgvw/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/fr-FR.rc
rename to reactos/dll/win32/shimgvw/lang/fr-FR.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/he-IL.rc b/reactos/dll/win32/shimgvw/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/he-IL.rc
rename to reactos/dll/win32/shimgvw/lang/he-IL.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/it-IT.rc b/reactos/dll/win32/shimgvw/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/it-IT.rc
rename to reactos/dll/win32/shimgvw/lang/it-IT.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/lt-LT.rc b/reactos/dll/win32/shimgvw/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/lt-LT.rc
rename to reactos/dll/win32/shimgvw/lang/lt-LT.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/no-NO.rc b/reactos/dll/win32/shimgvw/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/no-NO.rc
rename to reactos/dll/win32/shimgvw/lang/no-NO.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/pl-PL.rc b/reactos/dll/win32/shimgvw/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/pl-PL.rc
rename to reactos/dll/win32/shimgvw/lang/pl-PL.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/ro-RO.rc b/reactos/dll/win32/shimgvw/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/ro-RO.rc
rename to reactos/dll/win32/shimgvw/lang/ro-RO.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/ru-RU.rc b/reactos/dll/win32/shimgvw/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/ru-RU.rc
rename to reactos/dll/win32/shimgvw/lang/ru-RU.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/sk-SK.rc b/reactos/dll/win32/shimgvw/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/sk-SK.rc
rename to reactos/dll/win32/shimgvw/lang/sk-SK.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/sq-AL.rc b/reactos/dll/win32/shimgvw/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/sq-AL.rc
rename to reactos/dll/win32/shimgvw/lang/sq-AL.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/tr-TR.rc b/reactos/dll/win32/shimgvw/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/tr-TR.rc
rename to reactos/dll/win32/shimgvw/lang/tr-TR.rc

diff --git a/reactos/base/shell/shellext/shimgvw/lang/uk-UA.rc b/reactos/dll/win32/shimgvw/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/lang/uk-UA.rc
rename to reactos/dll/win32/shimgvw/lang/uk-UA.rc

diff --git a/reactos/base/shell/shellext/shimgvw/res/main.ico b/reactos/dll/win32/shimgvw/res/main.ico
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/main.ico
rename to reactos/dll/win32/shimgvw/res/main.ico

diff --git a/reactos/base/shell/shellext/shimgvw/res/next.bmp b/reactos/dll/win32/shimgvw/res/next.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/next.bmp
rename to reactos/dll/win32/shimgvw/res/next.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/prev.bmp b/reactos/dll/win32/shimgvw/res/prev.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/prev.bmp
rename to reactos/dll/win32/shimgvw/res/prev.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/print.bmp b/reactos/dll/win32/shimgvw/res/print.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/print.bmp
rename to reactos/dll/win32/shimgvw/res/print.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/rot1.bmp b/reactos/dll/win32/shimgvw/res/rot1.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/rot1.bmp
rename to reactos/dll/win32/shimgvw/res/rot1.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/rot2.bmp b/reactos/dll/win32/shimgvw/res/rot2.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/rot2.bmp
rename to reactos/dll/win32/shimgvw/res/rot2.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/save.bmp b/reactos/dll/win32/shimgvw/res/save.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/save.bmp
rename to reactos/dll/win32/shimgvw/res/save.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/zoomm.bmp b/reactos/dll/win32/shimgvw/res/zoomm.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/zoomm.bmp
rename to reactos/dll/win32/shimgvw/res/zoomm.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/res/zoomp.bmp b/reactos/dll/win32/shimgvw/res/zoomp.bmp
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/res/zoomp.bmp
rename to reactos/dll/win32/shimgvw/res/zoomp.bmp

diff --git a/reactos/base/shell/shellext/shimgvw/resource.h b/reactos/dll/win32/shimgvw/resource.h
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/resource.h
rename to reactos/dll/win32/shimgvw/resource.h

diff --git a/reactos/base/shell/shellext/shimgvw/shimgvw.c b/reactos/dll/win32/shimgvw/shimgvw.c
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/shimgvw.c
rename to reactos/dll/win32/shimgvw/shimgvw.c

diff --git a/reactos/base/shell/shellext/shimgvw/shimgvw.h b/reactos/dll/win32/shimgvw/shimgvw.h
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/shimgvw.h
rename to reactos/dll/win32/shimgvw/shimgvw.h

diff --git a/reactos/base/shell/shellext/shimgvw/shimgvw.rc b/reactos/dll/win32/shimgvw/shimgvw.rc
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/shimgvw.rc
rename to reactos/dll/win32/shimgvw/shimgvw.rc

diff --git a/reactos/base/shell/shellext/shimgvw/shimgvw.spec b/reactos/dll/win32/shimgvw/shimgvw.spec
similarity index 100%
rename from reactos/base/shell/shellext/shimgvw/shimgvw.spec
rename to reactos/dll/win32/shimgvw/shimgvw.spec

diff --git a/reactos/base/shell/shlwapi/CMakeLists.txt b/reactos/dll/win32/shlwapi/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shlwapi/CMakeLists.txt
rename to reactos/dll/win32/shlwapi/CMakeLists.txt

diff --git a/reactos/base/shell/shlwapi/assoc.c b/reactos/dll/win32/shlwapi/assoc.c
similarity index 100%
rename from reactos/base/shell/shlwapi/assoc.c
rename to reactos/dll/win32/shlwapi/assoc.c

diff --git a/reactos/base/shell/shlwapi/clist.c b/reactos/dll/win32/shlwapi/clist.c
similarity index 100%
rename from reactos/base/shell/shlwapi/clist.c
rename to reactos/dll/win32/shlwapi/clist.c

diff --git a/reactos/base/shell/shlwapi/istream.c b/reactos/dll/win32/shlwapi/istream.c
similarity index 100%
rename from reactos/base/shell/shlwapi/istream.c
rename to reactos/dll/win32/shlwapi/istream.c

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Da.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Da.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Da.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_De.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_De.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_De.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_De.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_En.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_En.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_En.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_En.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Es.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Es.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Es.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Fi.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Fi.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Fi.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Fr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Fr.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Fr.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_He.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_He.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_He.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_He.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Hu.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Hu.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Hu.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_It.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_It.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_It.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_It.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Ja.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Ja.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Ja.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Ko.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Ko.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Ko.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Lt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Lt.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Lt.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Nl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Nl.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Nl.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_No.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_No.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_No.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_No.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Pl.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Pl.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Pl.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Pt.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Pt.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Pt.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Ro.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Ro.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Ro.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Ru.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Ru.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Ru.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Si.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Si.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Si.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Sk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Sk.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Sk.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Sq.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Sq.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Sq.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Sv.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Sv.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Sv.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Tr.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Tr.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Uk.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Uk.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Uk.rc

diff --git a/reactos/base/shell/shlwapi/lang/shlwapi_Zh.rc b/reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/lang/shlwapi_Zh.rc
rename to reactos/dll/win32/shlwapi/lang/shlwapi_Zh.rc

diff --git a/reactos/base/shell/shlwapi/msgbox.c b/reactos/dll/win32/shlwapi/msgbox.c
similarity index 100%
rename from reactos/base/shell/shlwapi/msgbox.c
rename to reactos/dll/win32/shlwapi/msgbox.c

diff --git a/reactos/base/shell/shlwapi/ordinal.c b/reactos/dll/win32/shlwapi/ordinal.c
similarity index 100%
rename from reactos/base/shell/shlwapi/ordinal.c
rename to reactos/dll/win32/shlwapi/ordinal.c

diff --git a/reactos/base/shell/shlwapi/path.c b/reactos/dll/win32/shlwapi/path.c
similarity index 100%
rename from reactos/base/shell/shlwapi/path.c
rename to reactos/dll/win32/shlwapi/path.c

diff --git a/reactos/base/shell/shlwapi/precomp.h b/reactos/dll/win32/shlwapi/precomp.h
similarity index 100%
rename from reactos/base/shell/shlwapi/precomp.h
rename to reactos/dll/win32/shlwapi/precomp.h

diff --git a/reactos/base/shell/shlwapi/reg.c b/reactos/dll/win32/shlwapi/reg.c
similarity index 100%
rename from reactos/base/shell/shlwapi/reg.c
rename to reactos/dll/win32/shlwapi/reg.c

diff --git a/reactos/base/shell/shlwapi/regstream.c b/reactos/dll/win32/shlwapi/regstream.c
similarity index 100%
rename from reactos/base/shell/shlwapi/regstream.c
rename to reactos/dll/win32/shlwapi/regstream.c

diff --git a/reactos/base/shell/shlwapi/resource.h b/reactos/dll/win32/shlwapi/resource.h
similarity index 100%
rename from reactos/base/shell/shlwapi/resource.h
rename to reactos/dll/win32/shlwapi/resource.h

diff --git a/reactos/base/shell/shlwapi/shlwapi.rc b/reactos/dll/win32/shlwapi/shlwapi.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/shlwapi.rc
rename to reactos/dll/win32/shlwapi/shlwapi.rc

diff --git a/reactos/base/shell/shlwapi/shlwapi.spec b/reactos/dll/win32/shlwapi/shlwapi.spec
similarity index 100%
rename from reactos/base/shell/shlwapi/shlwapi.spec
rename to reactos/dll/win32/shlwapi/shlwapi.spec

diff --git a/reactos/base/shell/shlwapi/shlwapi_main.c b/reactos/dll/win32/shlwapi/shlwapi_main.c
similarity index 100%
rename from reactos/base/shell/shlwapi/shlwapi_main.c
rename to reactos/dll/win32/shlwapi/shlwapi_main.c

diff --git a/reactos/base/shell/shlwapi/shlwapi_ros.diff b/reactos/dll/win32/shlwapi/shlwapi_ros.diff
similarity index 100%
rename from reactos/base/shell/shlwapi/shlwapi_ros.diff
rename to reactos/dll/win32/shlwapi/shlwapi_ros.diff

diff --git a/reactos/base/shell/shlwapi/stopwatch.c b/reactos/dll/win32/shlwapi/stopwatch.c
similarity index 100%
rename from reactos/base/shell/shlwapi/stopwatch.c
rename to reactos/dll/win32/shlwapi/stopwatch.c

diff --git a/reactos/base/shell/shlwapi/string.c b/reactos/dll/win32/shlwapi/string.c
similarity index 100%
rename from reactos/base/shell/shlwapi/string.c
rename to reactos/dll/win32/shlwapi/string.c

diff --git a/reactos/base/shell/shlwapi/thread.c b/reactos/dll/win32/shlwapi/thread.c
similarity index 100%
rename from reactos/base/shell/shlwapi/thread.c
rename to reactos/dll/win32/shlwapi/thread.c

diff --git a/reactos/base/shell/shlwapi/url.c b/reactos/dll/win32/shlwapi/url.c
similarity index 100%
rename from reactos/base/shell/shlwapi/url.c
rename to reactos/dll/win32/shlwapi/url.c

diff --git a/reactos/base/shell/shlwapi/version.rc b/reactos/dll/win32/shlwapi/version.rc
similarity index 100%
rename from reactos/base/shell/shlwapi/version.rc
rename to reactos/dll/win32/shlwapi/version.rc

diff --git a/reactos/base/shell/shlwapi/wsprintf.c b/reactos/dll/win32/shlwapi/wsprintf.c
similarity index 100%
rename from reactos/base/shell/shlwapi/wsprintf.c
rename to reactos/dll/win32/shlwapi/wsprintf.c

diff --git a/reactos/base/shell/ie/url/CMakeLists.txt b/reactos/dll/win32/url/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/url/CMakeLists.txt
rename to reactos/dll/win32/url/CMakeLists.txt

diff --git a/reactos/base/shell/ie/url/url.spec b/reactos/dll/win32/url/url.spec
similarity index 100%
rename from reactos/base/shell/ie/url/url.spec
rename to reactos/dll/win32/url/url.spec

diff --git a/reactos/base/shell/ie/url/url_main.c b/reactos/dll/win32/url/url_main.c
similarity index 100%
rename from reactos/base/shell/ie/url/url_main.c
rename to reactos/dll/win32/url/url_main.c

diff --git a/reactos/base/shell/ie/urlmon/CMakeLists.txt b/reactos/dll/win32/urlmon/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/ie/urlmon/CMakeLists.txt
rename to reactos/dll/win32/urlmon/CMakeLists.txt

diff --git a/reactos/base/shell/ie/urlmon/axinstall.c b/reactos/dll/win32/urlmon/axinstall.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/axinstall.c
rename to reactos/dll/win32/urlmon/axinstall.c

diff --git a/reactos/base/shell/ie/urlmon/bindctx.c b/reactos/dll/win32/urlmon/bindctx.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/bindctx.c
rename to reactos/dll/win32/urlmon/bindctx.c

diff --git a/reactos/base/shell/ie/urlmon/binding.c b/reactos/dll/win32/urlmon/binding.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/binding.c
rename to reactos/dll/win32/urlmon/binding.c

diff --git a/reactos/base/shell/ie/urlmon/bindprot.c b/reactos/dll/win32/urlmon/bindprot.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/bindprot.c
rename to reactos/dll/win32/urlmon/bindprot.c

diff --git a/reactos/base/shell/ie/urlmon/download.c b/reactos/dll/win32/urlmon/download.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/download.c
rename to reactos/dll/win32/urlmon/download.c

diff --git a/reactos/base/shell/ie/urlmon/file.c b/reactos/dll/win32/urlmon/file.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/file.c
rename to reactos/dll/win32/urlmon/file.c

diff --git a/reactos/base/shell/ie/urlmon/format.c b/reactos/dll/win32/urlmon/format.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/format.c
rename to reactos/dll/win32/urlmon/format.c

diff --git a/reactos/base/shell/ie/urlmon/ftp.c b/reactos/dll/win32/urlmon/ftp.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/ftp.c
rename to reactos/dll/win32/urlmon/ftp.c

diff --git a/reactos/base/shell/ie/urlmon/gopher.c b/reactos/dll/win32/urlmon/gopher.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/gopher.c
rename to reactos/dll/win32/urlmon/gopher.c

diff --git a/reactos/base/shell/ie/urlmon/http.c b/reactos/dll/win32/urlmon/http.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/http.c
rename to reactos/dll/win32/urlmon/http.c

diff --git a/reactos/base/shell/ie/urlmon/internet.c b/reactos/dll/win32/urlmon/internet.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/internet.c
rename to reactos/dll/win32/urlmon/internet.c

diff --git a/reactos/base/shell/ie/urlmon/mimefilter.c b/reactos/dll/win32/urlmon/mimefilter.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/mimefilter.c
rename to reactos/dll/win32/urlmon/mimefilter.c

diff --git a/reactos/base/shell/ie/urlmon/mk.c b/reactos/dll/win32/urlmon/mk.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/mk.c
rename to reactos/dll/win32/urlmon/mk.c

diff --git a/reactos/base/shell/ie/urlmon/protocol.c b/reactos/dll/win32/urlmon/protocol.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/protocol.c
rename to reactos/dll/win32/urlmon/protocol.c

diff --git a/reactos/base/shell/ie/urlmon/resource.h b/reactos/dll/win32/urlmon/resource.h
similarity index 100%
rename from reactos/base/shell/ie/urlmon/resource.h
rename to reactos/dll/win32/urlmon/resource.h

diff --git a/reactos/base/shell/ie/urlmon/sec_mgr.c b/reactos/dll/win32/urlmon/sec_mgr.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/sec_mgr.c
rename to reactos/dll/win32/urlmon/sec_mgr.c

diff --git a/reactos/base/shell/ie/urlmon/session.c b/reactos/dll/win32/urlmon/session.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/session.c
rename to reactos/dll/win32/urlmon/session.c

diff --git a/reactos/base/shell/ie/urlmon/umon.c b/reactos/dll/win32/urlmon/umon.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/umon.c
rename to reactos/dll/win32/urlmon/umon.c

diff --git a/reactos/base/shell/ie/urlmon/umstream.c b/reactos/dll/win32/urlmon/umstream.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/umstream.c
rename to reactos/dll/win32/urlmon/umstream.c

diff --git a/reactos/base/shell/ie/urlmon/uri.c b/reactos/dll/win32/urlmon/uri.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/uri.c
rename to reactos/dll/win32/urlmon/uri.c

diff --git a/reactos/base/shell/ie/urlmon/urlmon.inf b/reactos/dll/win32/urlmon/urlmon.inf
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon.inf
rename to reactos/dll/win32/urlmon/urlmon.inf

diff --git a/reactos/base/shell/ie/urlmon/urlmon.rc b/reactos/dll/win32/urlmon/urlmon.rc
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon.rc
rename to reactos/dll/win32/urlmon/urlmon.rc

diff --git a/reactos/base/shell/ie/urlmon/urlmon.rgs b/reactos/dll/win32/urlmon/urlmon.rgs
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon.rgs
rename to reactos/dll/win32/urlmon/urlmon.rgs

diff --git a/reactos/base/shell/ie/urlmon/urlmon.spec b/reactos/dll/win32/urlmon/urlmon.spec
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon.spec
rename to reactos/dll/win32/urlmon/urlmon.spec

diff --git a/reactos/base/shell/ie/urlmon/urlmon_main.c b/reactos/dll/win32/urlmon/urlmon_main.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon_main.c
rename to reactos/dll/win32/urlmon/urlmon_main.c

diff --git a/reactos/base/shell/ie/urlmon/urlmon_main.h b/reactos/dll/win32/urlmon/urlmon_main.h
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon_main.h
rename to reactos/dll/win32/urlmon/urlmon_main.h

diff --git a/reactos/base/shell/ie/urlmon/urlmon_ros.diff b/reactos/dll/win32/urlmon/urlmon_ros.diff
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon_ros.diff
rename to reactos/dll/win32/urlmon/urlmon_ros.diff

diff --git a/reactos/base/shell/ie/urlmon/urlmon_urlmon.idl b/reactos/dll/win32/urlmon/urlmon_urlmon.idl
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon_urlmon.idl
rename to reactos/dll/win32/urlmon/urlmon_urlmon.idl

diff --git a/reactos/base/shell/ie/urlmon/urlmon_urlmon.rgs b/reactos/dll/win32/urlmon/urlmon_urlmon.rgs
similarity index 100%
rename from reactos/base/shell/ie/urlmon/urlmon_urlmon.rgs
rename to reactos/dll/win32/urlmon/urlmon_urlmon.rgs

diff --git a/reactos/base/shell/ie/urlmon/usrmarshal.c b/reactos/dll/win32/urlmon/usrmarshal.c
similarity index 100%
rename from reactos/base/shell/ie/urlmon/usrmarshal.c
rename to reactos/dll/win32/urlmon/usrmarshal.c

diff --git a/reactos/subsystems/CMakeLists.txt b/reactos/subsystems/CMakeLists.txt
index da98473..d77ca2f 100644 (file)
--- a/reactos/subsystems/CMakeLists.txt
+++ b/reactos/subsystems/CMakeLists.txt
@@ -1,2 +1,4 @@
 
 add_subdirectory(mvdm)
+add_subdirectory(win)
+add_subdirectory(win32)

diff --git a/reactos/subsystems/win/CMakeLists.txt b/reactos/subsystems/win/CMakeLists.txt
new file mode 100644 (file)
index 0000000..df6fe17
--- /dev/null
+++ b/reactos/subsystems/win/CMakeLists.txt
@@ -0,0 +1,2 @@
+
+add_subdirectory(basesrv)

diff --git a/reactos/win32ss/base/basesrv/CMakeLists.txt b/reactos/subsystems/win/basesrv/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/base/basesrv/CMakeLists.txt
rename to reactos/subsystems/win/basesrv/CMakeLists.txt

diff --git a/reactos/win32ss/base/basesrv/api.h b/reactos/subsystems/win/basesrv/api.h
similarity index 100%
rename from reactos/win32ss/base/basesrv/api.h
rename to reactos/subsystems/win/basesrv/api.h

diff --git a/reactos/win32ss/base/basesrv/appcompat.c b/reactos/subsystems/win/basesrv/appcompat.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/appcompat.c
rename to reactos/subsystems/win/basesrv/appcompat.c

diff --git a/reactos/win32ss/base/basesrv/basesrv.h b/reactos/subsystems/win/basesrv/basesrv.h
similarity index 100%
rename from reactos/win32ss/base/basesrv/basesrv.h
rename to reactos/subsystems/win/basesrv/basesrv.h

diff --git a/reactos/win32ss/base/basesrv/basesrv.rc b/reactos/subsystems/win/basesrv/basesrv.rc
similarity index 100%
rename from reactos/win32ss/base/basesrv/basesrv.rc
rename to reactos/subsystems/win/basesrv/basesrv.rc

diff --git a/reactos/win32ss/base/basesrv/basesrv.spec b/reactos/subsystems/win/basesrv/basesrv.spec
similarity index 100%
rename from reactos/win32ss/base/basesrv/basesrv.spec
rename to reactos/subsystems/win/basesrv/basesrv.spec

diff --git a/reactos/win32ss/base/basesrv/dosdev.c b/reactos/subsystems/win/basesrv/dosdev.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/dosdev.c
rename to reactos/subsystems/win/basesrv/dosdev.c

diff --git a/reactos/win32ss/base/basesrv/init.c b/reactos/subsystems/win/basesrv/init.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/init.c
rename to reactos/subsystems/win/basesrv/init.c

diff --git a/reactos/win32ss/base/basesrv/nls.c b/reactos/subsystems/win/basesrv/nls.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/nls.c
rename to reactos/subsystems/win/basesrv/nls.c

diff --git a/reactos/win32ss/base/basesrv/proc.c b/reactos/subsystems/win/basesrv/proc.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/proc.c
rename to reactos/subsystems/win/basesrv/proc.c

diff --git a/reactos/win32ss/base/basesrv/sndsntry.c b/reactos/subsystems/win/basesrv/sndsntry.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/sndsntry.c
rename to reactos/subsystems/win/basesrv/sndsntry.c

diff --git a/reactos/win32ss/base/basesrv/vdm.c b/reactos/subsystems/win/basesrv/vdm.c
similarity index 100%
rename from reactos/win32ss/base/basesrv/vdm.c
rename to reactos/subsystems/win/basesrv/vdm.c

diff --git a/reactos/win32ss/base/basesrv/vdm.h b/reactos/subsystems/win/basesrv/vdm.h
similarity index 100%
rename from reactos/win32ss/base/basesrv/vdm.h
rename to reactos/subsystems/win/basesrv/vdm.h

diff --git a/reactos/win32ss/core/csr/CMakeLists.txt b/reactos/subsystems/win32/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/csr/CMakeLists.txt
rename to reactos/subsystems/win32/CMakeLists.txt

diff --git a/reactos/win32ss/core/csr/csrsrv/CMakeLists.txt b/reactos/subsystems/win32/csrsrv/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/CMakeLists.txt
rename to reactos/subsystems/win32/csrsrv/CMakeLists.txt

diff --git a/reactos/win32ss/core/csr/csrsrv/api.c b/reactos/subsystems/win32/csrsrv/api.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/api.c
rename to reactos/subsystems/win32/csrsrv/api.c

diff --git a/reactos/win32ss/core/csr/csrsrv/api.h b/reactos/subsystems/win32/csrsrv/api.h
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/api.h
rename to reactos/subsystems/win32/csrsrv/api.h

diff --git a/reactos/win32ss/core/csr/csrsrv/csrsrv.rc b/reactos/subsystems/win32/csrsrv/csrsrv.rc
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/csrsrv.rc
rename to reactos/subsystems/win32/csrsrv/csrsrv.rc

diff --git a/reactos/win32ss/core/csr/csrsrv/csrsrv.spec b/reactos/subsystems/win32/csrsrv/csrsrv.spec
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/csrsrv.spec
rename to reactos/subsystems/win32/csrsrv/csrsrv.spec

diff --git a/reactos/win32ss/core/csr/csrsrv/init.c b/reactos/subsystems/win32/csrsrv/init.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/init.c
rename to reactos/subsystems/win32/csrsrv/init.c

diff --git a/reactos/win32ss/core/csr/csrsrv/procsup.c b/reactos/subsystems/win32/csrsrv/procsup.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/procsup.c
rename to reactos/subsystems/win32/csrsrv/procsup.c

diff --git a/reactos/win32ss/core/csr/csrsrv/server.c b/reactos/subsystems/win32/csrsrv/server.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/server.c
rename to reactos/subsystems/win32/csrsrv/server.c

diff --git a/reactos/win32ss/core/csr/csrsrv/session.c b/reactos/subsystems/win32/csrsrv/session.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/session.c
rename to reactos/subsystems/win32/csrsrv/session.c

diff --git a/reactos/win32ss/core/csr/csrsrv/srv.h b/reactos/subsystems/win32/csrsrv/srv.h
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/srv.h
rename to reactos/subsystems/win32/csrsrv/srv.h

diff --git a/reactos/win32ss/core/csr/csrsrv/status.h b/reactos/subsystems/win32/csrsrv/status.h
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/status.h
rename to reactos/subsystems/win32/csrsrv/status.h

diff --git a/reactos/win32ss/core/csr/csrsrv/thredsup.c b/reactos/subsystems/win32/csrsrv/thredsup.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/thredsup.c
rename to reactos/subsystems/win32/csrsrv/thredsup.c

diff --git a/reactos/win32ss/core/csr/csrsrv/wait.c b/reactos/subsystems/win32/csrsrv/wait.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrsrv/wait.c
rename to reactos/subsystems/win32/csrsrv/wait.c

diff --git a/reactos/win32ss/core/csr/csrss/CMakeLists.txt b/reactos/subsystems/win32/csrss/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/csr/csrss/CMakeLists.txt
rename to reactos/subsystems/win32/csrss/CMakeLists.txt

diff --git a/reactos/win32ss/core/csr/csrss/csrss.c b/reactos/subsystems/win32/csrss/csrss.c
similarity index 100%
rename from reactos/win32ss/core/csr/csrss/csrss.c
rename to reactos/subsystems/win32/csrss/csrss.c

diff --git a/reactos/win32ss/core/csr/csrss/csrss.rc b/reactos/subsystems/win32/csrss/csrss.rc
similarity index 100%
rename from reactos/win32ss/core/csr/csrss/csrss.rc
rename to reactos/subsystems/win32/csrss/csrss.rc

diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index b7428c4..67876ff 100644 (file)
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -1,3 +1,235 @@
 
-add_subdirectory(base)
-add_subdirectory(core)
+set(USE_DIBLIB FALSE)
+
+# Give WIN32 subsystem its own project.
+PROJECT(WIN32SS)
+
+add_subdirectory(drivers)
+
+if(USE_DIBLIB)
+    add_subdirectory(gdi/diblib)
+endif()
+
+add_subdirectory(gdi/gdi32)
+add_subdirectory(reactx)
+add_subdirectory(user/user32)
+add_subdirectory(user/winsrv)
+
+spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
+
+include_directories(
+    .
+    include
+    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
+    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
+    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
+    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
+
+add_definitions(
+    -DLANGPACK
+    -D_WIN32K_)
+
+file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib)
+
+list(APPEND GENDIB_FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c
+    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c)
+
+add_custom_command(
+    OUTPUT ${GENDIB_FILES}
+    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib
+    DEPENDS native-gendib)
+
+list(APPEND SOURCE
+    gdi/dib/alphablend.c
+    gdi/dib/dib1bpp.c
+    gdi/dib/dib4bpp.c
+    gdi/dib/dib8bpp.c
+    gdi/dib/dib16bpp.c
+    gdi/dib/dib24bpp.c
+    gdi/dib/dib32bpp.c
+    gdi/dib/floodfill.c
+    gdi/dib/stretchblt.c
+    gdi/eng/alphablend.c
+    gdi/eng/bitblt.c
+    gdi/eng/engbrush.c
+    gdi/eng/engevent.c
+    gdi/eng/clip.c
+    gdi/eng/debug.c
+    gdi/eng/device.c
+    gdi/eng/driverobj.c
+    gdi/eng/error.c
+    gdi/eng/float.c
+    gdi/eng/gradient.c
+    gdi/eng/lineto.c
+    gdi/eng/ldevobj.c
+    gdi/eng/mapping.c
+    gdi/eng/math.c
+    gdi/eng/mem.c
+    gdi/eng/engmisc.c
+    gdi/eng/mouse.c
+    gdi/eng/paint.c
+    gdi/eng/pdevobj.c
+    gdi/eng/perfcnt.c
+    gdi/eng/rlecomp.c
+    gdi/eng/semaphor.c
+    gdi/eng/sort.c
+    gdi/eng/string.c
+    gdi/eng/stretchblt.c
+    gdi/eng/surface.c
+    gdi/eng/transblt.c
+    gdi/eng/engwindow.c
+    gdi/eng/xlateobj.c
+    user/ntuser/main.c
+    user/ntuser/misc/file.c
+    user/ntuser/misc/rtlstr.c
+    user/ntuser/misc/copy.c
+    user/ntuser/misc/registry.c
+    reactx/ntddraw/ddraw.c
+    reactx/ntddraw/dd.c
+    reactx/ntddraw/ddsurf.c
+    reactx/ntddraw/d3d.c
+    reactx/ntddraw/dvp.c
+    reactx/ntddraw/mocomp.c
+    reactx/ntddraw/eng.c
+    reactx/ntddraw/dxeng.c
+    user/ntuser/accelerator.c
+    user/ntuser/callback.c
+    user/ntuser/callproc.c
+    user/ntuser/caret.c
+    user/ntuser/class.c
+    user/ntuser/clipboard.c
+    user/ntuser/csr.c
+    user/ntuser/cursoricon.c
+    user/ntuser/dde.c
+    user/ntuser/defwnd.c
+    user/ntuser/desktop.c
+    user/ntuser/display.c
+    user/ntuser/draw.c
+    user/ntuser/event.c
+    user/ntuser/focus.c
+    user/ntuser/guicheck.c
+    user/ntuser/hook.c
+    user/ntuser/hotkey.c
+    user/ntuser/input.c
+    user/ntuser/ime.c
+    user/ntuser/keyboard.c
+    user/ntuser/kbdlayout.c
+    user/ntuser/menu.c
+    user/ntuser/message.c
+    user/ntuser/metric.c
+    user/ntuser/misc.c
+    user/ntuser/monitor.c
+    user/ntuser/mouse.c
+    user/ntuser/msgqueue.c
+    user/ntuser/ntstubs.c
+    user/ntuser/ntuser.c
+    user/ntuser/painting.c
+    user/ntuser/prop.c
+    user/ntuser/scrollbar.c
+    user/ntuser/session.c
+    user/ntuser/shutdown.c
+    user/ntuser/simplecall.c
+    user/ntuser/sysparams.c
+    user/ntuser/timer.c
+    user/ntuser/useratom.c
+    user/ntuser/usrheap.c
+    user/ntuser/vis.c
+    user/ntuser/windc.c
+    user/ntuser/window.c
+    user/ntuser/winpos.c
+    user/ntuser/winsta.c
+    user/ntuser/object.c
+    gdi/ntgdi/arc.c
+    gdi/ntgdi/bezier.c
+    gdi/ntgdi/bitblt.c
+    gdi/ntgdi/bitmaps.c
+    gdi/ntgdi/brush.c
+    gdi/ntgdi/cliprgn.c
+    gdi/ntgdi/coord.c
+    gdi/ntgdi/dcattr.c
+    gdi/ntgdi/dclife.c
+    gdi/ntgdi/dcobjs.c
+    gdi/ntgdi/dcstate.c
+    gdi/ntgdi/dcutil.c
+    gdi/ntgdi/device.c
+    gdi/ntgdi/dibobj.c
+    gdi/ntgdi/drawing.c
+    gdi/ntgdi/fillshap.c
+    gdi/ntgdi/font.c
+    gdi/ntgdi/freetype.c
+    gdi/ntgdi/gdibatch.c
+    gdi/ntgdi/gdidbg.c
+    gdi/ntgdi/gdiobj.c
+    gdi/ntgdi/gdipool.c
+    gdi/ntgdi/icm.c
+    gdi/ntgdi/init.c
+    gdi/ntgdi/line.c
+    gdi/ntgdi/metafile.c
+    gdi/ntgdi/palette.c
+    gdi/ntgdi/path.c
+    gdi/ntgdi/pen.c
+    gdi/ntgdi/polyfill.c
+    gdi/ntgdi/print.c
+    gdi/ntgdi/rect.c
+    gdi/ntgdi/region.c
+    gdi/ntgdi/stockobj.c
+    gdi/ntgdi/text.c
+    gdi/ntgdi/wingl.c
+    gdi/ntgdi/xformobj.c
+    gdi/eng/stubs.c
+    gdi/eng/umpdstubs.c
+    pch.h)
+
+if(USE_DIBLIB)
+    add_definitions(-D_USE_DIBLIB_)
+    list(APPEND SOURCE
+        gdi/dib/dib_new.c
+        gdi/eng/bitblt_new.c)
+else()
+    list(APPEND SOURCE
+        gdi/dib/dib.c
+        gdi/eng/copybits.c
+        ${GENDIB_FILES})
+endif()
+
+if(ARCH STREQUAL "i386")
+list(APPEND ASM_SOURCE
+    gdi/dib/i386/dib24bpp_hline.s
+    gdi/dib/i386/dib32bpp_hline.s
+    gdi/dib/i386/dib32bpp_colorfill.s
+    gdi/eng/i386/floatobj.S)
+else()
+list(APPEND SOURCE
+    gdi/dib/dib24bppc.c
+    gdi/dib/dib32bppc.c)
+endif()
+
+if(KDBG)
+    list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c)
+endif()
+
+add_asm_files(win32k_asm ${ASM_SOURCE})
+
+add_library(win32k SHARED
+    ${SOURCE}
+    ${win32k_asm}
+    win32k.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
+
+set_module_type(win32k kernelmodedriver)
+target_link_libraries(win32k ${PSEH_LIB} dxguid libcntpr)
+
+if(USE_DIBLIB)
+    target_link_libraries(win32k diblib)
+endif()
+
+add_importlibs(win32k ntoskrnl hal ftfd)
+add_pch(win32k pch.h SOURCE)
+add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
+
+set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
+add_asm_files(win32ksys_asm sys-stubs.S)
+add_library(win32ksys ${win32ksys_asm})
+set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")

diff --git a/reactos/win32ss/base/CMakeLists.txt b/reactos/win32ss/base/CMakeLists.txt
deleted file mode 100644 (file)
index 170794f..0000000
--- a/reactos/win32ss/base/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-
-add_subdirectory(advapi32)
-add_subdirectory(basesrv)
-add_subdirectory(kernel32)
-add_subdirectory(kernel32_vista)
-add_subdirectory(scm)

diff --git a/reactos/win32ss/base/scm/CMakeLists.txt b/reactos/win32ss/base/scm/CMakeLists.txt
deleted file mode 100644 (file)
index 085e34d..0000000
--- a/reactos/win32ss/base/scm/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-
-add_subdirectory(services)
-add_subdirectory(svchost)

diff --git a/reactos/win32ss/core/CMakeLists.txt b/reactos/win32ss/core/CMakeLists.txt
deleted file mode 100644 (file)
index 908af6a..0000000
--- a/reactos/win32ss/core/CMakeLists.txt
+++ /dev/null
@@ -1,237 +0,0 @@
-
-add_subdirectory(csr)
-
-set(USE_DIBLIB FALSE)
-
-# Give WIN32 subsystem its own project.
-PROJECT(WIN32SS)
-
-add_subdirectory(drivers)
-
-if(USE_DIBLIB)
-    add_subdirectory(gdi/diblib)
-endif()
-
-add_subdirectory(gdi/gdi32)
-add_subdirectory(reactx)
-add_subdirectory(user/user32)
-add_subdirectory(user/winsrv)
-
-spec2def(win32k.sys win32k.spec ADD_IMPORTLIB)
-
-include_directories(
-    .
-    include
-    ${REACTOS_SOURCE_DIR}/ntoskrnl/include
-    ${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include
-    ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/include/reactos/drivers)
-
-add_definitions(
-    -DLANGPACK
-    -D_WIN32K_)
-
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib)
-
-list(APPEND GENDIB_FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib8gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib16gen.c
-    ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib/dib32gen.c)
-
-add_custom_command(
-    OUTPUT ${GENDIB_FILES}
-    COMMAND native-gendib ${CMAKE_CURRENT_BINARY_DIR}/gdi/dib
-    DEPENDS native-gendib)
-
-list(APPEND SOURCE
-    gdi/dib/alphablend.c
-    gdi/dib/dib1bpp.c
-    gdi/dib/dib4bpp.c
-    gdi/dib/dib8bpp.c
-    gdi/dib/dib16bpp.c
-    gdi/dib/dib24bpp.c
-    gdi/dib/dib32bpp.c
-    gdi/dib/floodfill.c
-    gdi/dib/stretchblt.c
-    gdi/eng/alphablend.c
-    gdi/eng/bitblt.c
-    gdi/eng/engbrush.c
-    gdi/eng/engevent.c
-    gdi/eng/clip.c
-    gdi/eng/debug.c
-    gdi/eng/device.c
-    gdi/eng/driverobj.c
-    gdi/eng/error.c
-    gdi/eng/float.c
-    gdi/eng/gradient.c
-    gdi/eng/lineto.c
-    gdi/eng/ldevobj.c
-    gdi/eng/mapping.c
-    gdi/eng/math.c
-    gdi/eng/mem.c
-    gdi/eng/engmisc.c
-    gdi/eng/mouse.c
-    gdi/eng/paint.c
-    gdi/eng/pdevobj.c
-    gdi/eng/perfcnt.c
-    gdi/eng/rlecomp.c
-    gdi/eng/semaphor.c
-    gdi/eng/sort.c
-    gdi/eng/string.c
-    gdi/eng/stretchblt.c
-    gdi/eng/surface.c
-    gdi/eng/transblt.c
-    gdi/eng/engwindow.c
-    gdi/eng/xlateobj.c
-    user/ntuser/main.c
-    user/ntuser/misc/file.c
-    user/ntuser/misc/rtlstr.c
-    user/ntuser/misc/copy.c
-    user/ntuser/misc/registry.c
-    reactx/ntddraw/ddraw.c
-    reactx/ntddraw/dd.c
-    reactx/ntddraw/ddsurf.c
-    reactx/ntddraw/d3d.c
-    reactx/ntddraw/dvp.c
-    reactx/ntddraw/mocomp.c
-    reactx/ntddraw/eng.c
-    reactx/ntddraw/dxeng.c
-    user/ntuser/accelerator.c
-    user/ntuser/callback.c
-    user/ntuser/callproc.c
-    user/ntuser/caret.c
-    user/ntuser/class.c
-    user/ntuser/clipboard.c
-    user/ntuser/csr.c
-    user/ntuser/cursoricon.c
-    user/ntuser/dde.c
-    user/ntuser/defwnd.c
-    user/ntuser/desktop.c
-    user/ntuser/display.c
-    user/ntuser/draw.c
-    user/ntuser/event.c
-    user/ntuser/focus.c
-    user/ntuser/guicheck.c
-    user/ntuser/hook.c
-    user/ntuser/hotkey.c
-    user/ntuser/input.c
-    user/ntuser/ime.c
-    user/ntuser/keyboard.c
-    user/ntuser/kbdlayout.c
-    user/ntuser/menu.c
-    user/ntuser/message.c
-    user/ntuser/metric.c
-    user/ntuser/misc.c
-    user/ntuser/monitor.c
-    user/ntuser/mouse.c
-    user/ntuser/msgqueue.c
-    user/ntuser/ntstubs.c
-    user/ntuser/ntuser.c
-    user/ntuser/painting.c
-    user/ntuser/prop.c
-    user/ntuser/scrollbar.c
-    user/ntuser/session.c
-    user/ntuser/shutdown.c
-    user/ntuser/simplecall.c
-    user/ntuser/sysparams.c
-    user/ntuser/timer.c
-    user/ntuser/useratom.c
-    user/ntuser/usrheap.c
-    user/ntuser/vis.c
-    user/ntuser/windc.c
-    user/ntuser/window.c
-    user/ntuser/winpos.c
-    user/ntuser/winsta.c
-    user/ntuser/object.c
-    gdi/ntgdi/arc.c
-    gdi/ntgdi/bezier.c
-    gdi/ntgdi/bitblt.c
-    gdi/ntgdi/bitmaps.c
-    gdi/ntgdi/brush.c
-    gdi/ntgdi/cliprgn.c
-    gdi/ntgdi/coord.c
-    gdi/ntgdi/dcattr.c
-    gdi/ntgdi/dclife.c
-    gdi/ntgdi/dcobjs.c
-    gdi/ntgdi/dcstate.c
-    gdi/ntgdi/dcutil.c
-    gdi/ntgdi/device.c
-    gdi/ntgdi/dibobj.c
-    gdi/ntgdi/drawing.c
-    gdi/ntgdi/fillshap.c
-    gdi/ntgdi/font.c
-    gdi/ntgdi/freetype.c
-    gdi/ntgdi/gdibatch.c
-    gdi/ntgdi/gdidbg.c
-    gdi/ntgdi/gdiobj.c
-    gdi/ntgdi/gdipool.c
-    gdi/ntgdi/icm.c
-    gdi/ntgdi/init.c
-    gdi/ntgdi/line.c
-    gdi/ntgdi/metafile.c
-    gdi/ntgdi/palette.c
-    gdi/ntgdi/path.c
-    gdi/ntgdi/pen.c
-    gdi/ntgdi/polyfill.c
-    gdi/ntgdi/print.c
-    gdi/ntgdi/rect.c
-    gdi/ntgdi/region.c
-    gdi/ntgdi/stockobj.c
-    gdi/ntgdi/text.c
-    gdi/ntgdi/wingl.c
-    gdi/ntgdi/xformobj.c
-    gdi/eng/stubs.c
-    gdi/eng/umpdstubs.c
-    pch.h)
-
-if(USE_DIBLIB)
-    add_definitions(-D_USE_DIBLIB_)
-    list(APPEND SOURCE
-        gdi/dib/dib_new.c
-        gdi/eng/bitblt_new.c)
-else()
-    list(APPEND SOURCE
-        gdi/dib/dib.c
-        gdi/eng/copybits.c
-        ${GENDIB_FILES})
-endif()
-
-if(ARCH STREQUAL "i386")
-list(APPEND ASM_SOURCE
-    gdi/dib/i386/dib24bpp_hline.s
-    gdi/dib/i386/dib32bpp_hline.s
-    gdi/dib/i386/dib32bpp_colorfill.s
-    gdi/eng/i386/floatobj.S)
-else()
-list(APPEND SOURCE
-    gdi/dib/dib24bppc.c
-    gdi/dib/dib32bppc.c)
-endif()
-
-if(KDBG)
-    list(APPEND SOURCE gdi/ntgdi/gdikdbgext.c)
-endif()
-
-add_asm_files(win32k_asm ${ASM_SOURCE})
-
-add_library(win32k SHARED
-    ${SOURCE}
-    ${win32k_asm}
-    win32k.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/win32k.def)
-
-set_module_type(win32k kernelmodedriver)
-target_link_libraries(win32k ${PSEH_LIB} dxguid libcntpr)
-
-if(USE_DIBLIB)
-    target_link_libraries(win32k diblib)
-endif()
-
-add_importlibs(win32k ntoskrnl hal ftfd)
-add_pch(win32k pch.h SOURCE)
-add_cd_file(TARGET win32k DESTINATION reactos/system32 FOR all)
-
-set_source_files_properties(sys-stubs.S PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/w32ksvc.h)
-add_asm_files(win32ksys_asm sys-stubs.S)
-add_library(win32ksys ${win32ksys_asm})
-set_target_properties(win32ksys PROPERTIES LINKER_LANGUAGE "C")

diff --git a/reactos/win32ss/core/drivers/CMakeLists.txt b/reactos/win32ss/drivers/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/CMakeLists.txt
rename to reactos/win32ss/drivers/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/displays/CMakeLists.txt b/reactos/win32ss/drivers/displays/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/framebuf/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/dd.c b/reactos/win32ss/drivers/displays/framebuf/dd.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/dd.c
rename to reactos/win32ss/drivers/displays/framebuf/dd.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/ddenable.c b/reactos/win32ss/drivers/displays/framebuf/ddenable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/ddenable.c
rename to reactos/win32ss/drivers/displays/framebuf/ddenable.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/enable.c b/reactos/win32ss/drivers/displays/framebuf/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/enable.c
rename to reactos/win32ss/drivers/displays/framebuf/enable.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/framebuf.h b/reactos/win32ss/drivers/displays/framebuf/framebuf.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/framebuf.h
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.h

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/framebuf.rc b/reactos/win32ss/drivers/displays/framebuf/framebuf.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/framebuf.rc
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.rc

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/framebuf.spec b/reactos/win32ss/drivers/displays/framebuf/framebuf.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/framebuf.spec
rename to reactos/win32ss/drivers/displays/framebuf/framebuf.spec

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/palette.c b/reactos/win32ss/drivers/displays/framebuf/palette.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/palette.c
rename to reactos/win32ss/drivers/displays/framebuf/palette.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/pointer.c b/reactos/win32ss/drivers/displays/framebuf/pointer.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/pointer.c
rename to reactos/win32ss/drivers/displays/framebuf/pointer.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/screen.c b/reactos/win32ss/drivers/displays/framebuf/screen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/screen.c
rename to reactos/win32ss/drivers/displays/framebuf/screen.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf/surface.c b/reactos/win32ss/drivers/displays/framebuf/surface.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf/surface.c
rename to reactos/win32ss/drivers/displays/framebuf/surface.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/CMakeLists.txt b/reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/framebuf_new/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/debug.c b/reactos/win32ss/drivers/displays/framebuf_new/debug.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/debug.c
rename to reactos/win32ss/drivers/displays/framebuf_new/debug.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/debug.h b/reactos/win32ss/drivers/displays/framebuf_new/debug.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/debug.h
rename to reactos/win32ss/drivers/displays/framebuf_new/debug.h

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/driver.h b/reactos/win32ss/drivers/displays/framebuf_new/driver.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/driver.h
rename to reactos/win32ss/drivers/displays/framebuf_new/driver.h

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/enable.c b/reactos/win32ss/drivers/displays/framebuf_new/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/enable.c
rename to reactos/win32ss/drivers/displays/framebuf_new/enable.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/framebuf_new.rc b/reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/framebuf_new.rc
rename to reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.rc

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/framebuf_new.spec b/reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/framebuf_new.spec
rename to reactos/win32ss/drivers/displays/framebuf_new/framebuf_new.spec

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/palette.c b/reactos/win32ss/drivers/displays/framebuf_new/palette.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/palette.c
rename to reactos/win32ss/drivers/displays/framebuf_new/palette.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/pointer.c b/reactos/win32ss/drivers/displays/framebuf_new/pointer.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/pointer.c
rename to reactos/win32ss/drivers/displays/framebuf_new/pointer.c

diff --git a/reactos/win32ss/core/drivers/displays/framebuf_new/screen.c b/reactos/win32ss/drivers/displays/framebuf_new/screen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebuf_new/screen.c
rename to reactos/win32ss/drivers/displays/framebuf_new/screen.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/dd.c b/reactos/win32ss/drivers/displays/framebufacc/dd.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/dd.c
rename to reactos/win32ss/drivers/displays/framebufacc/dd.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/ddenable.c b/reactos/win32ss/drivers/displays/framebufacc/ddenable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/ddenable.c
rename to reactos/win32ss/drivers/displays/framebufacc/ddenable.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/enable.c b/reactos/win32ss/drivers/displays/framebufacc/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/enable.c
rename to reactos/win32ss/drivers/displays/framebufacc/enable.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.h b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.h
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.h

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.rc b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.rc
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.rc

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.spec b/reactos/win32ss/drivers/displays/framebufacc/framebufacc.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/framebufacc.spec
rename to reactos/win32ss/drivers/displays/framebufacc/framebufacc.spec

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/palette.c b/reactos/win32ss/drivers/displays/framebufacc/palette.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/palette.c
rename to reactos/win32ss/drivers/displays/framebufacc/palette.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/pointer.c b/reactos/win32ss/drivers/displays/framebufacc/pointer.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/pointer.c
rename to reactos/win32ss/drivers/displays/framebufacc/pointer.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/screen.c b/reactos/win32ss/drivers/displays/framebufacc/screen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/screen.c
rename to reactos/win32ss/drivers/displays/framebufacc/screen.c

diff --git a/reactos/win32ss/core/drivers/displays/framebufacc/surface.c b/reactos/win32ss/drivers/displays/framebufacc/surface.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/framebufacc/surface.c
rename to reactos/win32ss/drivers/displays/framebufacc/surface.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/CMakeLists.txt b/reactos/win32ss/drivers/displays/vga/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/CMakeLists.txt
rename to reactos/win32ss/drivers/displays/vga/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/displays/vga/main/enable.c b/reactos/win32ss/drivers/displays/vga/main/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/main/enable.c
rename to reactos/win32ss/drivers/displays/vga/main/enable.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/bitblt.c b/reactos/win32ss/drivers/displays/vga/objects/bitblt.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/bitblt.c
rename to reactos/win32ss/drivers/displays/vga/objects/bitblt.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/bitblt.h b/reactos/win32ss/drivers/displays/vga/objects/bitblt.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/bitblt.h
rename to reactos/win32ss/drivers/displays/vga/objects/bitblt.h

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/brush.h b/reactos/win32ss/drivers/displays/vga/objects/brush.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/brush.h
rename to reactos/win32ss/drivers/displays/vga/objects/brush.h

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/copybits.c b/reactos/win32ss/drivers/displays/vga/objects/copybits.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/copybits.c
rename to reactos/win32ss/drivers/displays/vga/objects/copybits.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/lineto.c b/reactos/win32ss/drivers/displays/vga/objects/lineto.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/lineto.c
rename to reactos/win32ss/drivers/displays/vga/objects/lineto.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/offscreen.c b/reactos/win32ss/drivers/displays/vga/objects/offscreen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/offscreen.c
rename to reactos/win32ss/drivers/displays/vga/objects/offscreen.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/paint.c b/reactos/win32ss/drivers/displays/vga/objects/paint.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/paint.c
rename to reactos/win32ss/drivers/displays/vga/objects/paint.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/pointer.c b/reactos/win32ss/drivers/displays/vga/objects/pointer.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/pointer.c
rename to reactos/win32ss/drivers/displays/vga/objects/pointer.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/screen.c b/reactos/win32ss/drivers/displays/vga/objects/screen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/screen.c
rename to reactos/win32ss/drivers/displays/vga/objects/screen.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/objects/transblt.c b/reactos/win32ss/drivers/displays/vga/objects/transblt.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/objects/transblt.c
rename to reactos/win32ss/drivers/displays/vga/objects/transblt.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/vgaddi.h b/reactos/win32ss/drivers/displays/vga/vgaddi.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/vgaddi.h
rename to reactos/win32ss/drivers/displays/vga/vgaddi.h

diff --git a/reactos/win32ss/core/drivers/displays/vga/vgaddi.rc b/reactos/win32ss/drivers/displays/vga/vgaddi.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/vgaddi.rc
rename to reactos/win32ss/drivers/displays/vga/vgaddi.rc

diff --git a/reactos/win32ss/core/drivers/displays/vga/vgaddi.spec b/reactos/win32ss/drivers/displays/vga/vgaddi.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/vgaddi.spec
rename to reactos/win32ss/drivers/displays/vga/vgaddi.spec

diff --git a/reactos/win32ss/core/drivers/displays/vga/vgavideo/vgavideo.c b/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/vgavideo/vgavideo.c
rename to reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.c

diff --git a/reactos/win32ss/core/drivers/displays/vga/vgavideo/vgavideo.h b/reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga/vgavideo/vgavideo.h
rename to reactos/win32ss/drivers/displays/vga/vgavideo/vgavideo.h

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/debug.c b/reactos/win32ss/drivers/displays/vga_new/debug.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/debug.c
rename to reactos/win32ss/drivers/displays/vga_new/debug.c

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/debug.h b/reactos/win32ss/drivers/displays/vga_new/debug.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/debug.h
rename to reactos/win32ss/drivers/displays/vga_new/debug.h

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/driver.h b/reactos/win32ss/drivers/displays/vga_new/driver.h
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/driver.h
rename to reactos/win32ss/drivers/displays/vga_new/driver.h

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/enable.c b/reactos/win32ss/drivers/displays/vga_new/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/enable.c
rename to reactos/win32ss/drivers/displays/vga_new/enable.c

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/palette.c b/reactos/win32ss/drivers/displays/vga_new/palette.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/palette.c
rename to reactos/win32ss/drivers/displays/vga_new/palette.c

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/screen.c b/reactos/win32ss/drivers/displays/vga_new/screen.c
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/screen.c
rename to reactos/win32ss/drivers/displays/vga_new/screen.c

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/vga_new.rc b/reactos/win32ss/drivers/displays/vga_new/vga_new.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/vga_new.rc
rename to reactos/win32ss/drivers/displays/vga_new/vga_new.rc

diff --git a/reactos/win32ss/core/drivers/displays/vga_new/vga_new.spec b/reactos/win32ss/drivers/displays/vga_new/vga_new.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/displays/vga_new/vga_new.spec
rename to reactos/win32ss/drivers/displays/vga_new/vga_new.spec

diff --git a/reactos/win32ss/core/drivers/font/CMakeLists.txt b/reactos/win32ss/drivers/font/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/font/CMakeLists.txt
rename to reactos/win32ss/drivers/font/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/font/bmfd/CMakeLists.txt b/reactos/win32ss/drivers/font/bmfd/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/font/bmfd/CMakeLists.txt
rename to reactos/win32ss/drivers/font/bmfd/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/font/bmfd/bmfd.h b/reactos/win32ss/drivers/font/bmfd/bmfd.h
similarity index 100%
rename from reactos/win32ss/core/drivers/font/bmfd/bmfd.h
rename to reactos/win32ss/drivers/font/bmfd/bmfd.h

diff --git a/reactos/win32ss/core/drivers/font/bmfd/enable.c b/reactos/win32ss/drivers/font/bmfd/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/bmfd/enable.c
rename to reactos/win32ss/drivers/font/bmfd/enable.c

diff --git a/reactos/win32ss/core/drivers/font/bmfd/font.c b/reactos/win32ss/drivers/font/bmfd/font.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/bmfd/font.c
rename to reactos/win32ss/drivers/font/bmfd/font.c

diff --git a/reactos/win32ss/core/drivers/font/bmfd/glyph.c b/reactos/win32ss/drivers/font/bmfd/glyph.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/bmfd/glyph.c
rename to reactos/win32ss/drivers/font/bmfd/glyph.c

diff --git a/reactos/win32ss/core/drivers/font/ftfd/CMakeLists.txt b/reactos/win32ss/drivers/font/ftfd/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/CMakeLists.txt
rename to reactos/win32ss/drivers/font/ftfd/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/font/ftfd/enable.c b/reactos/win32ss/drivers/font/ftfd/enable.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/enable.c
rename to reactos/win32ss/drivers/font/ftfd/enable.c

diff --git a/reactos/win32ss/core/drivers/font/ftfd/font.c b/reactos/win32ss/drivers/font/ftfd/font.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/font.c
rename to reactos/win32ss/drivers/font/ftfd/font.c

diff --git a/reactos/win32ss/core/drivers/font/ftfd/freetype.def b/reactos/win32ss/drivers/font/ftfd/freetype.def
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/freetype.def
rename to reactos/win32ss/drivers/font/ftfd/freetype.def

diff --git a/reactos/win32ss/core/drivers/font/ftfd/freetype.rc b/reactos/win32ss/drivers/font/ftfd/freetype.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/freetype.rc
rename to reactos/win32ss/drivers/font/ftfd/freetype.rc

diff --git a/reactos/win32ss/core/drivers/font/ftfd/ftfd.h b/reactos/win32ss/drivers/font/ftfd/ftfd.h
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/ftfd.h
rename to reactos/win32ss/drivers/font/ftfd/ftfd.h

diff --git a/reactos/win32ss/core/drivers/font/ftfd/ftfd.spec b/reactos/win32ss/drivers/font/ftfd/ftfd.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/ftfd.spec
rename to reactos/win32ss/drivers/font/ftfd/ftfd.spec

diff --git a/reactos/win32ss/core/drivers/font/ftfd/glyph.c b/reactos/win32ss/drivers/font/ftfd/glyph.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/glyph.c
rename to reactos/win32ss/drivers/font/ftfd/glyph.c

diff --git a/reactos/win32ss/core/drivers/font/ftfd/rosglue.c b/reactos/win32ss/drivers/font/ftfd/rosglue.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/rosglue.c
rename to reactos/win32ss/drivers/font/ftfd/rosglue.c

diff --git a/reactos/win32ss/core/drivers/font/ftfd/sprintf.c b/reactos/win32ss/drivers/font/ftfd/sprintf.c
similarity index 100%
rename from reactos/win32ss/core/drivers/font/ftfd/sprintf.c
rename to reactos/win32ss/drivers/font/ftfd/sprintf.c

diff --git a/reactos/win32ss/core/drivers/miniport/CMakeLists.txt b/reactos/win32ss/drivers/miniport/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/vbe/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vbe/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vbe/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/vbe/edid.c b/reactos/win32ss/drivers/miniport/vbe/edid.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vbe/edid.c
rename to reactos/win32ss/drivers/miniport/vbe/edid.c

diff --git a/reactos/win32ss/core/drivers/miniport/vbe/vbemp.c b/reactos/win32ss/drivers/miniport/vbe/vbemp.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vbe/vbemp.c
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.c

diff --git a/reactos/win32ss/core/drivers/miniport/vbe/vbemp.h b/reactos/win32ss/drivers/miniport/vbe/vbemp.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vbe/vbemp.h
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.h

diff --git a/reactos/win32ss/core/drivers/miniport/vbe/vbemp.rc b/reactos/win32ss/drivers/miniport/vbe/vbemp.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vbe/vbemp.rc
rename to reactos/win32ss/drivers/miniport/vbe/vbemp.rc

diff --git a/reactos/win32ss/core/drivers/miniport/vga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vga/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/vga/initvga.c b/reactos/win32ss/drivers/miniport/vga/initvga.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/initvga.c
rename to reactos/win32ss/drivers/miniport/vga/initvga.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga/vgamp.c b/reactos/win32ss/drivers/miniport/vga/vgamp.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/vgamp.c
rename to reactos/win32ss/drivers/miniport/vga/vgamp.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga/vgamp.h b/reactos/win32ss/drivers/miniport/vga/vgamp.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/vgamp.h
rename to reactos/win32ss/drivers/miniport/vga/vgamp.h

diff --git a/reactos/win32ss/core/drivers/miniport/vga/vgamp.rc b/reactos/win32ss/drivers/miniport/vga/vgamp.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/vgamp.rc
rename to reactos/win32ss/drivers/miniport/vga/vgamp.rc

diff --git a/reactos/win32ss/core/drivers/miniport/vga/vgavideo.h b/reactos/win32ss/drivers/miniport/vga/vgavideo.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga/vgavideo.h
rename to reactos/win32ss/drivers/miniport/vga/vgavideo.h

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vga_new/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/cmdcnst.h b/reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/cmdcnst.h
rename to reactos/win32ss/drivers/miniport/vga_new/cmdcnst.h

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/modeset.c b/reactos/win32ss/drivers/miniport/vga_new/modeset.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/modeset.c
rename to reactos/win32ss/drivers/miniport/vga_new/modeset.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vbe.c b/reactos/win32ss/drivers/miniport/vga_new/vbe.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vbe.c
rename to reactos/win32ss/drivers/miniport/vga_new/vbe.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vbe.h b/reactos/win32ss/drivers/miniport/vga_new/vbe.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vbe.h
rename to reactos/win32ss/drivers/miniport/vga_new/vbe.h

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vbemodes.c b/reactos/win32ss/drivers/miniport/vga_new/vbemodes.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vbemodes.c
rename to reactos/win32ss/drivers/miniport/vga_new/vbemodes.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vga.c b/reactos/win32ss/drivers/miniport/vga_new/vga.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vga.c
rename to reactos/win32ss/drivers/miniport/vga_new/vga.c

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vga.h b/reactos/win32ss/drivers/miniport/vga_new/vga.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vga.h
rename to reactos/win32ss/drivers/miniport/vga_new/vga.h

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vga.rc b/reactos/win32ss/drivers/miniport/vga_new/vga.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vga.rc
rename to reactos/win32ss/drivers/miniport/vga_new/vga.rc

diff --git a/reactos/win32ss/core/drivers/miniport/vga_new/vgadata.c b/reactos/win32ss/drivers/miniport/vga_new/vgadata.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vga_new/vgadata.c
rename to reactos/win32ss/drivers/miniport/vga_new/vgadata.c

diff --git a/reactos/win32ss/core/drivers/miniport/vmx_svga/CMakeLists.txt b/reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vmx_svga/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/vmx_svga/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/vmx_svga/precomp.h b/reactos/win32ss/drivers/miniport/vmx_svga/precomp.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vmx_svga/precomp.h
rename to reactos/win32ss/drivers/miniport/vmx_svga/precomp.h

diff --git a/reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_regs.h b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_regs.h
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_regs.h

diff --git a/reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_svga.c b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_svga.c
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.c

diff --git a/reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_svga.rc b/reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/vmx_svga/vmx_svga.rc
rename to reactos/win32ss/drivers/miniport/vmx_svga/vmx_svga.rc

diff --git a/reactos/win32ss/core/drivers/miniport/xboxvmp/CMakeLists.txt b/reactos/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/xboxvmp/CMakeLists.txt
rename to reactos/win32ss/drivers/miniport/xboxvmp/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.c b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.c
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.c
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.c

diff --git a/reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.h b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.h
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.h
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.h

diff --git a/reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.rc b/reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/miniport/xboxvmp/xboxvmp.rc
rename to reactos/win32ss/drivers/miniport/xboxvmp/xboxvmp.rc

diff --git a/reactos/win32ss/core/drivers/videoprt/CMakeLists.txt b/reactos/win32ss/drivers/videoprt/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/CMakeLists.txt
rename to reactos/win32ss/drivers/videoprt/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/videoprt/agp.c b/reactos/win32ss/drivers/videoprt/agp.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/agp.c
rename to reactos/win32ss/drivers/videoprt/agp.c

diff --git a/reactos/win32ss/core/drivers/videoprt/child.c b/reactos/win32ss/drivers/videoprt/child.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/child.c
rename to reactos/win32ss/drivers/videoprt/child.c

diff --git a/reactos/win32ss/core/drivers/videoprt/ddc.c b/reactos/win32ss/drivers/videoprt/ddc.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/ddc.c
rename to reactos/win32ss/drivers/videoprt/ddc.c

diff --git a/reactos/win32ss/core/drivers/videoprt/dispatch.c b/reactos/win32ss/drivers/videoprt/dispatch.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/dispatch.c
rename to reactos/win32ss/drivers/videoprt/dispatch.c

diff --git a/reactos/win32ss/core/drivers/videoprt/dma.c b/reactos/win32ss/drivers/videoprt/dma.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/dma.c
rename to reactos/win32ss/drivers/videoprt/dma.c

diff --git a/reactos/win32ss/core/drivers/videoprt/event.c b/reactos/win32ss/drivers/videoprt/event.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/event.c
rename to reactos/win32ss/drivers/videoprt/event.c

diff --git a/reactos/win32ss/core/drivers/videoprt/funclist.c b/reactos/win32ss/drivers/videoprt/funclist.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/funclist.c
rename to reactos/win32ss/drivers/videoprt/funclist.c

diff --git a/reactos/win32ss/core/drivers/videoprt/guid.c b/reactos/win32ss/drivers/videoprt/guid.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/guid.c
rename to reactos/win32ss/drivers/videoprt/guid.c

diff --git a/reactos/win32ss/core/drivers/videoprt/int10.c b/reactos/win32ss/drivers/videoprt/int10.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/int10.c
rename to reactos/win32ss/drivers/videoprt/int10.c

diff --git a/reactos/win32ss/core/drivers/videoprt/interrupt.c b/reactos/win32ss/drivers/videoprt/interrupt.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/interrupt.c
rename to reactos/win32ss/drivers/videoprt/interrupt.c

diff --git a/reactos/win32ss/core/drivers/videoprt/registry.c b/reactos/win32ss/drivers/videoprt/registry.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/registry.c
rename to reactos/win32ss/drivers/videoprt/registry.c

diff --git a/reactos/win32ss/core/drivers/videoprt/resource.c b/reactos/win32ss/drivers/videoprt/resource.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/resource.c
rename to reactos/win32ss/drivers/videoprt/resource.c

diff --git a/reactos/win32ss/core/drivers/videoprt/services.c b/reactos/win32ss/drivers/videoprt/services.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/services.c
rename to reactos/win32ss/drivers/videoprt/services.c

diff --git a/reactos/win32ss/core/drivers/videoprt/spinlock.c b/reactos/win32ss/drivers/videoprt/spinlock.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/spinlock.c
rename to reactos/win32ss/drivers/videoprt/spinlock.c

diff --git a/reactos/win32ss/core/drivers/videoprt/stubs.c b/reactos/win32ss/drivers/videoprt/stubs.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/stubs.c
rename to reactos/win32ss/drivers/videoprt/stubs.c

diff --git a/reactos/win32ss/core/drivers/videoprt/timer.c b/reactos/win32ss/drivers/videoprt/timer.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/timer.c
rename to reactos/win32ss/drivers/videoprt/timer.c

diff --git a/reactos/win32ss/core/drivers/videoprt/videoprt.c b/reactos/win32ss/drivers/videoprt/videoprt.c
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/videoprt.c
rename to reactos/win32ss/drivers/videoprt/videoprt.c

diff --git a/reactos/win32ss/core/drivers/videoprt/videoprt.h b/reactos/win32ss/drivers/videoprt/videoprt.h
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/videoprt.h
rename to reactos/win32ss/drivers/videoprt/videoprt.h

diff --git a/reactos/win32ss/core/drivers/videoprt/videoprt.rc b/reactos/win32ss/drivers/videoprt/videoprt.rc
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/videoprt.rc
rename to reactos/win32ss/drivers/videoprt/videoprt.rc

diff --git a/reactos/win32ss/core/drivers/videoprt/videoprt.spec b/reactos/win32ss/drivers/videoprt/videoprt.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/videoprt/videoprt.spec
rename to reactos/win32ss/drivers/videoprt/videoprt.spec

diff --git a/reactos/win32ss/core/drivers/watchdog/CMakeLists.txt b/reactos/win32ss/drivers/watchdog/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/drivers/watchdog/CMakeLists.txt
rename to reactos/win32ss/drivers/watchdog/CMakeLists.txt

diff --git a/reactos/win32ss/core/drivers/watchdog/watchdog.c b/reactos/win32ss/drivers/watchdog/watchdog.c
similarity index 100%
rename from reactos/win32ss/core/drivers/watchdog/watchdog.c
rename to reactos/win32ss/drivers/watchdog/watchdog.c

diff --git a/reactos/win32ss/core/drivers/watchdog/watchdog.spec b/reactos/win32ss/drivers/watchdog/watchdog.spec
similarity index 100%
rename from reactos/win32ss/core/drivers/watchdog/watchdog.spec
rename to reactos/win32ss/drivers/watchdog/watchdog.spec

diff --git a/reactos/win32ss/core/gdi/dib/alphablend.c b/reactos/win32ss/gdi/dib/alphablend.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/alphablend.c
rename to reactos/win32ss/gdi/dib/alphablend.c

diff --git a/reactos/win32ss/core/gdi/dib/dib.c b/reactos/win32ss/gdi/dib/dib.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib.c
rename to reactos/win32ss/gdi/dib/dib.c

diff --git a/reactos/win32ss/core/gdi/dib/dib.h b/reactos/win32ss/gdi/dib/dib.h
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib.h
rename to reactos/win32ss/gdi/dib/dib.h

diff --git a/reactos/win32ss/core/gdi/dib/dib16bpp.c b/reactos/win32ss/gdi/dib/dib16bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib16bpp.c
rename to reactos/win32ss/gdi/dib/dib16bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib1bpp.c b/reactos/win32ss/gdi/dib/dib1bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib1bpp.c
rename to reactos/win32ss/gdi/dib/dib1bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib24bpp.c b/reactos/win32ss/gdi/dib/dib24bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib24bpp.c
rename to reactos/win32ss/gdi/dib/dib24bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib24bppc.c b/reactos/win32ss/gdi/dib/dib24bppc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib24bppc.c
rename to reactos/win32ss/gdi/dib/dib24bppc.c

diff --git a/reactos/win32ss/core/gdi/dib/dib32bpp.c b/reactos/win32ss/gdi/dib/dib32bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib32bpp.c
rename to reactos/win32ss/gdi/dib/dib32bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib32bppc.c b/reactos/win32ss/gdi/dib/dib32bppc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib32bppc.c
rename to reactos/win32ss/gdi/dib/dib32bppc.c

diff --git a/reactos/win32ss/core/gdi/dib/dib4bpp.c b/reactos/win32ss/gdi/dib/dib4bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib4bpp.c
rename to reactos/win32ss/gdi/dib/dib4bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib8bpp.c b/reactos/win32ss/gdi/dib/dib8bpp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib8bpp.c
rename to reactos/win32ss/gdi/dib/dib8bpp.c

diff --git a/reactos/win32ss/core/gdi/dib/dib_new.c b/reactos/win32ss/gdi/dib/dib_new.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/dib_new.c
rename to reactos/win32ss/gdi/dib/dib_new.c

diff --git a/reactos/win32ss/core/gdi/dib/floodfill.c b/reactos/win32ss/gdi/dib/floodfill.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/floodfill.c
rename to reactos/win32ss/gdi/dib/floodfill.c

diff --git a/reactos/win32ss/core/gdi/dib/i386/dib24bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/i386/dib24bpp_hline.s
rename to reactos/win32ss/gdi/dib/i386/dib24bpp_hline.s

diff --git a/reactos/win32ss/core/gdi/dib/i386/dib32bpp_colorfill.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/i386/dib32bpp_colorfill.s
rename to reactos/win32ss/gdi/dib/i386/dib32bpp_colorfill.s

diff --git a/reactos/win32ss/core/gdi/dib/i386/dib32bpp_hline.s b/reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/i386/dib32bpp_hline.s
rename to reactos/win32ss/gdi/dib/i386/dib32bpp_hline.s

diff --git a/reactos/win32ss/core/gdi/dib/stretchblt.c b/reactos/win32ss/gdi/dib/stretchblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/dib/stretchblt.c
rename to reactos/win32ss/gdi/dib/stretchblt.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt.c b/reactos/win32ss/gdi/diblib/BitBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt.c
rename to reactos/win32ss/gdi/diblib/BitBlt.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_DSTINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_DSTINVERT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_DSTINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_DSTINVERT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_MERGECOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_MERGECOPY.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_MERGECOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_MERGECOPY.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_MERGEPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_MERGEPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_MERGEPAINT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_NOTPATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_NOTPATCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTPATCOPY.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_NOTSRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_NOTSRCCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTSRCCOPY.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_NOTSRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_NOTSRCERASE.c
rename to reactos/win32ss/gdi/diblib/BitBlt_NOTSRCERASE.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_PATCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_PATCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATCOPY.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_PATINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_PATINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATINVERT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_PATPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_PATPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_PATPAINT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_SRCAND.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_SRCAND.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCAND.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_SRCCOPY.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_SRCCOPY.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCCOPY.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_SRCERASE.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_SRCERASE.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCERASE.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_SRCINVERT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_SRCINVERT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCINVERT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_SRCPAINT.c b/reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_SRCPAINT.c
rename to reactos/win32ss/gdi/diblib/BitBlt_SRCPAINT.c

diff --git a/reactos/win32ss/core/gdi/diblib/BitBlt_other.c b/reactos/win32ss/gdi/diblib/BitBlt_other.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/BitBlt_other.c
rename to reactos/win32ss/gdi/diblib/BitBlt_other.c

diff --git a/reactos/win32ss/core/gdi/diblib/CMakeLists.txt b/reactos/win32ss/gdi/diblib/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/CMakeLists.txt
rename to reactos/win32ss/gdi/diblib/CMakeLists.txt

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib.c b/reactos/win32ss/gdi/diblib/DibLib.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib.c
rename to reactos/win32ss/gdi/diblib/DibLib.c

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib.h b/reactos/win32ss/gdi/diblib/DibLib.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib.h
rename to reactos/win32ss/gdi/diblib/DibLib.h

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib_AllDstBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib_AllDstBPP.h
rename to reactos/win32ss/gdi/diblib/DibLib_AllDstBPP.h

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib_AllSrcBPP.h b/reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib_AllSrcBPP.h
rename to reactos/win32ss/gdi/diblib/DibLib_AllSrcBPP.h

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib_BitBlt.h b/reactos/win32ss/gdi/diblib/DibLib_BitBlt.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib_BitBlt.h
rename to reactos/win32ss/gdi/diblib/DibLib_BitBlt.h

diff --git a/reactos/win32ss/core/gdi/diblib/DibLib_interface.h b/reactos/win32ss/gdi/diblib/DibLib_interface.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/DibLib_interface.h
rename to reactos/win32ss/gdi/diblib/DibLib_interface.h

diff --git a/reactos/win32ss/core/gdi/diblib/MaskBlt.c b/reactos/win32ss/gdi/diblib/MaskBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskBlt.c
rename to reactos/win32ss/gdi/diblib/MaskBlt.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskCopy.c b/reactos/win32ss/gdi/diblib/MaskCopy.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskCopy.c
rename to reactos/win32ss/gdi/diblib/MaskCopy.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskPaint.c b/reactos/win32ss/gdi/diblib/MaskPaint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskPaint.c
rename to reactos/win32ss/gdi/diblib/MaskPaint.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskPatBlt.c b/reactos/win32ss/gdi/diblib/MaskPatBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskPatBlt.c
rename to reactos/win32ss/gdi/diblib/MaskPatBlt.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskPatPaint.c b/reactos/win32ss/gdi/diblib/MaskPatPaint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskPatPaint.c
rename to reactos/win32ss/gdi/diblib/MaskPatPaint.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskSrcBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskSrcBlt.c
rename to reactos/win32ss/gdi/diblib/MaskSrcBlt.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskSrcPaint.c b/reactos/win32ss/gdi/diblib/MaskSrcPaint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskSrcPaint.c
rename to reactos/win32ss/gdi/diblib/MaskSrcPaint.c

diff --git a/reactos/win32ss/core/gdi/diblib/MaskSrcPatBlt.c b/reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/MaskSrcPatBlt.c
rename to reactos/win32ss/gdi/diblib/MaskSrcPatBlt.c

diff --git a/reactos/win32ss/core/gdi/diblib/PatPaint.c b/reactos/win32ss/gdi/diblib/PatPaint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/PatPaint.c
rename to reactos/win32ss/gdi/diblib/PatPaint.c

diff --git a/reactos/win32ss/core/gdi/diblib/RopFunctions.c b/reactos/win32ss/gdi/diblib/RopFunctions.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/RopFunctions.c
rename to reactos/win32ss/gdi/diblib/RopFunctions.c

diff --git a/reactos/win32ss/core/gdi/diblib/RopFunctions.h b/reactos/win32ss/gdi/diblib/RopFunctions.h
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/RopFunctions.h
rename to reactos/win32ss/gdi/diblib/RopFunctions.h

diff --git a/reactos/win32ss/core/gdi/diblib/SrcPaint.c b/reactos/win32ss/gdi/diblib/SrcPaint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/SrcPaint.c
rename to reactos/win32ss/gdi/diblib/SrcPaint.c

diff --git a/reactos/win32ss/core/gdi/diblib/SrcPatBlt.c b/reactos/win32ss/gdi/diblib/SrcPatBlt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/diblib/SrcPatBlt.c
rename to reactos/win32ss/gdi/diblib/SrcPatBlt.c

diff --git a/reactos/win32ss/core/gdi/eng/alphablend.c b/reactos/win32ss/gdi/eng/alphablend.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/alphablend.c
rename to reactos/win32ss/gdi/eng/alphablend.c

diff --git a/reactos/win32ss/core/gdi/eng/bitblt.c b/reactos/win32ss/gdi/eng/bitblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/bitblt.c
rename to reactos/win32ss/gdi/eng/bitblt.c

diff --git a/reactos/win32ss/core/gdi/eng/bitblt_new.c b/reactos/win32ss/gdi/eng/bitblt_new.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/bitblt_new.c
rename to reactos/win32ss/gdi/eng/bitblt_new.c

diff --git a/reactos/win32ss/core/gdi/eng/clip.c b/reactos/win32ss/gdi/eng/clip.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/clip.c
rename to reactos/win32ss/gdi/eng/clip.c

diff --git a/reactos/win32ss/core/gdi/eng/copybits.c b/reactos/win32ss/gdi/eng/copybits.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/copybits.c
rename to reactos/win32ss/gdi/eng/copybits.c

diff --git a/reactos/win32ss/core/gdi/eng/debug.c b/reactos/win32ss/gdi/eng/debug.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/debug.c
rename to reactos/win32ss/gdi/eng/debug.c

diff --git a/reactos/win32ss/core/gdi/eng/device.c b/reactos/win32ss/gdi/eng/device.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/device.c
rename to reactos/win32ss/gdi/eng/device.c

diff --git a/reactos/win32ss/core/gdi/eng/device.h b/reactos/win32ss/gdi/eng/device.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/device.h
rename to reactos/win32ss/gdi/eng/device.h

diff --git a/reactos/win32ss/core/gdi/eng/driverobj.c b/reactos/win32ss/gdi/eng/driverobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/driverobj.c
rename to reactos/win32ss/gdi/eng/driverobj.c

diff --git a/reactos/win32ss/core/gdi/eng/driverobj.h b/reactos/win32ss/gdi/eng/driverobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/driverobj.h
rename to reactos/win32ss/gdi/eng/driverobj.h

diff --git a/reactos/win32ss/core/gdi/eng/drvdbg.c b/reactos/win32ss/gdi/eng/drvdbg.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/drvdbg.c
rename to reactos/win32ss/gdi/eng/drvdbg.c

diff --git a/reactos/win32ss/core/gdi/eng/eng.h b/reactos/win32ss/gdi/eng/eng.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/eng.h
rename to reactos/win32ss/gdi/eng/eng.h

diff --git a/reactos/win32ss/core/gdi/eng/engbrush.c b/reactos/win32ss/gdi/eng/engbrush.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engbrush.c
rename to reactos/win32ss/gdi/eng/engbrush.c

diff --git a/reactos/win32ss/core/gdi/eng/engevent.c b/reactos/win32ss/gdi/eng/engevent.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engevent.c
rename to reactos/win32ss/gdi/eng/engevent.c

diff --git a/reactos/win32ss/core/gdi/eng/engevent.h b/reactos/win32ss/gdi/eng/engevent.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engevent.h
rename to reactos/win32ss/gdi/eng/engevent.h

diff --git a/reactos/win32ss/core/gdi/eng/engmisc.c b/reactos/win32ss/gdi/eng/engmisc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engmisc.c
rename to reactos/win32ss/gdi/eng/engmisc.c

diff --git a/reactos/win32ss/core/gdi/eng/engobjects.h b/reactos/win32ss/gdi/eng/engobjects.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engobjects.h
rename to reactos/win32ss/gdi/eng/engobjects.h

diff --git a/reactos/win32ss/core/gdi/eng/engwindow.c b/reactos/win32ss/gdi/eng/engwindow.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/engwindow.c
rename to reactos/win32ss/gdi/eng/engwindow.c

diff --git a/reactos/win32ss/core/gdi/eng/error.c b/reactos/win32ss/gdi/eng/error.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/error.c
rename to reactos/win32ss/gdi/eng/error.c

diff --git a/reactos/win32ss/core/gdi/eng/float.c b/reactos/win32ss/gdi/eng/float.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/float.c
rename to reactos/win32ss/gdi/eng/float.c

diff --git a/reactos/win32ss/core/gdi/eng/floatobj.h b/reactos/win32ss/gdi/eng/floatobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/floatobj.h
rename to reactos/win32ss/gdi/eng/floatobj.h

diff --git a/reactos/win32ss/core/gdi/eng/gradient.c b/reactos/win32ss/gdi/eng/gradient.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/gradient.c
rename to reactos/win32ss/gdi/eng/gradient.c

diff --git a/reactos/win32ss/core/gdi/eng/i386/floatobj.S b/reactos/win32ss/gdi/eng/i386/floatobj.S
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/i386/floatobj.S
rename to reactos/win32ss/gdi/eng/i386/floatobj.S

diff --git a/reactos/win32ss/core/gdi/eng/inteng.h b/reactos/win32ss/gdi/eng/inteng.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/inteng.h
rename to reactos/win32ss/gdi/eng/inteng.h

diff --git a/reactos/win32ss/core/gdi/eng/ldevobj.c b/reactos/win32ss/gdi/eng/ldevobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/ldevobj.c
rename to reactos/win32ss/gdi/eng/ldevobj.c

diff --git a/reactos/win32ss/core/gdi/eng/ldevobj.h b/reactos/win32ss/gdi/eng/ldevobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/ldevobj.h
rename to reactos/win32ss/gdi/eng/ldevobj.h

diff --git a/reactos/win32ss/core/gdi/eng/lineto.c b/reactos/win32ss/gdi/eng/lineto.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/lineto.c
rename to reactos/win32ss/gdi/eng/lineto.c

diff --git a/reactos/win32ss/core/gdi/eng/mapping.c b/reactos/win32ss/gdi/eng/mapping.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/mapping.c
rename to reactos/win32ss/gdi/eng/mapping.c

diff --git a/reactos/win32ss/core/gdi/eng/mapping.h b/reactos/win32ss/gdi/eng/mapping.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/mapping.h
rename to reactos/win32ss/gdi/eng/mapping.h

diff --git a/reactos/win32ss/core/gdi/eng/math.c b/reactos/win32ss/gdi/eng/math.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/math.c
rename to reactos/win32ss/gdi/eng/math.c

diff --git a/reactos/win32ss/core/gdi/eng/mem.c b/reactos/win32ss/gdi/eng/mem.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/mem.c
rename to reactos/win32ss/gdi/eng/mem.c

diff --git a/reactos/win32ss/core/gdi/eng/mouse.c b/reactos/win32ss/gdi/eng/mouse.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/mouse.c
rename to reactos/win32ss/gdi/eng/mouse.c

diff --git a/reactos/win32ss/core/gdi/eng/mouse.h b/reactos/win32ss/gdi/eng/mouse.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/mouse.h
rename to reactos/win32ss/gdi/eng/mouse.h

diff --git a/reactos/win32ss/core/gdi/eng/paint.c b/reactos/win32ss/gdi/eng/paint.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/paint.c
rename to reactos/win32ss/gdi/eng/paint.c

diff --git a/reactos/win32ss/core/gdi/eng/pdevobj.c b/reactos/win32ss/gdi/eng/pdevobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/pdevobj.c
rename to reactos/win32ss/gdi/eng/pdevobj.c

diff --git a/reactos/win32ss/core/gdi/eng/pdevobj.h b/reactos/win32ss/gdi/eng/pdevobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/pdevobj.h
rename to reactos/win32ss/gdi/eng/pdevobj.h

diff --git a/reactos/win32ss/core/gdi/eng/perfcnt.c b/reactos/win32ss/gdi/eng/perfcnt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/perfcnt.c
rename to reactos/win32ss/gdi/eng/perfcnt.c

diff --git a/reactos/win32ss/core/gdi/eng/rlecomp.c b/reactos/win32ss/gdi/eng/rlecomp.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/rlecomp.c
rename to reactos/win32ss/gdi/eng/rlecomp.c

diff --git a/reactos/win32ss/core/gdi/eng/semaphor.c b/reactos/win32ss/gdi/eng/semaphor.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/semaphor.c
rename to reactos/win32ss/gdi/eng/semaphor.c

diff --git a/reactos/win32ss/core/gdi/eng/sort.c b/reactos/win32ss/gdi/eng/sort.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/sort.c
rename to reactos/win32ss/gdi/eng/sort.c

diff --git a/reactos/win32ss/core/gdi/eng/stretchblt.c b/reactos/win32ss/gdi/eng/stretchblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/stretchblt.c
rename to reactos/win32ss/gdi/eng/stretchblt.c

diff --git a/reactos/win32ss/core/gdi/eng/string.c b/reactos/win32ss/gdi/eng/string.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/string.c
rename to reactos/win32ss/gdi/eng/string.c

diff --git a/reactos/win32ss/core/gdi/eng/stubs.c b/reactos/win32ss/gdi/eng/stubs.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/stubs.c
rename to reactos/win32ss/gdi/eng/stubs.c

diff --git a/reactos/win32ss/core/gdi/eng/surface.c b/reactos/win32ss/gdi/eng/surface.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/surface.c
rename to reactos/win32ss/gdi/eng/surface.c

diff --git a/reactos/win32ss/core/gdi/eng/surface.h b/reactos/win32ss/gdi/eng/surface.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/surface.h
rename to reactos/win32ss/gdi/eng/surface.h

diff --git a/reactos/win32ss/core/gdi/eng/transblt.c b/reactos/win32ss/gdi/eng/transblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/transblt.c
rename to reactos/win32ss/gdi/eng/transblt.c

diff --git a/reactos/win32ss/core/gdi/eng/umpdstubs.c b/reactos/win32ss/gdi/eng/umpdstubs.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/umpdstubs.c
rename to reactos/win32ss/gdi/eng/umpdstubs.c

diff --git a/reactos/win32ss/core/gdi/eng/xlateobj.c b/reactos/win32ss/gdi/eng/xlateobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/xlateobj.c
rename to reactos/win32ss/gdi/eng/xlateobj.c

diff --git a/reactos/win32ss/core/gdi/eng/xlateobj.h b/reactos/win32ss/gdi/eng/xlateobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/eng/xlateobj.h
rename to reactos/win32ss/gdi/eng/xlateobj.h

diff --git a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
similarity index 96%
rename from reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
rename to reactos/win32ss/gdi/gdi32/CMakeLists.txt
index d10f7c5..796b50d 100644 (file)
--- a/reactos/win32ss/core/gdi/gdi32/CMakeLists.txt
+++ b/reactos/win32ss/gdi/gdi32/CMakeLists.txt
@@ -5,7 +5,7 @@ add_definitions(-DLANGPACK)
 
 include_directories(
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 add_definitions(-DLANGPACK)
 spec2def(gdi32.dll gdi32.spec ADD_IMPORTLIB)

diff --git a/reactos/win32ss/core/gdi/gdi32/gdi32.rc b/reactos/win32ss/gdi/gdi32/gdi32.rc
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/gdi32.rc
rename to reactos/win32ss/gdi/gdi32/gdi32.rc

diff --git a/reactos/win32ss/core/gdi/gdi32/gdi32.spec b/reactos/win32ss/gdi/gdi32/gdi32.spec
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/gdi32.spec
rename to reactos/win32ss/gdi/gdi32/gdi32.spec

diff --git a/reactos/win32ss/core/gdi/gdi32/good api.def b/reactos/win32ss/gdi/gdi32/good api.def
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/good api.def
rename to reactos/win32ss/gdi/gdi32/good api.def

diff --git a/reactos/win32ss/core/gdi/gdi32/include/gdi32p.h b/reactos/win32ss/gdi/gdi32/include/gdi32p.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/include/gdi32p.h
rename to reactos/win32ss/gdi/gdi32/include/gdi32p.h

diff --git a/reactos/win32ss/core/gdi/gdi32/include/precomp.h b/reactos/win32ss/gdi/gdi32/include/precomp.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/include/precomp.h
rename to reactos/win32ss/gdi/gdi32/include/precomp.h

diff --git a/reactos/win32ss/core/gdi/gdi32/include/wine/gdi_driver.h b/reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/include/wine/gdi_driver.h
rename to reactos/win32ss/gdi/gdi32/include/wine/gdi_driver.h

diff --git a/reactos/win32ss/core/gdi/gdi32/main/dllmain.c b/reactos/win32ss/gdi/gdi32/main/dllmain.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/main/dllmain.c
rename to reactos/win32ss/gdi/gdi32/main/dllmain.c

diff --git a/reactos/win32ss/core/gdi/gdi32/misc/gdientry.c b/reactos/win32ss/gdi/gdi32/misc/gdientry.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/misc/gdientry.c
rename to reactos/win32ss/gdi/gdi32/misc/gdientry.c

diff --git a/reactos/win32ss/core/gdi/gdi32/misc/heap.c b/reactos/win32ss/gdi/gdi32/misc/heap.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/misc/heap.c
rename to reactos/win32ss/gdi/gdi32/misc/heap.c

diff --git a/reactos/win32ss/core/gdi/gdi32/misc/historic.c b/reactos/win32ss/gdi/gdi32/misc/historic.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/misc/historic.c
rename to reactos/win32ss/gdi/gdi32/misc/historic.c

diff --git a/reactos/win32ss/core/gdi/gdi32/misc/misc.c b/reactos/win32ss/gdi/gdi32/misc/misc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/misc/misc.c
rename to reactos/win32ss/gdi/gdi32/misc/misc.c

diff --git a/reactos/win32ss/core/gdi/gdi32/misc/wingl.c b/reactos/win32ss/gdi/gdi32/misc/wingl.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/misc/wingl.c
rename to reactos/win32ss/gdi/gdi32/misc/wingl.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/arc.c b/reactos/win32ss/gdi/gdi32/objects/arc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/arc.c
rename to reactos/win32ss/gdi/gdi32/objects/arc.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/bitmap.c b/reactos/win32ss/gdi/gdi32/objects/bitmap.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/bitmap.c
rename to reactos/win32ss/gdi/gdi32/objects/bitmap.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/brush.c b/reactos/win32ss/gdi/gdi32/objects/brush.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/brush.c
rename to reactos/win32ss/gdi/gdi32/objects/brush.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/clientobj.c b/reactos/win32ss/gdi/gdi32/objects/clientobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/clientobj.c
rename to reactos/win32ss/gdi/gdi32/objects/clientobj.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/colorspace.c b/reactos/win32ss/gdi/gdi32/objects/colorspace.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/colorspace.c
rename to reactos/win32ss/gdi/gdi32/objects/colorspace.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/coord.c b/reactos/win32ss/gdi/gdi32/objects/coord.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/coord.c
rename to reactos/win32ss/gdi/gdi32/objects/coord.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/dc.c b/reactos/win32ss/gdi/gdi32/objects/dc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/dc.c
rename to reactos/win32ss/gdi/gdi32/objects/dc.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/efloat.c b/reactos/win32ss/gdi/gdi32/objects/efloat.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/efloat.c
rename to reactos/win32ss/gdi/gdi32/objects/efloat.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/eng.c b/reactos/win32ss/gdi/gdi32/objects/eng.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/eng.c
rename to reactos/win32ss/gdi/gdi32/objects/eng.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/enhmfile.c b/reactos/win32ss/gdi/gdi32/objects/enhmfile.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/enhmfile.c
rename to reactos/win32ss/gdi/gdi32/objects/enhmfile.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/font.c b/reactos/win32ss/gdi/gdi32/objects/font.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/font.c
rename to reactos/win32ss/gdi/gdi32/objects/font.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/gdiobj.c b/reactos/win32ss/gdi/gdi32/objects/gdiobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/gdiobj.c
rename to reactos/win32ss/gdi/gdi32/objects/gdiobj.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/icm.c b/reactos/win32ss/gdi/gdi32/objects/icm.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/icm.c
rename to reactos/win32ss/gdi/gdi32/objects/icm.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/linedda.c b/reactos/win32ss/gdi/gdi32/objects/linedda.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/linedda.c
rename to reactos/win32ss/gdi/gdi32/objects/linedda.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/metafile.c b/reactos/win32ss/gdi/gdi32/objects/metafile.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/metafile.c
rename to reactos/win32ss/gdi/gdi32/objects/metafile.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/painting.c b/reactos/win32ss/gdi/gdi32/objects/painting.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/painting.c
rename to reactos/win32ss/gdi/gdi32/objects/painting.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/palette.c b/reactos/win32ss/gdi/gdi32/objects/palette.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/palette.c
rename to reactos/win32ss/gdi/gdi32/objects/palette.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/path.c b/reactos/win32ss/gdi/gdi32/objects/path.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/path.c
rename to reactos/win32ss/gdi/gdi32/objects/path.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/pen.c b/reactos/win32ss/gdi/gdi32/objects/pen.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/pen.c
rename to reactos/win32ss/gdi/gdi32/objects/pen.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/printdrv.c b/reactos/win32ss/gdi/gdi32/objects/printdrv.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/printdrv.c
rename to reactos/win32ss/gdi/gdi32/objects/printdrv.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/region.c b/reactos/win32ss/gdi/gdi32/objects/region.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/region.c
rename to reactos/win32ss/gdi/gdi32/objects/region.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/text.c b/reactos/win32ss/gdi/gdi32/objects/text.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/text.c
rename to reactos/win32ss/gdi/gdi32/objects/text.c

diff --git a/reactos/win32ss/core/gdi/gdi32/objects/utils.c b/reactos/win32ss/gdi/gdi32/objects/utils.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/objects/utils.c
rename to reactos/win32ss/gdi/gdi32/objects/utils.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt b/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
similarity index 89%
rename from reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
rename to reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
index 892555c..040e6a4 100644 (file)
--- a/reactos/win32ss/core/gdi/gdi32/wine/CMakeLists.txt
+++ b/reactos/win32ss/gdi/gdi32/wine/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
-    ${REACTOS_SOURCE_DIR}/win32ss/core/include
+    ${REACTOS_SOURCE_DIR}/win32ss/include
     ../include
     .)
 

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmetafile.c b/reactos/win32ss/gdi/gdi32/wine/enhmetafile.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmetafile.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmetafile.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/bitblt.c b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/bitblt.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/bitblt.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/dc.c b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/dc.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/dc.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/enhmetafiledrv.h

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/graphics.c b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/graphics.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/graphics.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/init.c b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/init.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/init.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/objects.c b/reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/enhmfdrv/objects.c
rename to reactos/win32ss/gdi/gdi32/wine/enhmfdrv/objects.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/gdi_private.h b/reactos/win32ss/gdi/gdi32/wine/gdi_private.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/gdi_private.h
rename to reactos/win32ss/gdi/gdi32/wine/gdi_private.h

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/metafile.c b/reactos/win32ss/gdi/gdi32/wine/metafile.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/metafile.c
rename to reactos/win32ss/gdi/gdi32/wine/metafile.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/bitblt.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/bitblt.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/bitblt.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/dc.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/dc.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/dc.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/graphics.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/graphics.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/graphics.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/init.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/init.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/init.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/metafiledrv.h b/reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/metafiledrv.h
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/metafiledrv.h

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/objects.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/objects.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/objects.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/mfdrv/text.c b/reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/mfdrv/text.c
rename to reactos/win32ss/gdi/gdi32/wine/mfdrv/text.c

diff --git a/reactos/win32ss/core/gdi/gdi32/wine/rosglue.c b/reactos/win32ss/gdi/gdi32/wine/rosglue.c
similarity index 100%
rename from reactos/win32ss/core/gdi/gdi32/wine/rosglue.c
rename to reactos/win32ss/gdi/gdi32/wine/rosglue.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/arc.c b/reactos/win32ss/gdi/ntgdi/arc.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/arc.c
rename to reactos/win32ss/gdi/ntgdi/arc.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/bezier.c b/reactos/win32ss/gdi/ntgdi/bezier.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/bezier.c
rename to reactos/win32ss/gdi/ntgdi/bezier.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/bitblt.c b/reactos/win32ss/gdi/ntgdi/bitblt.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/bitblt.c
rename to reactos/win32ss/gdi/ntgdi/bitblt.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/bitmaps.c b/reactos/win32ss/gdi/ntgdi/bitmaps.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/bitmaps.c
rename to reactos/win32ss/gdi/ntgdi/bitmaps.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/bitmaps.h b/reactos/win32ss/gdi/ntgdi/bitmaps.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/bitmaps.h
rename to reactos/win32ss/gdi/ntgdi/bitmaps.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/brush.c b/reactos/win32ss/gdi/ntgdi/brush.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/brush.c
rename to reactos/win32ss/gdi/ntgdi/brush.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/brush.h b/reactos/win32ss/gdi/ntgdi/brush.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/brush.h
rename to reactos/win32ss/gdi/ntgdi/brush.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/cliprgn.c b/reactos/win32ss/gdi/ntgdi/cliprgn.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/cliprgn.c
rename to reactos/win32ss/gdi/ntgdi/cliprgn.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/cliprgn.h b/reactos/win32ss/gdi/ntgdi/cliprgn.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/cliprgn.h
rename to reactos/win32ss/gdi/ntgdi/cliprgn.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/color.h b/reactos/win32ss/gdi/ntgdi/color.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/color.h
rename to reactos/win32ss/gdi/ntgdi/color.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/coord.c b/reactos/win32ss/gdi/ntgdi/coord.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/coord.c
rename to reactos/win32ss/gdi/ntgdi/coord.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/coord.h b/reactos/win32ss/gdi/ntgdi/coord.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/coord.h
rename to reactos/win32ss/gdi/ntgdi/coord.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/dc.h b/reactos/win32ss/gdi/ntgdi/dc.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dc.h
rename to reactos/win32ss/gdi/ntgdi/dc.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/dcattr.c b/reactos/win32ss/gdi/ntgdi/dcattr.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dcattr.c
rename to reactos/win32ss/gdi/ntgdi/dcattr.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/dclife.c b/reactos/win32ss/gdi/ntgdi/dclife.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dclife.c
rename to reactos/win32ss/gdi/ntgdi/dclife.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/dcobjs.c b/reactos/win32ss/gdi/ntgdi/dcobjs.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dcobjs.c
rename to reactos/win32ss/gdi/ntgdi/dcobjs.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/dcstate.c b/reactos/win32ss/gdi/ntgdi/dcstate.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dcstate.c
rename to reactos/win32ss/gdi/ntgdi/dcstate.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/dcutil.c b/reactos/win32ss/gdi/ntgdi/dcutil.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dcutil.c
rename to reactos/win32ss/gdi/ntgdi/dcutil.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/device.c b/reactos/win32ss/gdi/ntgdi/device.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/device.c
rename to reactos/win32ss/gdi/ntgdi/device.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/dib.h b/reactos/win32ss/gdi/ntgdi/dib.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dib.h
rename to reactos/win32ss/gdi/ntgdi/dib.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/dibobj.c b/reactos/win32ss/gdi/ntgdi/dibobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/dibobj.c
rename to reactos/win32ss/gdi/ntgdi/dibobj.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/drawing.c b/reactos/win32ss/gdi/ntgdi/drawing.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/drawing.c
rename to reactos/win32ss/gdi/ntgdi/drawing.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/fillshap.c b/reactos/win32ss/gdi/ntgdi/fillshap.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/fillshap.c
rename to reactos/win32ss/gdi/ntgdi/fillshap.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/font.c b/reactos/win32ss/gdi/ntgdi/font.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/font.c
rename to reactos/win32ss/gdi/ntgdi/font.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/freetype.c b/reactos/win32ss/gdi/ntgdi/freetype.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/freetype.c
rename to reactos/win32ss/gdi/ntgdi/freetype.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdibatch.c b/reactos/win32ss/gdi/ntgdi/gdibatch.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdibatch.c
rename to reactos/win32ss/gdi/ntgdi/gdibatch.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdidbg.c b/reactos/win32ss/gdi/ntgdi/gdidbg.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdidbg.c
rename to reactos/win32ss/gdi/ntgdi/gdidbg.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdidebug.h b/reactos/win32ss/gdi/ntgdi/gdidebug.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdidebug.h
rename to reactos/win32ss/gdi/ntgdi/gdidebug.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdifloat.h b/reactos/win32ss/gdi/ntgdi/gdifloat.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdifloat.h
rename to reactos/win32ss/gdi/ntgdi/gdifloat.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdikdbgext.c b/reactos/win32ss/gdi/ntgdi/gdikdbgext.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdikdbgext.c
rename to reactos/win32ss/gdi/ntgdi/gdikdbgext.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdiobj.c b/reactos/win32ss/gdi/ntgdi/gdiobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdiobj.c
rename to reactos/win32ss/gdi/ntgdi/gdiobj.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdiobj.h b/reactos/win32ss/gdi/ntgdi/gdiobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdiobj.h
rename to reactos/win32ss/gdi/ntgdi/gdiobj.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/gdipool.c b/reactos/win32ss/gdi/ntgdi/gdipool.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/gdipool.c
rename to reactos/win32ss/gdi/ntgdi/gdipool.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/icm.c b/reactos/win32ss/gdi/ntgdi/icm.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/icm.c
rename to reactos/win32ss/gdi/ntgdi/icm.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/init.c b/reactos/win32ss/gdi/ntgdi/init.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/init.c
rename to reactos/win32ss/gdi/ntgdi/init.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/intgdi.h b/reactos/win32ss/gdi/ntgdi/intgdi.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/intgdi.h
rename to reactos/win32ss/gdi/ntgdi/intgdi.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/line.c b/reactos/win32ss/gdi/ntgdi/line.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/line.c
rename to reactos/win32ss/gdi/ntgdi/line.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/metafile.c b/reactos/win32ss/gdi/ntgdi/metafile.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/metafile.c
rename to reactos/win32ss/gdi/ntgdi/metafile.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/misc.h b/reactos/win32ss/gdi/ntgdi/misc.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/misc.h
rename to reactos/win32ss/gdi/ntgdi/misc.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/paint.h b/reactos/win32ss/gdi/ntgdi/paint.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/paint.h
rename to reactos/win32ss/gdi/ntgdi/paint.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/palette.c b/reactos/win32ss/gdi/ntgdi/palette.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/palette.c
rename to reactos/win32ss/gdi/ntgdi/palette.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/palette.h b/reactos/win32ss/gdi/ntgdi/palette.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/palette.h
rename to reactos/win32ss/gdi/ntgdi/palette.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/path.c b/reactos/win32ss/gdi/ntgdi/path.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/path.c
rename to reactos/win32ss/gdi/ntgdi/path.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/path.h b/reactos/win32ss/gdi/ntgdi/path.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/path.h
rename to reactos/win32ss/gdi/ntgdi/path.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/pen.c b/reactos/win32ss/gdi/ntgdi/pen.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/pen.c
rename to reactos/win32ss/gdi/ntgdi/pen.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/pen.h b/reactos/win32ss/gdi/ntgdi/pen.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/pen.h
rename to reactos/win32ss/gdi/ntgdi/pen.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/polyfill.c b/reactos/win32ss/gdi/ntgdi/polyfill.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/polyfill.c
rename to reactos/win32ss/gdi/ntgdi/polyfill.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/print.c b/reactos/win32ss/gdi/ntgdi/print.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/print.c
rename to reactos/win32ss/gdi/ntgdi/print.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/rect.c b/reactos/win32ss/gdi/ntgdi/rect.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/rect.c
rename to reactos/win32ss/gdi/ntgdi/rect.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/rect.h b/reactos/win32ss/gdi/ntgdi/rect.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/rect.h
rename to reactos/win32ss/gdi/ntgdi/rect.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/region.c b/reactos/win32ss/gdi/ntgdi/region.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/region.c
rename to reactos/win32ss/gdi/ntgdi/region.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/region.h b/reactos/win32ss/gdi/ntgdi/region.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/region.h
rename to reactos/win32ss/gdi/ntgdi/region.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/stockobj.c b/reactos/win32ss/gdi/ntgdi/stockobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/stockobj.c
rename to reactos/win32ss/gdi/ntgdi/stockobj.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/text.c b/reactos/win32ss/gdi/ntgdi/text.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/text.c
rename to reactos/win32ss/gdi/ntgdi/text.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/text.h b/reactos/win32ss/gdi/ntgdi/text.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/text.h
rename to reactos/win32ss/gdi/ntgdi/text.h

diff --git a/reactos/win32ss/core/gdi/ntgdi/wingl.c b/reactos/win32ss/gdi/ntgdi/wingl.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/wingl.c
rename to reactos/win32ss/gdi/ntgdi/wingl.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/xformobj.c b/reactos/win32ss/gdi/ntgdi/xformobj.c
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/xformobj.c
rename to reactos/win32ss/gdi/ntgdi/xformobj.c

diff --git a/reactos/win32ss/core/gdi/ntgdi/xformobj.h b/reactos/win32ss/gdi/ntgdi/xformobj.h
similarity index 100%
rename from reactos/win32ss/core/gdi/ntgdi/xformobj.h
rename to reactos/win32ss/gdi/ntgdi/xformobj.h

diff --git a/reactos/win32ss/core/include/callback.h b/reactos/win32ss/include/callback.h
similarity index 100%
rename from reactos/win32ss/core/include/callback.h
rename to reactos/win32ss/include/callback.h

diff --git a/reactos/win32ss/core/include/ntgdibad.h b/reactos/win32ss/include/ntgdibad.h
similarity index 100%
rename from reactos/win32ss/core/include/ntgdibad.h
rename to reactos/win32ss/include/ntgdibad.h

diff --git a/reactos/win32ss/core/include/ntgdihdl.h b/reactos/win32ss/include/ntgdihdl.h
similarity index 100%
rename from reactos/win32ss/core/include/ntgdihdl.h
rename to reactos/win32ss/include/ntgdihdl.h

diff --git a/reactos/win32ss/core/include/ntgdityp.h b/reactos/win32ss/include/ntgdityp.h
similarity index 100%
rename from reactos/win32ss/core/include/ntgdityp.h
rename to reactos/win32ss/include/ntgdityp.h

diff --git a/reactos/win32ss/core/include/ntuser.h b/reactos/win32ss/include/ntuser.h
similarity index 100%
rename from reactos/win32ss/core/include/ntuser.h
rename to reactos/win32ss/include/ntuser.h

diff --git a/reactos/win32ss/core/include/ntusrtyp.h b/reactos/win32ss/include/ntusrtyp.h
similarity index 100%
rename from reactos/win32ss/core/include/ntusrtyp.h
rename to reactos/win32ss/include/ntusrtyp.h

diff --git a/reactos/win32ss/core/napi.h b/reactos/win32ss/napi.h
similarity index 100%
rename from reactos/win32ss/core/napi.h
rename to reactos/win32ss/napi.h

diff --git a/reactos/win32ss/core/pch.h b/reactos/win32ss/pch.h
similarity index 100%
rename from reactos/win32ss/core/pch.h
rename to reactos/win32ss/pch.h

diff --git a/reactos/win32ss/core/reactx/CMakeLists.txt b/reactos/win32ss/reactx/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/reactx/CMakeLists.txt
rename to reactos/win32ss/reactx/CMakeLists.txt

diff --git a/reactos/win32ss/core/reactx/dxapi/CMakeLists.txt b/reactos/win32ss/reactx/dxapi/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/reactx/dxapi/CMakeLists.txt
rename to reactos/win32ss/reactx/dxapi/CMakeLists.txt

diff --git a/reactos/win32ss/core/reactx/dxapi/dxapi.rc b/reactos/win32ss/reactx/dxapi/dxapi.rc
similarity index 100%
rename from reactos/win32ss/core/reactx/dxapi/dxapi.rc
rename to reactos/win32ss/reactx/dxapi/dxapi.rc

diff --git a/reactos/win32ss/core/reactx/dxapi/dxapi.spec b/reactos/win32ss/reactx/dxapi/dxapi.spec
similarity index 100%
rename from reactos/win32ss/core/reactx/dxapi/dxapi.spec
rename to reactos/win32ss/reactx/dxapi/dxapi.spec

diff --git a/reactos/win32ss/core/reactx/dxapi/dxapi_driver.h b/reactos/win32ss/reactx/dxapi/dxapi_driver.h
similarity index 100%
rename from reactos/win32ss/core/reactx/dxapi/dxapi_driver.h
rename to reactos/win32ss/reactx/dxapi/dxapi_driver.h

diff --git a/reactos/win32ss/core/reactx/dxapi/main.c b/reactos/win32ss/reactx/dxapi/main.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxapi/main.c
rename to reactos/win32ss/reactx/dxapi/main.c

diff --git a/reactos/win32ss/core/reactx/dxg/CMakeLists.txt b/reactos/win32ss/reactx/dxg/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/CMakeLists.txt
rename to reactos/win32ss/reactx/dxg/CMakeLists.txt

diff --git a/reactos/win32ss/core/reactx/dxg/ddhmg.c b/reactos/win32ss/reactx/dxg/ddhmg.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/ddhmg.c
rename to reactos/win32ss/reactx/dxg/ddhmg.c

diff --git a/reactos/win32ss/core/reactx/dxg/dxg.rc b/reactos/win32ss/reactx/dxg/dxg.rc
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/dxg.rc
rename to reactos/win32ss/reactx/dxg/dxg.rc

diff --git a/reactos/win32ss/core/reactx/dxg/dxg.spec b/reactos/win32ss/reactx/dxg/dxg.spec
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/dxg.spec
rename to reactos/win32ss/reactx/dxg/dxg.spec

diff --git a/reactos/win32ss/core/reactx/dxg/dxg_driver.h b/reactos/win32ss/reactx/dxg/dxg_driver.h
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/dxg_driver.h
rename to reactos/win32ss/reactx/dxg/dxg_driver.h

diff --git a/reactos/win32ss/core/reactx/dxg/dxg_int.h b/reactos/win32ss/reactx/dxg/dxg_int.h
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/dxg_int.h
rename to reactos/win32ss/reactx/dxg/dxg_int.h

diff --git a/reactos/win32ss/core/reactx/dxg/eng.c b/reactos/win32ss/reactx/dxg/eng.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/eng.c
rename to reactos/win32ss/reactx/dxg/eng.c

diff --git a/reactos/win32ss/core/reactx/dxg/historic.c b/reactos/win32ss/reactx/dxg/historic.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/historic.c
rename to reactos/win32ss/reactx/dxg/historic.c

diff --git a/reactos/win32ss/core/reactx/dxg/main.c b/reactos/win32ss/reactx/dxg/main.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/main.c
rename to reactos/win32ss/reactx/dxg/main.c

diff --git a/reactos/win32ss/core/reactx/dxg/tags.h b/reactos/win32ss/reactx/dxg/tags.h
similarity index 100%
rename from reactos/win32ss/core/reactx/dxg/tags.h
rename to reactos/win32ss/reactx/dxg/tags.h

diff --git a/reactos/win32ss/core/reactx/dxgthk/CMakeLists.txt b/reactos/win32ss/reactx/dxgthk/CMakeLists.txt
similarity index 100%
rename from reactos/win32ss/core/reactx/dxgthk/CMakeLists.txt
rename to reactos/win32ss/reactx/dxgthk/CMakeLists.txt

diff --git a/reactos/win32ss/core/reactx/dxgthk/dxgthk.rc b/reactos/win32ss/reactx/dxgthk/dxgthk.rc
similarity index 100%
rename from reactos/win32ss/core/reactx/dxgthk/dxgthk.rc
rename to reactos/win32ss/reactx/dxgthk/dxgthk.rc

diff --git a/reactos/win32ss/core/reactx/dxgthk/dxgthk.spec b/reactos/win32ss/reactx/dxgthk/dxgthk.spec
similarity index 100%
rename from reactos/win32ss/core/reactx/dxgthk/dxgthk.spec
rename to reactos/win32ss/reactx/dxgthk/dxgthk.spec

diff --git a/reactos/win32ss/core/reactx/dxgthk/main.c b/reactos/win32ss/reactx/dxgthk/main.c
similarity index 100%
rename from reactos/win32ss/core/reactx/dxgthk/main.c
rename to reactos/win32ss/reactx/dxgthk/main.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/d3d.c b/reactos/win32ss/reactx/ntddraw/d3d.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/d3d.c
rename to reactos/win32ss/reactx/ntddraw/d3d.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/dd.c b/reactos/win32ss/reactx/ntddraw/dd.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/dd.c
rename to reactos/win32ss/reactx/ntddraw/dd.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/ddraw.c b/reactos/win32ss/reactx/ntddraw/ddraw.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/ddraw.c
rename to reactos/win32ss/reactx/ntddraw/ddraw.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/ddsurf.c b/reactos/win32ss/reactx/ntddraw/ddsurf.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/ddsurf.c
rename to reactos/win32ss/reactx/ntddraw/ddsurf.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/dvp.c b/reactos/win32ss/reactx/ntddraw/dvp.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/dvp.c
rename to reactos/win32ss/reactx/ntddraw/dvp.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/dxeng.c b/reactos/win32ss/reactx/ntddraw/dxeng.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/dxeng.c
rename to reactos/win32ss/reactx/ntddraw/dxeng.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/eng.c b/reactos/win32ss/reactx/ntddraw/eng.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/eng.c
rename to reactos/win32ss/reactx/ntddraw/eng.c

diff --git a/reactos/win32ss/core/reactx/ntddraw/intddraw.h b/reactos/win32ss/reactx/ntddraw/intddraw.h
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/intddraw.h
rename to reactos/win32ss/reactx/ntddraw/intddraw.h

diff --git a/reactos/win32ss/core/reactx/ntddraw/mocomp.c b/reactos/win32ss/reactx/ntddraw/mocomp.c
similarity index 100%
rename from reactos/win32ss/core/reactx/ntddraw/mocomp.c
rename to reactos/win32ss/reactx/ntddraw/mocomp.c

diff --git a/reactos/win32ss/core/sys-stubs.S b/reactos/win32ss/sys-stubs.S
similarity index 100%
rename from reactos/win32ss/core/sys-stubs.S
rename to reactos/win32ss/sys-stubs.S

diff --git a/reactos/win32ss/core/user/ntuser/accelerator.c b/reactos/win32ss/user/ntuser/accelerator.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/accelerator.c
rename to reactos/win32ss/user/ntuser/accelerator.c

diff --git a/reactos/win32ss/core/user/ntuser/accelerator.h b/reactos/win32ss/user/ntuser/accelerator.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/accelerator.h
rename to reactos/win32ss/user/ntuser/accelerator.h

diff --git a/reactos/win32ss/core/user/ntuser/callback.c b/reactos/win32ss/user/ntuser/callback.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/callback.c
rename to reactos/win32ss/user/ntuser/callback.c

diff --git a/reactos/win32ss/core/user/ntuser/callback.h b/reactos/win32ss/user/ntuser/callback.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/callback.h
rename to reactos/win32ss/user/ntuser/callback.h

diff --git a/reactos/win32ss/core/user/ntuser/callproc.c b/reactos/win32ss/user/ntuser/callproc.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/callproc.c
rename to reactos/win32ss/user/ntuser/callproc.c

diff --git a/reactos/win32ss/core/user/ntuser/caret.c b/reactos/win32ss/user/ntuser/caret.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/caret.c
rename to reactos/win32ss/user/ntuser/caret.c

diff --git a/reactos/win32ss/core/user/ntuser/caret.h b/reactos/win32ss/user/ntuser/caret.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/caret.h
rename to reactos/win32ss/user/ntuser/caret.h

diff --git a/reactos/win32ss/core/user/ntuser/class.c b/reactos/win32ss/user/ntuser/class.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/class.c
rename to reactos/win32ss/user/ntuser/class.c

diff --git a/reactos/win32ss/core/user/ntuser/class.h b/reactos/win32ss/user/ntuser/class.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/class.h
rename to reactos/win32ss/user/ntuser/class.h

diff --git a/reactos/win32ss/core/user/ntuser/clipboard.c b/reactos/win32ss/user/ntuser/clipboard.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/clipboard.c
rename to reactos/win32ss/user/ntuser/clipboard.c

diff --git a/reactos/win32ss/core/user/ntuser/clipboard.h b/reactos/win32ss/user/ntuser/clipboard.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/clipboard.h
rename to reactos/win32ss/user/ntuser/clipboard.h

diff --git a/reactos/win32ss/core/user/ntuser/csr.c b/reactos/win32ss/user/ntuser/csr.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/csr.c
rename to reactos/win32ss/user/ntuser/csr.c

diff --git a/reactos/win32ss/core/user/ntuser/csr.h b/reactos/win32ss/user/ntuser/csr.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/csr.h
rename to reactos/win32ss/user/ntuser/csr.h

diff --git a/reactos/win32ss/core/user/ntuser/cursoricon.c b/reactos/win32ss/user/ntuser/cursoricon.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/cursoricon.c
rename to reactos/win32ss/user/ntuser/cursoricon.c

diff --git a/reactos/win32ss/core/user/ntuser/cursoricon.h b/reactos/win32ss/user/ntuser/cursoricon.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/cursoricon.h
rename to reactos/win32ss/user/ntuser/cursoricon.h

diff --git a/reactos/win32ss/core/user/ntuser/dce.h b/reactos/win32ss/user/ntuser/dce.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/dce.h
rename to reactos/win32ss/user/ntuser/dce.h

diff --git a/reactos/win32ss/core/user/ntuser/dde.c b/reactos/win32ss/user/ntuser/dde.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/dde.c
rename to reactos/win32ss/user/ntuser/dde.c

diff --git a/reactos/win32ss/core/user/ntuser/defwnd.c b/reactos/win32ss/user/ntuser/defwnd.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/defwnd.c
rename to reactos/win32ss/user/ntuser/defwnd.c

diff --git a/reactos/win32ss/core/user/ntuser/desktop.c b/reactos/win32ss/user/ntuser/desktop.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/desktop.c
rename to reactos/win32ss/user/ntuser/desktop.c

diff --git a/reactos/win32ss/core/user/ntuser/desktop.h b/reactos/win32ss/user/ntuser/desktop.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/desktop.h
rename to reactos/win32ss/user/ntuser/desktop.h

diff --git a/reactos/win32ss/core/user/ntuser/display.c b/reactos/win32ss/user/ntuser/display.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/display.c
rename to reactos/win32ss/user/ntuser/display.c

diff --git a/reactos/win32ss/core/user/ntuser/draw.c b/reactos/win32ss/user/ntuser/draw.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/draw.c
rename to reactos/win32ss/user/ntuser/draw.c

diff --git a/reactos/win32ss/core/user/ntuser/event.c b/reactos/win32ss/user/ntuser/event.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/event.c
rename to reactos/win32ss/user/ntuser/event.c

diff --git a/reactos/win32ss/core/user/ntuser/focus.c b/reactos/win32ss/user/ntuser/focus.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/focus.c
rename to reactos/win32ss/user/ntuser/focus.c

diff --git a/reactos/win32ss/core/user/ntuser/focus.h b/reactos/win32ss/user/ntuser/focus.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/focus.h
rename to reactos/win32ss/user/ntuser/focus.h

diff --git a/reactos/win32ss/core/user/ntuser/guicheck.c b/reactos/win32ss/user/ntuser/guicheck.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/guicheck.c
rename to reactos/win32ss/user/ntuser/guicheck.c

diff --git a/reactos/win32ss/core/user/ntuser/guicheck.h b/reactos/win32ss/user/ntuser/guicheck.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/guicheck.h
rename to reactos/win32ss/user/ntuser/guicheck.h

diff --git a/reactos/win32ss/core/user/ntuser/hook.c b/reactos/win32ss/user/ntuser/hook.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/hook.c
rename to reactos/win32ss/user/ntuser/hook.c

diff --git a/reactos/win32ss/core/user/ntuser/hook.h b/reactos/win32ss/user/ntuser/hook.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/hook.h
rename to reactos/win32ss/user/ntuser/hook.h

diff --git a/reactos/win32ss/core/user/ntuser/hotkey.c b/reactos/win32ss/user/ntuser/hotkey.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/hotkey.c
rename to reactos/win32ss/user/ntuser/hotkey.c

diff --git a/reactos/win32ss/core/user/ntuser/hotkey.h b/reactos/win32ss/user/ntuser/hotkey.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/hotkey.h
rename to reactos/win32ss/user/ntuser/hotkey.h

diff --git a/reactos/win32ss/core/user/ntuser/ime.c b/reactos/win32ss/user/ntuser/ime.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/ime.c
rename to reactos/win32ss/user/ntuser/ime.c

diff --git a/reactos/win32ss/core/user/ntuser/input.c b/reactos/win32ss/user/ntuser/input.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/input.c
rename to reactos/win32ss/user/ntuser/input.c

diff --git a/reactos/win32ss/core/user/ntuser/input.h b/reactos/win32ss/user/ntuser/input.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/input.h
rename to reactos/win32ss/user/ntuser/input.h

diff --git a/reactos/win32ss/core/user/ntuser/kbdlayout.c b/reactos/win32ss/user/ntuser/kbdlayout.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/kbdlayout.c
rename to reactos/win32ss/user/ntuser/kbdlayout.c

diff --git a/reactos/win32ss/core/user/ntuser/keyboard.c b/reactos/win32ss/user/ntuser/keyboard.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/keyboard.c
rename to reactos/win32ss/user/ntuser/keyboard.c

diff --git a/reactos/win32ss/core/user/ntuser/main.c b/reactos/win32ss/user/ntuser/main.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/main.c
rename to reactos/win32ss/user/ntuser/main.c

diff --git a/reactos/win32ss/core/user/ntuser/menu.c b/reactos/win32ss/user/ntuser/menu.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/menu.c
rename to reactos/win32ss/user/ntuser/menu.c

diff --git a/reactos/win32ss/core/user/ntuser/menu.h b/reactos/win32ss/user/ntuser/menu.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/menu.h
rename to reactos/win32ss/user/ntuser/menu.h

diff --git a/reactos/win32ss/core/user/ntuser/message.c b/reactos/win32ss/user/ntuser/message.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/message.c
rename to reactos/win32ss/user/ntuser/message.c

diff --git a/reactos/win32ss/core/user/ntuser/metric.c b/reactos/win32ss/user/ntuser/metric.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/metric.c
rename to reactos/win32ss/user/ntuser/metric.c

diff --git a/reactos/win32ss/core/user/ntuser/misc.c b/reactos/win32ss/user/ntuser/misc.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/misc.c
rename to reactos/win32ss/user/ntuser/misc.c

diff --git a/reactos/win32ss/core/user/ntuser/misc/copy.c b/reactos/win32ss/user/ntuser/misc/copy.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/misc/copy.c
rename to reactos/win32ss/user/ntuser/misc/copy.c

diff --git a/reactos/win32ss/core/user/ntuser/misc/file.c b/reactos/win32ss/user/ntuser/misc/file.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/misc/file.c
rename to reactos/win32ss/user/ntuser/misc/file.c

diff --git a/reactos/win32ss/core/user/ntuser/misc/registry.c b/reactos/win32ss/user/ntuser/misc/registry.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/misc/registry.c
rename to reactos/win32ss/user/ntuser/misc/registry.c

diff --git a/reactos/win32ss/core/user/ntuser/misc/rtlstr.c b/reactos/win32ss/user/ntuser/misc/rtlstr.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/misc/rtlstr.c
rename to reactos/win32ss/user/ntuser/misc/rtlstr.c

diff --git a/reactos/win32ss/core/user/ntuser/mmcopy.h b/reactos/win32ss/user/ntuser/mmcopy.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/mmcopy.h
rename to reactos/win32ss/user/ntuser/mmcopy.h

diff --git a/reactos/win32ss/core/user/ntuser/monitor.c b/reactos/win32ss/user/ntuser/monitor.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/monitor.c
rename to reactos/win32ss/user/ntuser/monitor.c

diff --git a/reactos/win32ss/core/user/ntuser/monitor.h b/reactos/win32ss/user/ntuser/monitor.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/monitor.h
rename to reactos/win32ss/user/ntuser/monitor.h

diff --git a/reactos/win32ss/core/user/ntuser/mouse.c b/reactos/win32ss/user/ntuser/mouse.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/mouse.c
rename to reactos/win32ss/user/ntuser/mouse.c

diff --git a/reactos/win32ss/core/user/ntuser/msgqueue.c b/reactos/win32ss/user/ntuser/msgqueue.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/msgqueue.c
rename to reactos/win32ss/user/ntuser/msgqueue.c

diff --git a/reactos/win32ss/core/user/ntuser/msgqueue.h b/reactos/win32ss/user/ntuser/msgqueue.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/msgqueue.h
rename to reactos/win32ss/user/ntuser/msgqueue.h

diff --git a/reactos/win32ss/core/user/ntuser/ntstubs.c b/reactos/win32ss/user/ntuser/ntstubs.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/ntstubs.c
rename to reactos/win32ss/user/ntuser/ntstubs.c

diff --git a/reactos/win32ss/core/user/ntuser/ntuser.c b/reactos/win32ss/user/ntuser/ntuser.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/ntuser.c
rename to reactos/win32ss/user/ntuser/ntuser.c

diff --git a/reactos/win32ss/core/user/ntuser/ntuser.h b/reactos/win32ss/user/ntuser/ntuser.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/ntuser.h
rename to reactos/win32ss/user/ntuser/ntuser.h

diff --git a/reactos/win32ss/core/user/ntuser/object.c b/reactos/win32ss/user/ntuser/object.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/object.c
rename to reactos/win32ss/user/ntuser/object.c

diff --git a/reactos/win32ss/core/user/ntuser/object.h b/reactos/win32ss/user/ntuser/object.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/object.h
rename to reactos/win32ss/user/ntuser/object.h

diff --git a/reactos/win32ss/core/user/ntuser/painting.c b/reactos/win32ss/user/ntuser/painting.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/painting.c
rename to reactos/win32ss/user/ntuser/painting.c

diff --git a/reactos/win32ss/core/user/ntuser/painting.h b/reactos/win32ss/user/ntuser/painting.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/painting.h
rename to reactos/win32ss/user/ntuser/painting.h

diff --git a/reactos/win32ss/core/user/ntuser/prop.c b/reactos/win32ss/user/ntuser/prop.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/prop.c
rename to reactos/win32ss/user/ntuser/prop.c

diff --git a/reactos/win32ss/core/user/ntuser/prop.h b/reactos/win32ss/user/ntuser/prop.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/prop.h
rename to reactos/win32ss/user/ntuser/prop.h

diff --git a/reactos/win32ss/core/user/ntuser/scroll.h b/reactos/win32ss/user/ntuser/scroll.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/scroll.h
rename to reactos/win32ss/user/ntuser/scroll.h

diff --git a/reactos/win32ss/core/user/ntuser/scrollbar.c b/reactos/win32ss/user/ntuser/scrollbar.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/scrollbar.c
rename to reactos/win32ss/user/ntuser/scrollbar.c

diff --git a/reactos/win32ss/core/user/ntuser/session.c b/reactos/win32ss/user/ntuser/session.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/session.c
rename to reactos/win32ss/user/ntuser/session.c

diff --git a/reactos/win32ss/core/user/ntuser/shutdown.c b/reactos/win32ss/user/ntuser/shutdown.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/shutdown.c
rename to reactos/win32ss/user/ntuser/shutdown.c

diff --git a/reactos/win32ss/core/user/ntuser/shutdown.h b/reactos/win32ss/user/ntuser/shutdown.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/shutdown.h
rename to reactos/win32ss/user/ntuser/shutdown.h

diff --git a/reactos/win32ss/core/user/ntuser/simplecall.c b/reactos/win32ss/user/ntuser/simplecall.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/simplecall.c
rename to reactos/win32ss/user/ntuser/simplecall.c

diff --git a/reactos/win32ss/core/user/ntuser/sysparams.c b/reactos/win32ss/user/ntuser/sysparams.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/sysparams.c
rename to reactos/win32ss/user/ntuser/sysparams.c

diff --git a/reactos/win32ss/core/user/ntuser/sysparams.h b/reactos/win32ss/user/ntuser/sysparams.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/sysparams.h
rename to reactos/win32ss/user/ntuser/sysparams.h

diff --git a/reactos/win32ss/core/user/ntuser/tags.h b/reactos/win32ss/user/ntuser/tags.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/tags.h
rename to reactos/win32ss/user/ntuser/tags.h

diff --git a/reactos/win32ss/core/user/ntuser/timer.c b/reactos/win32ss/user/ntuser/timer.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/timer.c
rename to reactos/win32ss/user/ntuser/timer.c

diff --git a/reactos/win32ss/core/user/ntuser/timer.h b/reactos/win32ss/user/ntuser/timer.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/timer.h
rename to reactos/win32ss/user/ntuser/timer.h

diff --git a/reactos/win32ss/core/user/ntuser/useratom.c b/reactos/win32ss/user/ntuser/useratom.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/useratom.c
rename to reactos/win32ss/user/ntuser/useratom.c

diff --git a/reactos/win32ss/core/user/ntuser/useratom.h b/reactos/win32ss/user/ntuser/useratom.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/useratom.h
rename to reactos/win32ss/user/ntuser/useratom.h

diff --git a/reactos/win32ss/core/user/ntuser/userfuncs.h b/reactos/win32ss/user/ntuser/userfuncs.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/userfuncs.h
rename to reactos/win32ss/user/ntuser/userfuncs.h

diff --git a/reactos/win32ss/core/user/ntuser/usrheap.c b/reactos/win32ss/user/ntuser/usrheap.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/usrheap.c
rename to reactos/win32ss/user/ntuser/usrheap.c

diff --git a/reactos/win32ss/core/user/ntuser/usrheap.h b/reactos/win32ss/user/ntuser/usrheap.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/usrheap.h
rename to reactos/win32ss/user/ntuser/usrheap.h

diff --git a/reactos/win32ss/core/user/ntuser/vis.c b/reactos/win32ss/user/ntuser/vis.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/vis.c
rename to reactos/win32ss/user/ntuser/vis.c

diff --git a/reactos/win32ss/core/user/ntuser/vis.h b/reactos/win32ss/user/ntuser/vis.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/vis.h
rename to reactos/win32ss/user/ntuser/vis.h

diff --git a/reactos/win32ss/core/user/ntuser/win32.h b/reactos/win32ss/user/ntuser/win32.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/win32.h
rename to reactos/win32ss/user/ntuser/win32.h

diff --git a/reactos/win32ss/core/user/ntuser/win32kdebug.h b/reactos/win32ss/user/ntuser/win32kdebug.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/win32kdebug.h
rename to reactos/win32ss/user/ntuser/win32kdebug.h

diff --git a/reactos/win32ss/core/user/ntuser/windc.c b/reactos/win32ss/user/ntuser/windc.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/windc.c
rename to reactos/win32ss/user/ntuser/windc.c

diff --git a/reactos/win32ss/core/user/ntuser/window.c b/reactos/win32ss/user/ntuser/window.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/window.c
rename to reactos/win32ss/user/ntuser/window.c

diff --git a/reactos/win32ss/core/user/ntuser/window.h b/reactos/win32ss/user/ntuser/window.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/window.h
rename to reactos/win32ss/user/ntuser/window.h

diff --git a/reactos/win32ss/core/user/ntuser/winpos.c b/reactos/win32ss/user/ntuser/winpos.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/winpos.c
rename to reactos/win32ss/user/ntuser/winpos.c

diff --git a/reactos/win32ss/core/user/ntuser/winpos.h b/reactos/win32ss/user/ntuser/winpos.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/winpos.h
rename to reactos/win32ss/user/ntuser/winpos.h

diff --git a/reactos/win32ss/core/user/ntuser/winsta.c b/reactos/win32ss/user/ntuser/winsta.c
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/winsta.c
rename to reactos/win32ss/user/ntuser/winsta.c

diff --git a/reactos/win32ss/core/user/ntuser/winsta.h b/reactos/win32ss/user/ntuser/winsta.h
similarity index 100%
rename from reactos/win32ss/core/user/ntuser/winsta.h
rename to reactos/win32ss/user/ntuser/winsta.h

diff --git a/reactos/win32ss/core/user/user32/CMakeLists.txt b/reactos/win32ss/user/user32/CMakeLists.txt
similarity index 97%
rename from reactos/win32ss/core/user/user32/CMakeLists.txt
rename to reactos/win32ss/user/user32/CMakeLists.txt
index c74e0db..409d325 100644 (file)
--- a/reactos/win32ss/core/user/user32/CMakeLists.txt
+++ b/reactos/win32ss/user/user32/CMakeLists.txt
@@ -4,7 +4,7 @@ spec2def(user32.dll user32.spec ADD_IMPORTLIB)
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
     include
-    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 list(APPEND SOURCE
     controls/appswitch.c

diff --git a/reactos/win32ss/core/user/user32/controls/appswitch.c b/reactos/win32ss/user/user32/controls/appswitch.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/appswitch.c
rename to reactos/win32ss/user/user32/controls/appswitch.c

diff --git a/reactos/win32ss/core/user/user32/controls/button.c b/reactos/win32ss/user/user32/controls/button.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/button.c
rename to reactos/win32ss/user/user32/controls/button.c

diff --git a/reactos/win32ss/core/user/user32/controls/combo.c b/reactos/win32ss/user/user32/controls/combo.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/combo.c
rename to reactos/win32ss/user/user32/controls/combo.c

diff --git a/reactos/win32ss/core/user/user32/controls/edit.c b/reactos/win32ss/user/user32/controls/edit.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/edit.c
rename to reactos/win32ss/user/user32/controls/edit.c

diff --git a/reactos/win32ss/core/user/user32/controls/icontitle.c b/reactos/win32ss/user/user32/controls/icontitle.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/icontitle.c
rename to reactos/win32ss/user/user32/controls/icontitle.c

diff --git a/reactos/win32ss/core/user/user32/controls/listbox.c b/reactos/win32ss/user/user32/controls/listbox.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/listbox.c
rename to reactos/win32ss/user/user32/controls/listbox.c

diff --git a/reactos/win32ss/core/user/user32/controls/regcontrol.c b/reactos/win32ss/user/user32/controls/regcontrol.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/regcontrol.c
rename to reactos/win32ss/user/user32/controls/regcontrol.c

diff --git a/reactos/win32ss/core/user/user32/controls/scrollbar.c b/reactos/win32ss/user/user32/controls/scrollbar.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/scrollbar.c
rename to reactos/win32ss/user/user32/controls/scrollbar.c

diff --git a/reactos/win32ss/core/user/user32/controls/static.c b/reactos/win32ss/user/user32/controls/static.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/controls/static.c
rename to reactos/win32ss/user/user32/controls/static.c

diff --git a/reactos/win32ss/core/user/user32/include/controls.h b/reactos/win32ss/user/user32/include/controls.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/controls.h
rename to reactos/win32ss/user/user32/include/controls.h

diff --git a/reactos/win32ss/core/user/user32/include/dde_private.h b/reactos/win32ss/user/user32/include/dde_private.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/dde_private.h
rename to reactos/win32ss/user/user32/include/dde_private.h

diff --git a/reactos/win32ss/core/user/user32/include/ntwrapper.h b/reactos/win32ss/user/user32/include/ntwrapper.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/ntwrapper.h
rename to reactos/win32ss/user/user32/include/ntwrapper.h

diff --git a/reactos/win32ss/core/user/user32/include/regcontrol.h b/reactos/win32ss/user/user32/include/regcontrol.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/regcontrol.h
rename to reactos/win32ss/user/user32/include/regcontrol.h

diff --git a/reactos/win32ss/core/user/user32/include/resource.h b/reactos/win32ss/user/user32/include/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/resource.h
rename to reactos/win32ss/user/user32/include/resource.h

diff --git a/reactos/win32ss/core/user/user32/include/user32.h b/reactos/win32ss/user/user32/include/user32.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/user32.h
rename to reactos/win32ss/user/user32/include/user32.h

diff --git a/reactos/win32ss/core/user/user32/include/user32p.h b/reactos/win32ss/user/user32/include/user32p.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/user32p.h
rename to reactos/win32ss/user/user32/include/user32p.h

diff --git a/reactos/win32ss/core/user/user32/include/user_x.h b/reactos/win32ss/user/user32/include/user_x.h
similarity index 100%
rename from reactos/win32ss/core/user/user32/include/user_x.h
rename to reactos/win32ss/user/user32/include/user_x.h

diff --git a/reactos/win32ss/core/user/user32/lang/bg-BG.rc b/reactos/win32ss/user/user32/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/bg-BG.rc
rename to reactos/win32ss/user/user32/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/user32/lang/cs-CZ.rc b/reactos/win32ss/user/user32/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/cs-CZ.rc
rename to reactos/win32ss/user/user32/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/user32/lang/da-DK.rc b/reactos/win32ss/user/user32/lang/da-DK.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/da-DK.rc
rename to reactos/win32ss/user/user32/lang/da-DK.rc

diff --git a/reactos/win32ss/core/user/user32/lang/de-DE.rc b/reactos/win32ss/user/user32/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/de-DE.rc
rename to reactos/win32ss/user/user32/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/user32/lang/el-GR.rc b/reactos/win32ss/user/user32/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/el-GR.rc
rename to reactos/win32ss/user/user32/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/user32/lang/en-US.rc b/reactos/win32ss/user/user32/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/en-US.rc
rename to reactos/win32ss/user/user32/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/user32/lang/es-ES.rc b/reactos/win32ss/user/user32/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/es-ES.rc
rename to reactos/win32ss/user/user32/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/user32/lang/fr-FR.rc b/reactos/win32ss/user/user32/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/fr-FR.rc
rename to reactos/win32ss/user/user32/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/user32/lang/he-IL.rc b/reactos/win32ss/user/user32/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/he-IL.rc
rename to reactos/win32ss/user/user32/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/user32/lang/hu-HU.rc b/reactos/win32ss/user/user32/lang/hu-HU.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/hu-HU.rc
rename to reactos/win32ss/user/user32/lang/hu-HU.rc

diff --git a/reactos/win32ss/core/user/user32/lang/id-ID.rc b/reactos/win32ss/user/user32/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/id-ID.rc
rename to reactos/win32ss/user/user32/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/user32/lang/it-IT.rc b/reactos/win32ss/user/user32/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/it-IT.rc
rename to reactos/win32ss/user/user32/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/user32/lang/ja-JP.rc b/reactos/win32ss/user/user32/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/ja-JP.rc
rename to reactos/win32ss/user/user32/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/user32/lang/lt-LT.rc b/reactos/win32ss/user/user32/lang/lt-LT.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/lt-LT.rc
rename to reactos/win32ss/user/user32/lang/lt-LT.rc

diff --git a/reactos/win32ss/core/user/user32/lang/nl-NL.rc b/reactos/win32ss/user/user32/lang/nl-NL.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/nl-NL.rc
rename to reactos/win32ss/user/user32/lang/nl-NL.rc

diff --git a/reactos/win32ss/core/user/user32/lang/no-NO.rc b/reactos/win32ss/user/user32/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/no-NO.rc
rename to reactos/win32ss/user/user32/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/user32/lang/pl-PL.rc b/reactos/win32ss/user/user32/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/pl-PL.rc
rename to reactos/win32ss/user/user32/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/user32/lang/pt-BR.rc b/reactos/win32ss/user/user32/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/pt-BR.rc
rename to reactos/win32ss/user/user32/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/user32/lang/ro-RO.rc b/reactos/win32ss/user/user32/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/ro-RO.rc
rename to reactos/win32ss/user/user32/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/user32/lang/ru-RU.rc b/reactos/win32ss/user/user32/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/ru-RU.rc
rename to reactos/win32ss/user/user32/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/user32/lang/sk-SK.rc b/reactos/win32ss/user/user32/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/sk-SK.rc
rename to reactos/win32ss/user/user32/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/user32/lang/sv-SE.rc b/reactos/win32ss/user/user32/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/sv-SE.rc
rename to reactos/win32ss/user/user32/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/user32/lang/tr-TR.rc b/reactos/win32ss/user/user32/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/tr-TR.rc
rename to reactos/win32ss/user/user32/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/user32/lang/uk-UA.rc b/reactos/win32ss/user/user32/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/uk-UA.rc
rename to reactos/win32ss/user/user32/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/user32/lang/zh-CN.rc b/reactos/win32ss/user/user32/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/lang/zh-CN.rc
rename to reactos/win32ss/user/user32/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/user32/misc/dde.c b/reactos/win32ss/user/user32/misc/dde.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/dde.c
rename to reactos/win32ss/user/user32/misc/dde.c

diff --git a/reactos/win32ss/core/user/user32/misc/ddeclient.c b/reactos/win32ss/user/user32/misc/ddeclient.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/ddeclient.c
rename to reactos/win32ss/user/user32/misc/ddeclient.c

diff --git a/reactos/win32ss/core/user/user32/misc/ddemisc.c b/reactos/win32ss/user/user32/misc/ddemisc.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/ddemisc.c
rename to reactos/win32ss/user/user32/misc/ddemisc.c

diff --git a/reactos/win32ss/core/user/user32/misc/ddeserver.c b/reactos/win32ss/user/user32/misc/ddeserver.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/ddeserver.c
rename to reactos/win32ss/user/user32/misc/ddeserver.c

diff --git a/reactos/win32ss/core/user/user32/misc/desktop.c b/reactos/win32ss/user/user32/misc/desktop.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/desktop.c
rename to reactos/win32ss/user/user32/misc/desktop.c

diff --git a/reactos/win32ss/core/user/user32/misc/display.c b/reactos/win32ss/user/user32/misc/display.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/display.c
rename to reactos/win32ss/user/user32/misc/display.c

diff --git a/reactos/win32ss/core/user/user32/misc/dllmain.c b/reactos/win32ss/user/user32/misc/dllmain.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/dllmain.c
rename to reactos/win32ss/user/user32/misc/dllmain.c

diff --git a/reactos/win32ss/core/user/user32/misc/exit.c b/reactos/win32ss/user/user32/misc/exit.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/exit.c
rename to reactos/win32ss/user/user32/misc/exit.c

diff --git a/reactos/win32ss/core/user/user32/misc/exticon.c b/reactos/win32ss/user/user32/misc/exticon.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/exticon.c
rename to reactos/win32ss/user/user32/misc/exticon.c

diff --git a/reactos/win32ss/core/user/user32/misc/imm.c b/reactos/win32ss/user/user32/misc/imm.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/imm.c
rename to reactos/win32ss/user/user32/misc/imm.c

diff --git a/reactos/win32ss/core/user/user32/misc/logon.c b/reactos/win32ss/user/user32/misc/logon.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/logon.c
rename to reactos/win32ss/user/user32/misc/logon.c

diff --git a/reactos/win32ss/core/user/user32/misc/misc.c b/reactos/win32ss/user/user32/misc/misc.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/misc.c
rename to reactos/win32ss/user/user32/misc/misc.c

diff --git a/reactos/win32ss/core/user/user32/misc/object.c b/reactos/win32ss/user/user32/misc/object.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/object.c
rename to reactos/win32ss/user/user32/misc/object.c

diff --git a/reactos/win32ss/core/user/user32/misc/resources.c b/reactos/win32ss/user/user32/misc/resources.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/resources.c
rename to reactos/win32ss/user/user32/misc/resources.c

diff --git a/reactos/win32ss/core/user/user32/misc/rtlstr.c b/reactos/win32ss/user/user32/misc/rtlstr.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/rtlstr.c
rename to reactos/win32ss/user/user32/misc/rtlstr.c

diff --git a/reactos/win32ss/core/user/user32/misc/stubs.c b/reactos/win32ss/user/user32/misc/stubs.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/stubs.c
rename to reactos/win32ss/user/user32/misc/stubs.c

diff --git a/reactos/win32ss/core/user/user32/misc/timer.c b/reactos/win32ss/user/user32/misc/timer.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/timer.c
rename to reactos/win32ss/user/user32/misc/timer.c

diff --git a/reactos/win32ss/core/user/user32/misc/usrapihk.c b/reactos/win32ss/user/user32/misc/usrapihk.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/usrapihk.c
rename to reactos/win32ss/user/user32/misc/usrapihk.c

diff --git a/reactos/win32ss/core/user/user32/misc/winhelp.c b/reactos/win32ss/user/user32/misc/winhelp.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/winhelp.c
rename to reactos/win32ss/user/user32/misc/winhelp.c

diff --git a/reactos/win32ss/core/user/user32/misc/winsta.c b/reactos/win32ss/user/user32/misc/winsta.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/misc/winsta.c
rename to reactos/win32ss/user/user32/misc/winsta.c

diff --git a/reactos/win32ss/core/user/user32/resources/obm_btncorners.bmp b/reactos/win32ss/user/user32/resources/obm_btncorners.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_btncorners.bmp
rename to reactos/win32ss/user/user32/resources/obm_btncorners.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_btsize.bmp b/reactos/win32ss/user/user32/resources/obm_btsize.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_btsize.bmp
rename to reactos/win32ss/user/user32/resources/obm_btsize.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_check.bmp b/reactos/win32ss/user/user32/resources/obm_check.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_check.bmp
rename to reactos/win32ss/user/user32/resources/obm_check.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_checkboxes.bmp b/reactos/win32ss/user/user32/resources/obm_checkboxes.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_checkboxes.bmp
rename to reactos/win32ss/user/user32/resources/obm_checkboxes.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_close.bmp b/reactos/win32ss/user/user32/resources/obm_close.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_close.bmp
rename to reactos/win32ss/user/user32/resources/obm_close.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_combo.bmp b/reactos/win32ss/user/user32/resources/obm_combo.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_combo.bmp
rename to reactos/win32ss/user/user32/resources/obm_combo.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_dnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_dnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_dnarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrowd.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_dnarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrowd.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_dnarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_dnarrowi.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_dnarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_dnarrowi.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_lfarrow.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_lfarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_lfarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrowd.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_lfarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrowd.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_lfarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_lfarrowi.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_lfarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_lfarrowi.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_mnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_mnarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_mnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_mnarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_close.bmp b/reactos/win32ss/user/user32/resources/obm_old_close.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_close.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_close.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_dnarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_dnarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_dnarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_dnarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_lfarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_lfarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_lfarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_lfarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_reduce.bmp b/reactos/win32ss/user/user32/resources/obm_old_reduce.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_reduce.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_reduce.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_restore.bmp b/reactos/win32ss/user/user32/resources/obm_old_restore.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_restore.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_restore.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_rgarrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_rgarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_rgarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_rgarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_uparrow.bmp b/reactos/win32ss/user/user32/resources/obm_old_uparrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_uparrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_uparrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_old_zoom.bmp b/reactos/win32ss/user/user32/resources/obm_old_zoom.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_old_zoom.bmp
rename to reactos/win32ss/user/user32/resources/obm_old_zoom.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_reduce.bmp b/reactos/win32ss/user/user32/resources/obm_reduce.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_reduce.bmp
rename to reactos/win32ss/user/user32/resources/obm_reduce.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_reduced.bmp b/reactos/win32ss/user/user32/resources/obm_reduced.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_reduced.bmp
rename to reactos/win32ss/user/user32/resources/obm_reduced.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_restore.bmp b/reactos/win32ss/user/user32/resources/obm_restore.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_restore.bmp
rename to reactos/win32ss/user/user32/resources/obm_restore.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_restored.bmp b/reactos/win32ss/user/user32/resources/obm_restored.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_restored.bmp
rename to reactos/win32ss/user/user32/resources/obm_restored.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_rgarrow.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_rgarrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_rgarrowd.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrowd.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_rgarrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrowd.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_rgarrowi.bmp b/reactos/win32ss/user/user32/resources/obm_rgarrowi.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_rgarrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_rgarrowi.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_size.bmp b/reactos/win32ss/user/user32/resources/obm_size.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_size.bmp
rename to reactos/win32ss/user/user32/resources/obm_size.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_trtype.bmp b/reactos/win32ss/user/user32/resources/obm_trtype.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_trtype.bmp
rename to reactos/win32ss/user/user32/resources/obm_trtype.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_uparrow.bmp b/reactos/win32ss/user/user32/resources/obm_uparrow.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_uparrow.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrow.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_uparrowd.bmp b/reactos/win32ss/user/user32/resources/obm_uparrowd.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_uparrowd.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrowd.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_uparrowi.bmp b/reactos/win32ss/user/user32/resources/obm_uparrowi.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_uparrowi.bmp
rename to reactos/win32ss/user/user32/resources/obm_uparrowi.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_zoom.bmp b/reactos/win32ss/user/user32/resources/obm_zoom.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_zoom.bmp
rename to reactos/win32ss/user/user32/resources/obm_zoom.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/obm_zoomd.bmp b/reactos/win32ss/user/user32/resources/obm_zoomd.bmp
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/obm_zoomd.bmp
rename to reactos/win32ss/user/user32/resources/obm_zoomd.bmp

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_appstarting.cur b/reactos/win32ss/user/user32/resources/ocr_appstarting.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_appstarting.cur
rename to reactos/win32ss/user/user32/resources/ocr_appstarting.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_cdautostart.cur b/reactos/win32ss/user/user32/resources/ocr_cdautostart.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_cdautostart.cur
rename to reactos/win32ss/user/user32/resources/ocr_cdautostart.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_cross.cur b/reactos/win32ss/user/user32/resources/ocr_cross.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_cross.cur
rename to reactos/win32ss/user/user32/resources/ocr_cross.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_dragobject.cur b/reactos/win32ss/user/user32/resources/ocr_dragobject.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_dragobject.cur
rename to reactos/win32ss/user/user32/resources/ocr_dragobject.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_hand.cur b/reactos/win32ss/user/user32/resources/ocr_hand.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_hand.cur
rename to reactos/win32ss/user/user32/resources/ocr_hand.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_help.cur b/reactos/win32ss/user/user32/resources/ocr_help.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_help.cur
rename to reactos/win32ss/user/user32/resources/ocr_help.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_ibeam.cur b/reactos/win32ss/user/user32/resources/ocr_ibeam.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_ibeam.cur
rename to reactos/win32ss/user/user32/resources/ocr_ibeam.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_icon.cur b/reactos/win32ss/user/user32/resources/ocr_icon.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_icon.cur
rename to reactos/win32ss/user/user32/resources/ocr_icon.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_no.cur b/reactos/win32ss/user/user32/resources/ocr_no.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_no.cur
rename to reactos/win32ss/user/user32/resources/ocr_no.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_normal.cur b/reactos/win32ss/user/user32/resources/ocr_normal.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_normal.cur
rename to reactos/win32ss/user/user32/resources/ocr_normal.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_pen.cur b/reactos/win32ss/user/user32/resources/ocr_pen.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_pen.cur
rename to reactos/win32ss/user/user32/resources/ocr_pen.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_size.cur b/reactos/win32ss/user/user32/resources/ocr_size.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_size.cur
rename to reactos/win32ss/user/user32/resources/ocr_size.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_sizeall.cur b/reactos/win32ss/user/user32/resources/ocr_sizeall.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_sizeall.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizeall.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_sizenesw.cur b/reactos/win32ss/user/user32/resources/ocr_sizenesw.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_sizenesw.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizenesw.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_sizens.cur b/reactos/win32ss/user/user32/resources/ocr_sizens.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_sizens.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizens.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_sizenwse.cur b/reactos/win32ss/user/user32/resources/ocr_sizenwse.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_sizenwse.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizenwse.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_sizewe.cur b/reactos/win32ss/user/user32/resources/ocr_sizewe.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_sizewe.cur
rename to reactos/win32ss/user/user32/resources/ocr_sizewe.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_up.cur b/reactos/win32ss/user/user32/resources/ocr_up.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_up.cur
rename to reactos/win32ss/user/user32/resources/ocr_up.cur

diff --git a/reactos/win32ss/core/user/user32/resources/ocr_wait.cur b/reactos/win32ss/user/user32/resources/ocr_wait.cur
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/ocr_wait.cur
rename to reactos/win32ss/user/user32/resources/ocr_wait.cur

diff --git a/reactos/win32ss/core/user/user32/resources/oic_bang.ico b/reactos/win32ss/user/user32/resources/oic_bang.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_bang.ico
rename to reactos/win32ss/user/user32/resources/oic_bang.ico

diff --git a/reactos/win32ss/core/user/user32/resources/oic_hand.ico b/reactos/win32ss/user/user32/resources/oic_hand.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_hand.ico
rename to reactos/win32ss/user/user32/resources/oic_hand.ico

diff --git a/reactos/win32ss/core/user/user32/resources/oic_note.ico b/reactos/win32ss/user/user32/resources/oic_note.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_note.ico
rename to reactos/win32ss/user/user32/resources/oic_note.ico

diff --git a/reactos/win32ss/core/user/user32/resources/oic_ques.ico b/reactos/win32ss/user/user32/resources/oic_ques.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_ques.ico
rename to reactos/win32ss/user/user32/resources/oic_ques.ico

diff --git a/reactos/win32ss/core/user/user32/resources/oic_reactos.ico b/reactos/win32ss/user/user32/resources/oic_reactos.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_reactos.ico
rename to reactos/win32ss/user/user32/resources/oic_reactos.ico

diff --git a/reactos/win32ss/core/user/user32/resources/oic_sample.ico b/reactos/win32ss/user/user32/resources/oic_sample.ico
similarity index 100%
rename from reactos/win32ss/core/user/user32/resources/oic_sample.ico
rename to reactos/win32ss/user/user32/resources/oic_sample.ico

diff --git a/reactos/win32ss/core/user/user32/user32.rc b/reactos/win32ss/user/user32/user32.rc
similarity index 100%
rename from reactos/win32ss/core/user/user32/user32.rc
rename to reactos/win32ss/user/user32/user32.rc

diff --git a/reactos/win32ss/core/user/user32/user32.spec b/reactos/win32ss/user/user32/user32.spec
similarity index 100%
rename from reactos/win32ss/core/user/user32/user32.spec
rename to reactos/win32ss/user/user32/user32.spec

diff --git a/reactos/win32ss/core/user/user32/windows/accel.c b/reactos/win32ss/user/user32/windows/accel.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/accel.c
rename to reactos/win32ss/user/user32/windows/accel.c

diff --git a/reactos/win32ss/core/user/user32/windows/caret.c b/reactos/win32ss/user/user32/windows/caret.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/caret.c
rename to reactos/win32ss/user/user32/windows/caret.c

diff --git a/reactos/win32ss/core/user/user32/windows/class.c b/reactos/win32ss/user/user32/windows/class.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/class.c
rename to reactos/win32ss/user/user32/windows/class.c

diff --git a/reactos/win32ss/core/user/user32/windows/clipboard.c b/reactos/win32ss/user/user32/windows/clipboard.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/clipboard.c
rename to reactos/win32ss/user/user32/windows/clipboard.c

diff --git a/reactos/win32ss/core/user/user32/windows/cursoricon.c b/reactos/win32ss/user/user32/windows/cursoricon.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/cursoricon.c
rename to reactos/win32ss/user/user32/windows/cursoricon.c

diff --git a/reactos/win32ss/core/user/user32/windows/dc.c b/reactos/win32ss/user/user32/windows/dc.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/dc.c
rename to reactos/win32ss/user/user32/windows/dc.c

diff --git a/reactos/win32ss/core/user/user32/windows/defwnd.c b/reactos/win32ss/user/user32/windows/defwnd.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/defwnd.c
rename to reactos/win32ss/user/user32/windows/defwnd.c

diff --git a/reactos/win32ss/core/user/user32/windows/dialog.c b/reactos/win32ss/user/user32/windows/dialog.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/dialog.c
rename to reactos/win32ss/user/user32/windows/dialog.c

diff --git a/reactos/win32ss/core/user/user32/windows/draw.c b/reactos/win32ss/user/user32/windows/draw.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/draw.c
rename to reactos/win32ss/user/user32/windows/draw.c

diff --git a/reactos/win32ss/core/user/user32/windows/font.c b/reactos/win32ss/user/user32/windows/font.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/font.c
rename to reactos/win32ss/user/user32/windows/font.c

diff --git a/reactos/win32ss/core/user/user32/windows/hook.c b/reactos/win32ss/user/user32/windows/hook.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/hook.c
rename to reactos/win32ss/user/user32/windows/hook.c

diff --git a/reactos/win32ss/core/user/user32/windows/input.c b/reactos/win32ss/user/user32/windows/input.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/input.c
rename to reactos/win32ss/user/user32/windows/input.c

diff --git a/reactos/win32ss/core/user/user32/windows/mdi.c b/reactos/win32ss/user/user32/windows/mdi.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/mdi.c
rename to reactos/win32ss/user/user32/windows/mdi.c

diff --git a/reactos/win32ss/core/user/user32/windows/menu.c b/reactos/win32ss/user/user32/windows/menu.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/menu.c
rename to reactos/win32ss/user/user32/windows/menu.c

diff --git a/reactos/win32ss/core/user/user32/windows/message.c b/reactos/win32ss/user/user32/windows/message.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/message.c
rename to reactos/win32ss/user/user32/windows/message.c

diff --git a/reactos/win32ss/core/user/user32/windows/messagebox.c b/reactos/win32ss/user/user32/windows/messagebox.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/messagebox.c
rename to reactos/win32ss/user/user32/windows/messagebox.c

diff --git a/reactos/win32ss/core/user/user32/windows/nonclient.c b/reactos/win32ss/user/user32/windows/nonclient.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/nonclient.c
rename to reactos/win32ss/user/user32/windows/nonclient.c

diff --git a/reactos/win32ss/core/user/user32/windows/paint.c b/reactos/win32ss/user/user32/windows/paint.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/paint.c
rename to reactos/win32ss/user/user32/windows/paint.c

diff --git a/reactos/win32ss/core/user/user32/windows/prop.c b/reactos/win32ss/user/user32/windows/prop.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/prop.c
rename to reactos/win32ss/user/user32/windows/prop.c

diff --git a/reactos/win32ss/core/user/user32/windows/rect.c b/reactos/win32ss/user/user32/windows/rect.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/rect.c
rename to reactos/win32ss/user/user32/windows/rect.c

diff --git a/reactos/win32ss/core/user/user32/windows/spy.c b/reactos/win32ss/user/user32/windows/spy.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/spy.c
rename to reactos/win32ss/user/user32/windows/spy.c

diff --git a/reactos/win32ss/core/user/user32/windows/text.c b/reactos/win32ss/user/user32/windows/text.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/text.c
rename to reactos/win32ss/user/user32/windows/text.c

diff --git a/reactos/win32ss/core/user/user32/windows/window.c b/reactos/win32ss/user/user32/windows/window.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/window.c
rename to reactos/win32ss/user/user32/windows/window.c

diff --git a/reactos/win32ss/core/user/user32/windows/winpos.c b/reactos/win32ss/user/user32/windows/winpos.c
similarity index 100%
rename from reactos/win32ss/core/user/user32/windows/winpos.c
rename to reactos/win32ss/user/user32/windows/winpos.c

diff --git a/reactos/win32ss/core/user/winsrv/CMakeLists.txt b/reactos/win32ss/user/winsrv/CMakeLists.txt
similarity index 95%
rename from reactos/win32ss/core/user/winsrv/CMakeLists.txt
rename to reactos/win32ss/user/winsrv/CMakeLists.txt
index 67af25e..1444c83 100644 (file)
--- a/reactos/win32ss/core/user/winsrv/CMakeLists.txt
+++ b/reactos/win32ss/user/winsrv/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/subsys
-    ${REACTOS_SOURCE_DIR}/win32ss/core/include)
+    ${REACTOS_SOURCE_DIR}/win32ss/include)
 
 spec2def(winsrv.dll winsrv.spec)
 

diff --git a/reactos/win32ss/core/user/winsrv/consrv.cmake b/reactos/win32ss/user/winsrv/consrv.cmake
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv.cmake
rename to reactos/win32ss/user/winsrv/consrv.cmake

diff --git a/reactos/win32ss/core/user/winsrv/consrv/alias.c b/reactos/win32ss/user/winsrv/consrv/alias.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/alias.c
rename to reactos/win32ss/user/winsrv/consrv/alias.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/alias.h b/reactos/win32ss/user/winsrv/consrv/alias.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/alias.h
rename to reactos/win32ss/user/winsrv/consrv/alias.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/api.h b/reactos/win32ss/user/winsrv/consrv/api.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/api.h
rename to reactos/win32ss/user/winsrv/consrv/api.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/coninput.c b/reactos/win32ss/user/winsrv/consrv/condrv/coninput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/coninput.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/coninput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/conoutput.c b/reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/conoutput.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/conoutput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/console.c b/reactos/win32ss/user/winsrv/consrv/condrv/console.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/console.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/console.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/dummyterm.c b/reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/dummyterm.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/dummyterm.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/graphics.c b/reactos/win32ss/user/winsrv/consrv/condrv/graphics.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/graphics.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/graphics.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/condrv/text.c b/reactos/win32ss/user/winsrv/consrv/condrv/text.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/condrv/text.c
rename to reactos/win32ss/user/winsrv/consrv/condrv/text.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/coninput.c b/reactos/win32ss/user/winsrv/consrv/coninput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/coninput.c
rename to reactos/win32ss/user/winsrv/consrv/coninput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/coninput.h b/reactos/win32ss/user/winsrv/consrv/coninput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/coninput.h
rename to reactos/win32ss/user/winsrv/consrv/coninput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/conoutput.c b/reactos/win32ss/user/winsrv/consrv/conoutput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/conoutput.c
rename to reactos/win32ss/user/winsrv/consrv/conoutput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/conoutput.h b/reactos/win32ss/user/winsrv/consrv/conoutput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/conoutput.h
rename to reactos/win32ss/user/winsrv/consrv/conoutput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/console.c b/reactos/win32ss/user/winsrv/consrv/console.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/console.c
rename to reactos/win32ss/user/winsrv/consrv/console.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/console.h b/reactos/win32ss/user/winsrv/consrv/console.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/console.h
rename to reactos/win32ss/user/winsrv/consrv/console.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/consrv.h b/reactos/win32ss/user/winsrv/consrv/consrv.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/consrv.h
rename to reactos/win32ss/user/winsrv/consrv/consrv.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/consrv.rc b/reactos/win32ss/user/winsrv/consrv/consrv.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/consrv.rc
rename to reactos/win32ss/user/winsrv/consrv/consrv.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontendctl.c b/reactos/win32ss/user/winsrv/consrv/frontendctl.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontendctl.c
rename to reactos/win32ss/user/winsrv/consrv/frontendctl.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/frontends.rc b/reactos/win32ss/user/winsrv/consrv/frontends/frontends.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/frontends.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/frontends.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/consolecpl.h b/reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/consolecpl.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/consolecpl.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/conwnd.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/conwnd.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/conwnd.h b/reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/conwnd.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/conwnd.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/fullscreen.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/fullscreen.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/fullscreen.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/graphics.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/graphics.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/graphics.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guisettings.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guisettings.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guisettings.h b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guisettings.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/guisettings.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.h b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/guiterm.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/de-DE.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/de-DE.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/el-GR.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/el-GR.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/en-US.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/en-US.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/es-ES.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/es-ES.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/he-IL.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/he-IL.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/id-ID.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/id-ID.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/it-IT.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/it-IT.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/no-NO.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/no-NO.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/lang/zh-TW.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/res/terminal.ico b/reactos/win32ss/user/winsrv/consrv/frontends/gui/res/terminal.ico
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/res/terminal.ico
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/res/terminal.ico

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/resource.h b/reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/resource.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/resource.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/gui/text.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/gui/text.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/gui/text.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/input.c b/reactos/win32ss/user/winsrv/consrv/frontends/input.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/input.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/input.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/terminal.c b/reactos/win32ss/user/winsrv/consrv/frontends/terminal.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/terminal.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/terminal.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/tui/tuiterm.c b/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/tui/tuiterm.c
rename to reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/frontends/tui/tuiterm.h b/reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/frontends/tui/tuiterm.h
rename to reactos/win32ss/user/winsrv/consrv/frontends/tui/tuiterm.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/handle.c b/reactos/win32ss/user/winsrv/consrv/handle.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/handle.c
rename to reactos/win32ss/user/winsrv/consrv/handle.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/handle.h b/reactos/win32ss/user/winsrv/consrv/handle.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/handle.h
rename to reactos/win32ss/user/winsrv/consrv/handle.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/heap.h b/reactos/win32ss/user/winsrv/consrv/heap.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/heap.h
rename to reactos/win32ss/user/winsrv/consrv/heap.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/history.c b/reactos/win32ss/user/winsrv/consrv/history.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/history.c
rename to reactos/win32ss/user/winsrv/consrv/history.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/history.h b/reactos/win32ss/user/winsrv/consrv/history.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/history.h
rename to reactos/win32ss/user/winsrv/consrv/history.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/conio.h b/reactos/win32ss/user/winsrv/consrv/include/conio.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/conio.h
rename to reactos/win32ss/user/winsrv/consrv/include/conio.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/conio_winsrv.h b/reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/conio_winsrv.h
rename to reactos/win32ss/user/winsrv/consrv/include/conio_winsrv.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/console.h b/reactos/win32ss/user/winsrv/consrv/include/console.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/console.h
rename to reactos/win32ss/user/winsrv/consrv/include/console.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/rect.h b/reactos/win32ss/user/winsrv/consrv/include/rect.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/rect.h
rename to reactos/win32ss/user/winsrv/consrv/include/rect.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/settings.h b/reactos/win32ss/user/winsrv/consrv/include/settings.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/settings.h
rename to reactos/win32ss/user/winsrv/consrv/include/settings.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/include/term.h b/reactos/win32ss/user/winsrv/consrv/include/term.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/include/term.h
rename to reactos/win32ss/user/winsrv/consrv/include/term.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/init.c b/reactos/win32ss/user/winsrv/consrv/init.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/init.c
rename to reactos/win32ss/user/winsrv/consrv/init.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/consrv/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/bg-BG.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/consrv/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/cs-CZ.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/de-DE.rc b/reactos/win32ss/user/winsrv/consrv/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/de-DE.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/el-GR.rc b/reactos/win32ss/user/winsrv/consrv/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/el-GR.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/en-US.rc b/reactos/win32ss/user/winsrv/consrv/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/en-US.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/es-ES.rc b/reactos/win32ss/user/winsrv/consrv/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/es-ES.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/consrv/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/fr-FR.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/he-IL.rc b/reactos/win32ss/user/winsrv/consrv/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/he-IL.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/id-ID.rc b/reactos/win32ss/user/winsrv/consrv/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/id-ID.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/it-IT.rc b/reactos/win32ss/user/winsrv/consrv/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/it-IT.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/consrv/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/ja-JP.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/no-NO.rc b/reactos/win32ss/user/winsrv/consrv/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/no-NO.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/pl-PL.rc b/reactos/win32ss/user/winsrv/consrv/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/pl-PL.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/pt-BR.rc b/reactos/win32ss/user/winsrv/consrv/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/pt-BR.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/ro-RO.rc b/reactos/win32ss/user/winsrv/consrv/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/ro-RO.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/ru-RU.rc b/reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/ru-RU.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/consrv/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/sk-SK.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/consrv/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/sv-SE.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/tr-TR.rc b/reactos/win32ss/user/winsrv/consrv/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/tr-TR.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/uk-UA.rc b/reactos/win32ss/user/winsrv/consrv/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/uk-UA.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/consrv/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/zh-CN.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/consrv/lang/zh-TW.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lang/zh-TW.rc
rename to reactos/win32ss/user/winsrv/consrv/lang/zh-TW.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lineinput.c b/reactos/win32ss/user/winsrv/consrv/lineinput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lineinput.c
rename to reactos/win32ss/user/winsrv/consrv/lineinput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/lineinput.h b/reactos/win32ss/user/winsrv/consrv/lineinput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/lineinput.h
rename to reactos/win32ss/user/winsrv/consrv/lineinput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/popup.c b/reactos/win32ss/user/winsrv/consrv/popup.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/popup.c
rename to reactos/win32ss/user/winsrv/consrv/popup.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/popup.h b/reactos/win32ss/user/winsrv/consrv/popup.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/popup.h
rename to reactos/win32ss/user/winsrv/consrv/popup.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/procinit.h b/reactos/win32ss/user/winsrv/consrv/procinit.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/procinit.h
rename to reactos/win32ss/user/winsrv/consrv/procinit.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/resource.h b/reactos/win32ss/user/winsrv/consrv/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/resource.h
rename to reactos/win32ss/user/winsrv/consrv/resource.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv/settings.c b/reactos/win32ss/user/winsrv/consrv/settings.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/settings.c
rename to reactos/win32ss/user/winsrv/consrv/settings.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/shutdown.c b/reactos/win32ss/user/winsrv/consrv/shutdown.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/shutdown.c
rename to reactos/win32ss/user/winsrv/consrv/shutdown.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv/subsysreg.c b/reactos/win32ss/user/winsrv/consrv/subsysreg.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv/subsysreg.c
rename to reactos/win32ss/user/winsrv/consrv/subsysreg.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new.cmake b/reactos/win32ss/user/winsrv/consrv_new.cmake
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new.cmake
rename to reactos/win32ss/user/winsrv/consrv_new.cmake

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/alias.c b/reactos/win32ss/user/winsrv/consrv_new/alias.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/alias.c
rename to reactos/win32ss/user/winsrv/consrv_new/alias.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/alias.h b/reactos/win32ss/user/winsrv/consrv_new/alias.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/alias.h
rename to reactos/win32ss/user/winsrv/consrv_new/alias.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/api.h b/reactos/win32ss/user/winsrv/consrv_new/api.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/api.h
rename to reactos/win32ss/user/winsrv/consrv_new/api.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/coninput.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/coninput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/coninput.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/coninput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/conoutput.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/conoutput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/conoutput.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/conoutput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/console.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/console.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/console.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/console.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/dummyfrontend.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/dummyfrontend.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/dummyfrontend.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/dummyfrontend.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/graphics.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/graphics.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/graphics.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/graphics.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/condrv/text.c b/reactos/win32ss/user/winsrv/consrv_new/condrv/text.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/condrv/text.c
rename to reactos/win32ss/user/winsrv/consrv_new/condrv/text.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/coninput.c b/reactos/win32ss/user/winsrv/consrv_new/coninput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/coninput.c
rename to reactos/win32ss/user/winsrv/consrv_new/coninput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/coninput.h b/reactos/win32ss/user/winsrv/consrv_new/coninput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/coninput.h
rename to reactos/win32ss/user/winsrv/consrv_new/coninput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/conoutput.c b/reactos/win32ss/user/winsrv/consrv_new/conoutput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/conoutput.c
rename to reactos/win32ss/user/winsrv/consrv_new/conoutput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/conoutput.h b/reactos/win32ss/user/winsrv/consrv_new/conoutput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/conoutput.h
rename to reactos/win32ss/user/winsrv/consrv_new/conoutput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/console.c b/reactos/win32ss/user/winsrv/consrv_new/console.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/console.c
rename to reactos/win32ss/user/winsrv/consrv_new/console.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/console.h b/reactos/win32ss/user/winsrv/consrv_new/console.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/console.h
rename to reactos/win32ss/user/winsrv/consrv_new/console.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/consrv.h b/reactos/win32ss/user/winsrv/consrv_new/consrv.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/consrv.h
rename to reactos/win32ss/user/winsrv/consrv_new/consrv.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/consrv.rc b/reactos/win32ss/user/winsrv/consrv_new/consrv.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/consrv.rc
rename to reactos/win32ss/user/winsrv/consrv_new/consrv.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontendctl.c b/reactos/win32ss/user/winsrv/consrv_new/frontendctl.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontendctl.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontendctl.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/frontends.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/frontends.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/frontends.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/frontends.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/consolecpl.h b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/consolecpl.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/consolecpl.h
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/consolecpl.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/graphics.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/graphics.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/graphics.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/graphics.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guisettings.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guisettings.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guisettings.h b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guisettings.h
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guisettings.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.h b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.h
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/guiterm.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/guiterm.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/bg-BG.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/de-DE.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/de-DE.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/el-GR.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/el-GR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/en-US.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/en-US.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/es-ES.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/es-ES.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/fr-FR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/he-IL.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/he-IL.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/id-ID.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/id-ID.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/it-IT.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/it-IT.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ja-JP.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/no-NO.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/no-NO.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/pl-PL.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/pl-PL.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/pt-BR.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/pt-BR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/sk-SK.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/sv-SE.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/uk-UA.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/uk-UA.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/zh-CN.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/zh-TW.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/lang/zh-TW.rc
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/lang/zh-TW.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/res/terminal.ico b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/res/terminal.ico
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/res/terminal.ico
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/res/terminal.ico

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/resource.h b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/resource.h
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/resource.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/text.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/gui/text.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/gui/text.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/gui/text.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/input.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/input.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/input.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/input.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/tui/tuiterm.c b/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/tui/tuiterm.c
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/frontends/tui/tuiterm.h b/reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/frontends/tui/tuiterm.h
rename to reactos/win32ss/user/winsrv/consrv_new/frontends/tui/tuiterm.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/handle.c b/reactos/win32ss/user/winsrv/consrv_new/handle.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/handle.c
rename to reactos/win32ss/user/winsrv/consrv_new/handle.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/handle.h b/reactos/win32ss/user/winsrv/consrv_new/handle.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/handle.h
rename to reactos/win32ss/user/winsrv/consrv_new/handle.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/heap.h b/reactos/win32ss/user/winsrv/consrv_new/heap.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/heap.h
rename to reactos/win32ss/user/winsrv/consrv_new/heap.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/include/conio.h b/reactos/win32ss/user/winsrv/consrv_new/include/conio.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/include/conio.h
rename to reactos/win32ss/user/winsrv/consrv_new/include/conio.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/include/conio2.h b/reactos/win32ss/user/winsrv/consrv_new/include/conio2.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/include/conio2.h
rename to reactos/win32ss/user/winsrv/consrv_new/include/conio2.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/include/console.h b/reactos/win32ss/user/winsrv/consrv_new/include/console.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/include/console.h
rename to reactos/win32ss/user/winsrv/consrv_new/include/console.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/include/settings.h b/reactos/win32ss/user/winsrv/consrv_new/include/settings.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/include/settings.h
rename to reactos/win32ss/user/winsrv/consrv_new/include/settings.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/init.c b/reactos/win32ss/user/winsrv/consrv_new/init.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/init.c
rename to reactos/win32ss/user/winsrv/consrv_new/init.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/bg-BG.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/cs-CZ.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/de-DE.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/de-DE.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/el-GR.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/el-GR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/en-US.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/en-US.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/es-ES.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/es-ES.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/fr-FR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/he-IL.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/he-IL.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/id-ID.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/id-ID.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/it-IT.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/it-IT.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/ja-JP.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/no-NO.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/no-NO.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/pl-PL.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/pl-PL.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/pt-BR.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/pt-BR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/ro-RO.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/ro-RO.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/ru-RU.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/ru-RU.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/sk-SK.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/sv-SE.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/tr-TR.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/tr-TR.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/uk-UA.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/uk-UA.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/zh-CN.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/consrv_new/lang/zh-TW.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lang/zh-TW.rc
rename to reactos/win32ss/user/winsrv/consrv_new/lang/zh-TW.rc

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lineinput.c b/reactos/win32ss/user/winsrv/consrv_new/lineinput.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lineinput.c
rename to reactos/win32ss/user/winsrv/consrv_new/lineinput.c

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/lineinput.h b/reactos/win32ss/user/winsrv/consrv_new/lineinput.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/lineinput.h
rename to reactos/win32ss/user/winsrv/consrv_new/lineinput.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/procinit.h b/reactos/win32ss/user/winsrv/consrv_new/procinit.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/procinit.h
rename to reactos/win32ss/user/winsrv/consrv_new/procinit.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/resource.h b/reactos/win32ss/user/winsrv/consrv_new/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/resource.h
rename to reactos/win32ss/user/winsrv/consrv_new/resource.h

diff --git a/reactos/win32ss/core/user/winsrv/consrv_new/settings.c b/reactos/win32ss/user/winsrv/consrv_new/settings.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/consrv_new/settings.c
rename to reactos/win32ss/user/winsrv/consrv_new/settings.c

diff --git a/reactos/win32ss/core/user/winsrv/init.c b/reactos/win32ss/user/winsrv/init.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/init.c
rename to reactos/win32ss/user/winsrv/init.c

diff --git a/reactos/win32ss/core/user/winsrv/usersrv.cmake b/reactos/win32ss/user/winsrv/usersrv.cmake
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv.cmake
rename to reactos/win32ss/user/winsrv/usersrv.cmake

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/api.h b/reactos/win32ss/user/winsrv/usersrv/api.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/api.h
rename to reactos/win32ss/user/winsrv/usersrv/api.h

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/harderror.c b/reactos/win32ss/user/winsrv/usersrv/harderror.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/harderror.c
rename to reactos/win32ss/user/winsrv/usersrv/harderror.c

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/init.c b/reactos/win32ss/user/winsrv/usersrv/init.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/init.c
rename to reactos/win32ss/user/winsrv/usersrv/init.c

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/bg-BG.rc b/reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/bg-BG.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/bg-BG.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/cs-CZ.rc b/reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/cs-CZ.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/cs-CZ.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/de-DE.rc b/reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/de-DE.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/de-DE.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/el-GR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/el-GR.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/el-GR.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/en-US.rc b/reactos/win32ss/user/winsrv/usersrv/lang/en-US.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/en-US.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/en-US.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/es-ES.rc b/reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/es-ES.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/es-ES.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/fr-FR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/fr-FR.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/fr-FR.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/he-IL.rc b/reactos/win32ss/user/winsrv/usersrv/lang/he-IL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/he-IL.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/he-IL.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/id-ID.rc b/reactos/win32ss/user/winsrv/usersrv/lang/id-ID.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/id-ID.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/id-ID.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/it-IT.rc b/reactos/win32ss/user/winsrv/usersrv/lang/it-IT.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/it-IT.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/it-IT.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/ja-JP.rc b/reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/ja-JP.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/ja-JP.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/no-NO.rc b/reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/no-NO.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/no-NO.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/pl-PL.rc b/reactos/win32ss/user/winsrv/usersrv/lang/pl-PL.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/pl-PL.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/pl-PL.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/pt-BR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/pt-BR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/pt-BR.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/pt-BR.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/ro-RO.rc b/reactos/win32ss/user/winsrv/usersrv/lang/ro-RO.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/ro-RO.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/ro-RO.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/ru-RU.rc b/reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/ru-RU.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/ru-RU.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/sk-SK.rc b/reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/sk-SK.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/sk-SK.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/sv-SE.rc b/reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/sv-SE.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/sv-SE.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/tr-TR.rc b/reactos/win32ss/user/winsrv/usersrv/lang/tr-TR.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/tr-TR.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/tr-TR.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/uk-UA.rc b/reactos/win32ss/user/winsrv/usersrv/lang/uk-UA.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/uk-UA.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/uk-UA.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/zh-CN.rc b/reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/zh-CN.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/zh-CN.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/lang/zh-TW.rc b/reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/lang/zh-TW.rc
rename to reactos/win32ss/user/winsrv/usersrv/lang/zh-TW.rc

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/register.c b/reactos/win32ss/user/winsrv/usersrv/register.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/register.c
rename to reactos/win32ss/user/winsrv/usersrv/register.c

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/resource.h b/reactos/win32ss/user/winsrv/usersrv/resource.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/resource.h
rename to reactos/win32ss/user/winsrv/usersrv/resource.h

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/shutdown.c b/reactos/win32ss/user/winsrv/usersrv/shutdown.c
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/shutdown.c
rename to reactos/win32ss/user/winsrv/usersrv/shutdown.c

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/usersrv.h b/reactos/win32ss/user/winsrv/usersrv/usersrv.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/usersrv.h
rename to reactos/win32ss/user/winsrv/usersrv/usersrv.h

diff --git a/reactos/win32ss/core/user/winsrv/usersrv/usersrv.rc b/reactos/win32ss/user/winsrv/usersrv/usersrv.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/usersrv/usersrv.rc
rename to reactos/win32ss/user/winsrv/usersrv/usersrv.rc

diff --git a/reactos/win32ss/core/user/winsrv/winsrv.h b/reactos/win32ss/user/winsrv/winsrv.h
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/winsrv.h
rename to reactos/win32ss/user/winsrv/winsrv.h

diff --git a/reactos/win32ss/core/user/winsrv/winsrv.rc b/reactos/win32ss/user/winsrv/winsrv.rc
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/winsrv.rc
rename to reactos/win32ss/user/winsrv/winsrv.rc

diff --git a/reactos/win32ss/core/user/winsrv/winsrv.spec b/reactos/win32ss/user/winsrv/winsrv.spec
similarity index 100%
rename from reactos/win32ss/core/user/winsrv/winsrv.spec
rename to reactos/win32ss/user/winsrv/winsrv.spec

diff --git a/reactos/win32ss/core/w32ksvc.db b/reactos/win32ss/w32ksvc.db
similarity index 100%
rename from reactos/win32ss/core/w32ksvc.db
rename to reactos/win32ss/w32ksvc.db

diff --git a/reactos/win32ss/core/w32ksvc.h b/reactos/win32ss/w32ksvc.h
similarity index 100%
rename from reactos/win32ss/core/w32ksvc.h
rename to reactos/win32ss/w32ksvc.h

diff --git a/reactos/win32ss/core/win32k.h b/reactos/win32ss/win32k.h
similarity index 100%
rename from reactos/win32ss/core/win32k.h
rename to reactos/win32ss/win32k.h

diff --git a/reactos/win32ss/core/win32k.rc b/reactos/win32ss/win32k.rc
similarity index 100%
rename from reactos/win32ss/core/win32k.rc
rename to reactos/win32ss/win32k.rc

diff --git a/reactos/win32ss/core/win32k.spec b/reactos/win32ss/win32k.spec
similarity index 100%
rename from reactos/win32ss/core/win32k.spec
rename to reactos/win32ss/win32k.spec

diff --git a/reactos/win32ss/core/win32kp.h b/reactos/win32ss/win32kp.h
similarity index 100%
rename from reactos/win32ss/core/win32kp.h
rename to reactos/win32ss/win32kp.h