diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt index 3b9fe4461f9..5a1e2297775 100644 --- a/reactos/dll/win32/kernel32/CMakeLists.txt +++ b/reactos/dll/win32/kernel32/CMakeLists.txt @@ -11,86 +11,86 @@ set_rc_compiler() spec2def(kernel32.dll kernel32.spec) list(APPEND SOURCE - debug/debugger.c - except/except.c - file/backup.c - file/bintype.c - file/cnotify.c - file/copy.c - file/console.c - file/create.c - file/curdir.c - file/delete.c - file/deviceio.c - file/dir.c - file/dosdev.c - file/file.c - file/filemap.c - file/find.c - file/hardlink.c - file/iocompl.c - file/lfile.c - file/lock.c - file/mailslot.c - file/move.c - file/npipe.c - file/pipe.c - file/rw.c - file/tape.c - file/volume.c - mem/heap.c - mem/virtual.c - misc/actctx.c - misc/atom.c - misc/comm.c - misc/computername.c - misc/dllmain.c - misc/env.c - misc/handle.c - misc/ldr.c - misc/lzexpand.c - misc/muldiv.c - misc/perfcnt.c - misc/power.c - misc/profile.c - misc/recovery.c - misc/res.c - misc/resntfy.c - misc/stubs.c - misc/sysinfo.c - misc/time.c - misc/timerqueue.c - misc/toolhelp.c - misc/utils.c - misc/version.c - process/job.c - process/proc.c - process/session.c - string/casemap.c - string/chartype.c - string/collation.c - string/fold.c - string/format_msg.c - string/lang.c - string/lcformat.c - string/lstring.c - string/nls.c - string/sortkey.c - synch/synch.c - vista/vista.c - thread/fiber.c - thread/thread.c + client/debugger.c + client/except.c + client/file/ackup.c + client/file/bintype.c + client/file/cnotify.c + client/file/copy.c + client/file/console.c + client/file/create.c + client/file/curdir.c + client/file/delete.c + client/file/deviceio.c + client/file/dir.c + client/file/dosdev.c + client/file/file.c + client/file/filemap.c + client/file/find.c + client/file/hardlink.c + client/file/iocompl.c + client/file/lfile.c + client/file/lock.c + client/file/mailslot.c + client/file/move.c + client/file/npipe.c + client/file/pipe.c + client/file/rw.c + client/file/tape.c + client/file/volume.c + client/heapmem.c + client/virtmem.c + client/misc/actctx.c + client/misc/atom.c + client/misc/comm.c + client/misc/computername.c + client/misc/dllmain.c + client/misc/env.c + client/misc/handle.c + client/misc/ldr.c + client/misc/lzexpand.c + client/misc/muldiv.c + client/misc/perfcnt.c + client/misc/power.c + client/misc/profile.c + client/misc/recovery.c + client/misc/res.c + client/misc/resntfy.c + client/misc/stubs.c + client/misc/sysinfo.c + client/misc/time.c + client/misc/timerqueue.c + client/misc/toolhelp.c + client/misc/utils.c + client/misc/version.c + client/job.c + client/proc.c + client/session.c + winnls/string/casemap.c + winnls/string/chartype.c + winnls/string/collation.c + winnls/string/fold.c + winnls/string/format_msg.c + winnls/string/lang.c + winnls/string/lcformat.c + winnls/string/lstring.c + winnls/string/nls.c + winnls/string/sortkey.c + client/synch.c + client/vista.c + client/fiber.c + client/thread.c kernel32.rc ${CMAKE_CURRENT_BINARY_DIR}/kernel32.def) if(ARCH MATCHES i386) list(APPEND SOURCE - thread/i386/fiber.S - thread/i386/thread.S) + client/i386/fiber.S + client/i386/thread.S) elseif(ARCH MATCHES amd64) list(APPEND SOURCE - thread/amd64/fiber.S - thread/amd64/thread.S) + client/amd64/fiber.S + client/amd64/thread.S) endif(ARCH MATCHES i386) add_library(kernel32 SHARED ${SOURCE}) diff --git a/reactos/dll/win32/kernel32/thread/amd64/fiber.S b/reactos/dll/win32/kernel32/client/amd64/fiber.S similarity index 100% rename from reactos/dll/win32/kernel32/thread/amd64/fiber.S rename to reactos/dll/win32/kernel32/client/amd64/fiber.S diff --git a/reactos/dll/win32/kernel32/thread/amd64/thread.S b/reactos/dll/win32/kernel32/client/amd64/thread.S similarity index 100% rename from reactos/dll/win32/kernel32/thread/amd64/thread.S rename to reactos/dll/win32/kernel32/client/amd64/thread.S diff --git a/reactos/dll/win32/kernel32/debug/debugger.c b/reactos/dll/win32/kernel32/client/debugger.c similarity index 100% rename from reactos/dll/win32/kernel32/debug/debugger.c rename to reactos/dll/win32/kernel32/client/debugger.c diff --git a/reactos/dll/win32/kernel32/except/except.c b/reactos/dll/win32/kernel32/client/except.c similarity index 100% rename from reactos/dll/win32/kernel32/except/except.c rename to reactos/dll/win32/kernel32/client/except.c diff --git a/reactos/dll/win32/kernel32/thread/fiber.c b/reactos/dll/win32/kernel32/client/fiber.c similarity index 100% rename from reactos/dll/win32/kernel32/thread/fiber.c rename to reactos/dll/win32/kernel32/client/fiber.c diff --git a/reactos/dll/win32/kernel32/file/backup.c b/reactos/dll/win32/kernel32/client/file/backup.c similarity index 100% rename from reactos/dll/win32/kernel32/file/backup.c rename to reactos/dll/win32/kernel32/client/file/backup.c diff --git a/reactos/dll/win32/kernel32/file/bintype.c b/reactos/dll/win32/kernel32/client/file/bintype.c similarity index 100% rename from reactos/dll/win32/kernel32/file/bintype.c rename to reactos/dll/win32/kernel32/client/file/bintype.c diff --git a/reactos/dll/win32/kernel32/file/cnotify.c b/reactos/dll/win32/kernel32/client/file/cnotify.c similarity index 100% rename from reactos/dll/win32/kernel32/file/cnotify.c rename to reactos/dll/win32/kernel32/client/file/cnotify.c diff --git a/reactos/dll/win32/kernel32/file/console.c b/reactos/dll/win32/kernel32/client/file/console.c similarity index 100% rename from reactos/dll/win32/kernel32/file/console.c rename to reactos/dll/win32/kernel32/client/file/console.c diff --git a/reactos/dll/win32/kernel32/file/copy.c b/reactos/dll/win32/kernel32/client/file/copy.c similarity index 100% rename from reactos/dll/win32/kernel32/file/copy.c rename to reactos/dll/win32/kernel32/client/file/copy.c diff --git a/reactos/dll/win32/kernel32/file/create.c b/reactos/dll/win32/kernel32/client/file/create.c similarity index 100% rename from reactos/dll/win32/kernel32/file/create.c rename to reactos/dll/win32/kernel32/client/file/create.c diff --git a/reactos/dll/win32/kernel32/file/curdir.c b/reactos/dll/win32/kernel32/client/file/curdir.c similarity index 100% rename from reactos/dll/win32/kernel32/file/curdir.c rename to reactos/dll/win32/kernel32/client/file/curdir.c diff --git a/reactos/dll/win32/kernel32/file/delete.c b/reactos/dll/win32/kernel32/client/file/delete.c similarity index 100% rename from reactos/dll/win32/kernel32/file/delete.c rename to reactos/dll/win32/kernel32/client/file/delete.c diff --git a/reactos/dll/win32/kernel32/file/deviceio.c b/reactos/dll/win32/kernel32/client/file/deviceio.c similarity index 100% rename from reactos/dll/win32/kernel32/file/deviceio.c rename to reactos/dll/win32/kernel32/client/file/deviceio.c diff --git a/reactos/dll/win32/kernel32/file/dir.c b/reactos/dll/win32/kernel32/client/file/dir.c similarity index 100% rename from reactos/dll/win32/kernel32/file/dir.c rename to reactos/dll/win32/kernel32/client/file/dir.c diff --git a/reactos/dll/win32/kernel32/file/dosdev.c b/reactos/dll/win32/kernel32/client/file/dosdev.c similarity index 100% rename from reactos/dll/win32/kernel32/file/dosdev.c rename to reactos/dll/win32/kernel32/client/file/dosdev.c diff --git a/reactos/dll/win32/kernel32/file/file.c b/reactos/dll/win32/kernel32/client/file/file.c similarity index 100% rename from reactos/dll/win32/kernel32/file/file.c rename to reactos/dll/win32/kernel32/client/file/file.c diff --git a/reactos/dll/win32/kernel32/file/filemap.c b/reactos/dll/win32/kernel32/client/file/filemap.c similarity index 100% rename from reactos/dll/win32/kernel32/file/filemap.c rename to reactos/dll/win32/kernel32/client/file/filemap.c diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/client/file/find.c similarity index 100% rename from reactos/dll/win32/kernel32/file/find.c rename to reactos/dll/win32/kernel32/client/file/find.c diff --git a/reactos/dll/win32/kernel32/file/hardlink.c b/reactos/dll/win32/kernel32/client/file/hardlink.c similarity index 100% rename from reactos/dll/win32/kernel32/file/hardlink.c rename to reactos/dll/win32/kernel32/client/file/hardlink.c diff --git a/reactos/dll/win32/kernel32/file/iocompl.c b/reactos/dll/win32/kernel32/client/file/iocompl.c similarity index 100% rename from reactos/dll/win32/kernel32/file/iocompl.c rename to reactos/dll/win32/kernel32/client/file/iocompl.c diff --git a/reactos/dll/win32/kernel32/file/lfile.c b/reactos/dll/win32/kernel32/client/file/lfile.c similarity index 100% rename from reactos/dll/win32/kernel32/file/lfile.c rename to reactos/dll/win32/kernel32/client/file/lfile.c diff --git a/reactos/dll/win32/kernel32/file/lock.c b/reactos/dll/win32/kernel32/client/file/lock.c similarity index 100% rename from reactos/dll/win32/kernel32/file/lock.c rename to reactos/dll/win32/kernel32/client/file/lock.c diff --git a/reactos/dll/win32/kernel32/file/mailslot.c b/reactos/dll/win32/kernel32/client/file/mailslot.c similarity index 100% rename from reactos/dll/win32/kernel32/file/mailslot.c rename to reactos/dll/win32/kernel32/client/file/mailslot.c diff --git a/reactos/dll/win32/kernel32/file/move.c b/reactos/dll/win32/kernel32/client/file/move.c similarity index 100% rename from reactos/dll/win32/kernel32/file/move.c rename to reactos/dll/win32/kernel32/client/file/move.c diff --git a/reactos/dll/win32/kernel32/file/npipe.c b/reactos/dll/win32/kernel32/client/file/npipe.c similarity index 100% rename from reactos/dll/win32/kernel32/file/npipe.c rename to reactos/dll/win32/kernel32/client/file/npipe.c diff --git a/reactos/dll/win32/kernel32/file/pipe.c b/reactos/dll/win32/kernel32/client/file/pipe.c similarity index 100% rename from reactos/dll/win32/kernel32/file/pipe.c rename to reactos/dll/win32/kernel32/client/file/pipe.c diff --git a/reactos/dll/win32/kernel32/file/rw.c b/reactos/dll/win32/kernel32/client/file/rw.c similarity index 100% rename from reactos/dll/win32/kernel32/file/rw.c rename to reactos/dll/win32/kernel32/client/file/rw.c diff --git a/reactos/dll/win32/kernel32/file/tape.c b/reactos/dll/win32/kernel32/client/file/tape.c similarity index 100% rename from reactos/dll/win32/kernel32/file/tape.c rename to reactos/dll/win32/kernel32/client/file/tape.c diff --git a/reactos/dll/win32/kernel32/file/volume.c b/reactos/dll/win32/kernel32/client/file/volume.c similarity index 100% rename from reactos/dll/win32/kernel32/file/volume.c rename to reactos/dll/win32/kernel32/client/file/volume.c diff --git a/reactos/dll/win32/kernel32/mem/heap.c b/reactos/dll/win32/kernel32/client/heapmem.c similarity index 100% rename from reactos/dll/win32/kernel32/mem/heap.c rename to reactos/dll/win32/kernel32/client/heapmem.c diff --git a/reactos/dll/win32/kernel32/thread/i386/fiber.S b/reactos/dll/win32/kernel32/client/i386/fiber.S similarity index 100% rename from reactos/dll/win32/kernel32/thread/i386/fiber.S rename to reactos/dll/win32/kernel32/client/i386/fiber.S diff --git a/reactos/dll/win32/kernel32/thread/i386/thread.S b/reactos/dll/win32/kernel32/client/i386/thread.S similarity index 100% rename from reactos/dll/win32/kernel32/thread/i386/thread.S rename to reactos/dll/win32/kernel32/client/i386/thread.S diff --git a/reactos/dll/win32/kernel32/process/job.c b/reactos/dll/win32/kernel32/client/job.c similarity index 100% rename from reactos/dll/win32/kernel32/process/job.c rename to reactos/dll/win32/kernel32/client/job.c diff --git a/reactos/dll/win32/kernel32/misc/actctx.c b/reactos/dll/win32/kernel32/client/misc/actctx.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/actctx.c rename to reactos/dll/win32/kernel32/client/misc/actctx.c diff --git a/reactos/dll/win32/kernel32/misc/atom.c b/reactos/dll/win32/kernel32/client/misc/atom.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/atom.c rename to reactos/dll/win32/kernel32/client/misc/atom.c diff --git a/reactos/dll/win32/kernel32/misc/comm.c b/reactos/dll/win32/kernel32/client/misc/comm.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/comm.c rename to reactos/dll/win32/kernel32/client/misc/comm.c diff --git a/reactos/dll/win32/kernel32/misc/computername.c b/reactos/dll/win32/kernel32/client/misc/computername.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/computername.c rename to reactos/dll/win32/kernel32/client/misc/computername.c diff --git a/reactos/dll/win32/kernel32/misc/dllmain.c b/reactos/dll/win32/kernel32/client/misc/dllmain.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/dllmain.c rename to reactos/dll/win32/kernel32/client/misc/dllmain.c diff --git a/reactos/dll/win32/kernel32/misc/env.c b/reactos/dll/win32/kernel32/client/misc/env.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/env.c rename to reactos/dll/win32/kernel32/client/misc/env.c diff --git a/reactos/dll/win32/kernel32/misc/handle.c b/reactos/dll/win32/kernel32/client/misc/handle.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/handle.c rename to reactos/dll/win32/kernel32/client/misc/handle.c diff --git a/reactos/dll/win32/kernel32/misc/ldr.c b/reactos/dll/win32/kernel32/client/misc/ldr.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/ldr.c rename to reactos/dll/win32/kernel32/client/misc/ldr.c diff --git a/reactos/dll/win32/kernel32/misc/lzexpand.c b/reactos/dll/win32/kernel32/client/misc/lzexpand.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/lzexpand.c rename to reactos/dll/win32/kernel32/client/misc/lzexpand.c diff --git a/reactos/dll/win32/kernel32/misc/muldiv.c b/reactos/dll/win32/kernel32/client/misc/muldiv.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/muldiv.c rename to reactos/dll/win32/kernel32/client/misc/muldiv.c diff --git a/reactos/dll/win32/kernel32/misc/perfcnt.c b/reactos/dll/win32/kernel32/client/misc/perfcnt.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/perfcnt.c rename to reactos/dll/win32/kernel32/client/misc/perfcnt.c diff --git a/reactos/dll/win32/kernel32/misc/power.c b/reactos/dll/win32/kernel32/client/misc/power.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/power.c rename to reactos/dll/win32/kernel32/client/misc/power.c diff --git a/reactos/dll/win32/kernel32/misc/profile.c b/reactos/dll/win32/kernel32/client/misc/profile.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/profile.c rename to reactos/dll/win32/kernel32/client/misc/profile.c diff --git a/reactos/dll/win32/kernel32/misc/res.c b/reactos/dll/win32/kernel32/client/misc/res.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/res.c rename to reactos/dll/win32/kernel32/client/misc/res.c diff --git a/reactos/dll/win32/kernel32/misc/resntfy.c b/reactos/dll/win32/kernel32/client/misc/resntfy.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/resntfy.c rename to reactos/dll/win32/kernel32/client/misc/resntfy.c diff --git a/reactos/dll/win32/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/client/misc/stubs.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/stubs.c rename to reactos/dll/win32/kernel32/client/misc/stubs.c diff --git a/reactos/dll/win32/kernel32/misc/sysinfo.c b/reactos/dll/win32/kernel32/client/misc/sysinfo.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/sysinfo.c rename to reactos/dll/win32/kernel32/client/misc/sysinfo.c diff --git a/reactos/dll/win32/kernel32/misc/time.c b/reactos/dll/win32/kernel32/client/misc/time.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/time.c rename to reactos/dll/win32/kernel32/client/misc/time.c diff --git a/reactos/dll/win32/kernel32/misc/timerqueue.c b/reactos/dll/win32/kernel32/client/misc/timerqueue.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/timerqueue.c rename to reactos/dll/win32/kernel32/client/misc/timerqueue.c diff --git a/reactos/dll/win32/kernel32/misc/toolhelp.c b/reactos/dll/win32/kernel32/client/misc/toolhelp.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/toolhelp.c rename to reactos/dll/win32/kernel32/client/misc/toolhelp.c diff --git a/reactos/dll/win32/kernel32/misc/utils.c b/reactos/dll/win32/kernel32/client/misc/utils.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/utils.c rename to reactos/dll/win32/kernel32/client/misc/utils.c diff --git a/reactos/dll/win32/kernel32/misc/version.c b/reactos/dll/win32/kernel32/client/misc/version.c similarity index 100% rename from reactos/dll/win32/kernel32/misc/version.c rename to reactos/dll/win32/kernel32/client/misc/version.c diff --git a/reactos/dll/win32/kernel32/process/proc.c b/reactos/dll/win32/kernel32/client/proc.c similarity index 100% rename from reactos/dll/win32/kernel32/process/proc.c rename to reactos/dll/win32/kernel32/client/proc.c diff --git a/reactos/dll/win32/kernel32/process/session.c b/reactos/dll/win32/kernel32/client/session.c similarity index 100% rename from reactos/dll/win32/kernel32/process/session.c rename to reactos/dll/win32/kernel32/client/session.c diff --git a/reactos/dll/win32/kernel32/synch/synch.c b/reactos/dll/win32/kernel32/client/synch.c similarity index 100% rename from reactos/dll/win32/kernel32/synch/synch.c rename to reactos/dll/win32/kernel32/client/synch.c diff --git a/reactos/dll/win32/kernel32/thread/thread.c b/reactos/dll/win32/kernel32/client/thread.c similarity index 100% rename from reactos/dll/win32/kernel32/thread/thread.c rename to reactos/dll/win32/kernel32/client/thread.c diff --git a/reactos/dll/win32/kernel32/mem/virtual.c b/reactos/dll/win32/kernel32/client/virtmem.c similarity index 100% rename from reactos/dll/win32/kernel32/mem/virtual.c rename to reactos/dll/win32/kernel32/client/virtmem.c diff --git a/reactos/dll/win32/kernel32/vista/vista.c b/reactos/dll/win32/kernel32/client/vista.c similarity index 100% rename from reactos/dll/win32/kernel32/vista/vista.c rename to reactos/dll/win32/kernel32/client/vista.c diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild index 9117b4c1dc3..ce90965b72e 100644 --- a/reactos/dll/win32/kernel32/kernel32.rbuild +++ b/reactos/dll/win32/kernel32/kernel32.rbuild @@ -17,93 +17,7 @@ -fno-exceptions -fno-rtti - - debugger.c - - - except.c - - - backup.c - bintype.c - cnotify.c - copy.c - console.c - create.c - curdir.c - delete.c - deviceio.c - dir.c - dosdev.c - file.c - filemap.c - find.c - hardlink.c - iocompl.c - lfile.c - lock.c - mailslot.c - move.c - npipe.c - pipe.c - rw.c - tape.c - volume.c - - - heap.c - virtual.c - - - actctx.c - atom.c - comm.c - computername.c - dllmain.c - env.c - handle.c - ldr.c - lzexpand.c - muldiv.c - perfcnt.c - power.c - resntfy.c - res.c - stubs.c - sysinfo.c - time.c - timerqueue.c - toolhelp.c - version.c - profile.c - utils.c - - - job.c - proc.c - session.c - - - chartype.c - collation.c - casemap.c - fold.c - format_msg.c - lang.c - lstring.c - lcformat.c - nls.c - sortkey.c - - - vista.c - - - synch.c - - - fiber.c - thread.c + fiber.S @@ -116,6 +30,82 @@ thread.S + debugger.c + except.c + vista.c + synch.c + fiber.c + thread.c + heapmem.c + virtmem.c + job.c + proc.c + session.c + + backup.c + bintype.c + cnotify.c + copy.c + console.c + create.c + curdir.c + delete.c + deviceio.c + dir.c + dosdev.c + file.c + filemap.c + find.c + hardlink.c + iocompl.c + lfile.c + lock.c + mailslot.c + move.c + npipe.c + pipe.c + rw.c + tape.c + volume.c + + + actctx.c + atom.c + comm.c + computername.c + dllmain.c + env.c + handle.c + ldr.c + lzexpand.c + muldiv.c + perfcnt.c + power.c + resntfy.c + res.c + stubs.c + sysinfo.c + time.c + timerqueue.c + toolhelp.c + version.c + profile.c + utils.c + + + + + chartype.c + collation.c + casemap.c + fold.c + format_msg.c + lang.c + lstring.c + lcformat.c + nls.c + sortkey.c + kernel32.rc diff --git a/reactos/dll/win32/kernel32/kernel32.rc b/reactos/dll/win32/kernel32/kernel32.rc index 319acb78e8f..b8aae5cd9f2 100644 --- a/reactos/dll/win32/kernel32/kernel32.rc +++ b/reactos/dll/win32/kernel32/kernel32.rc @@ -7,13 +7,13 @@ #include "windows.h" #include "errcodes.rc" -#include "locale_rc.rc" +#include "winnls/locale_rc.rc" -#include "lang/en-US.rc" -#include "lang/de-DE.rc" -#include "lang/es-ES.rc" +#include "winnls/lang/en-US.rc" +#include "winnls/lang/de-DE.rc" +#include "winnls/lang/es-ES.rc" // UTF-8 #pragma code_page(65001) -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc" +#include "winnls/lang/ru-RU.rc" +#include "winnls/lang/uk-UA.rc" diff --git a/reactos/dll/win32/kernel32/lang/bg-BG.mc b/reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc similarity index 100% rename from reactos/dll/win32/kernel32/lang/bg-BG.mc rename to reactos/dll/win32/kernel32/winnls/lang/bg-BG.mc diff --git a/reactos/dll/win32/kernel32/lang/de-DE.mc b/reactos/dll/win32/kernel32/winnls/lang/de-DE.mc similarity index 100% rename from reactos/dll/win32/kernel32/lang/de-DE.mc rename to reactos/dll/win32/kernel32/winnls/lang/de-DE.mc diff --git a/reactos/dll/win32/kernel32/lang/de-DE.rc b/reactos/dll/win32/kernel32/winnls/lang/de-DE.rc similarity index 100% rename from reactos/dll/win32/kernel32/lang/de-DE.rc rename to reactos/dll/win32/kernel32/winnls/lang/de-DE.rc diff --git a/reactos/dll/win32/kernel32/lang/en-US.rc b/reactos/dll/win32/kernel32/winnls/lang/en-US.rc similarity index 100% rename from reactos/dll/win32/kernel32/lang/en-US.rc rename to reactos/dll/win32/kernel32/winnls/lang/en-US.rc diff --git a/reactos/dll/win32/kernel32/lang/es-ES.rc b/reactos/dll/win32/kernel32/winnls/lang/es-ES.rc similarity index 100% rename from reactos/dll/win32/kernel32/lang/es-ES.rc rename to reactos/dll/win32/kernel32/winnls/lang/es-ES.rc diff --git a/reactos/dll/win32/kernel32/lang/pl-PL.mc b/reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc similarity index 100% rename from reactos/dll/win32/kernel32/lang/pl-PL.mc rename to reactos/dll/win32/kernel32/winnls/lang/pl-PL.mc diff --git a/reactos/dll/win32/kernel32/lang/ru-RU.mc b/reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc similarity index 100% rename from reactos/dll/win32/kernel32/lang/ru-RU.mc rename to reactos/dll/win32/kernel32/winnls/lang/ru-RU.mc diff --git a/reactos/dll/win32/kernel32/lang/ru-RU.rc b/reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc similarity index 100% rename from reactos/dll/win32/kernel32/lang/ru-RU.rc rename to reactos/dll/win32/kernel32/winnls/lang/ru-RU.rc diff --git a/reactos/dll/win32/kernel32/lang/uk-UA.rc b/reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc similarity index 100% rename from reactos/dll/win32/kernel32/lang/uk-UA.rc rename to reactos/dll/win32/kernel32/winnls/lang/uk-UA.rc diff --git a/reactos/dll/win32/kernel32/locale_rc.rc b/reactos/dll/win32/kernel32/winnls/locale_rc.rc similarity index 100% rename from reactos/dll/win32/kernel32/locale_rc.rc rename to reactos/dll/win32/kernel32/winnls/locale_rc.rc diff --git a/reactos/dll/win32/kernel32/nls/afk.nls b/reactos/dll/win32/kernel32/winnls/nls/afk.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/afk.nls rename to reactos/dll/win32/kernel32/winnls/nls/afk.nls diff --git a/reactos/dll/win32/kernel32/nls/ara.nls b/reactos/dll/win32/kernel32/winnls/nls/ara.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ara.nls rename to reactos/dll/win32/kernel32/winnls/nls/ara.nls diff --git a/reactos/dll/win32/kernel32/nls/arb.nls b/reactos/dll/win32/kernel32/winnls/nls/arb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arb.nls rename to reactos/dll/win32/kernel32/winnls/nls/arb.nls diff --git a/reactos/dll/win32/kernel32/nls/are.nls b/reactos/dll/win32/kernel32/winnls/nls/are.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/are.nls rename to reactos/dll/win32/kernel32/winnls/nls/are.nls diff --git a/reactos/dll/win32/kernel32/nls/arg.nls b/reactos/dll/win32/kernel32/winnls/nls/arg.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arg.nls rename to reactos/dll/win32/kernel32/winnls/nls/arg.nls diff --git a/reactos/dll/win32/kernel32/nls/arh.nls b/reactos/dll/win32/kernel32/winnls/nls/arh.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arh.nls rename to reactos/dll/win32/kernel32/winnls/nls/arh.nls diff --git a/reactos/dll/win32/kernel32/nls/ari.nls b/reactos/dll/win32/kernel32/winnls/nls/ari.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ari.nls rename to reactos/dll/win32/kernel32/winnls/nls/ari.nls diff --git a/reactos/dll/win32/kernel32/nls/arj.nls b/reactos/dll/win32/kernel32/winnls/nls/arj.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arj.nls rename to reactos/dll/win32/kernel32/winnls/nls/arj.nls diff --git a/reactos/dll/win32/kernel32/nls/ark.nls b/reactos/dll/win32/kernel32/winnls/nls/ark.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ark.nls rename to reactos/dll/win32/kernel32/winnls/nls/ark.nls diff --git a/reactos/dll/win32/kernel32/nls/arl.nls b/reactos/dll/win32/kernel32/winnls/nls/arl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arl.nls rename to reactos/dll/win32/kernel32/winnls/nls/arl.nls diff --git a/reactos/dll/win32/kernel32/nls/arm.nls b/reactos/dll/win32/kernel32/winnls/nls/arm.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arm.nls rename to reactos/dll/win32/kernel32/winnls/nls/arm.nls diff --git a/reactos/dll/win32/kernel32/nls/aro.nls b/reactos/dll/win32/kernel32/winnls/nls/aro.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/aro.nls rename to reactos/dll/win32/kernel32/winnls/nls/aro.nls diff --git a/reactos/dll/win32/kernel32/nls/arq.nls b/reactos/dll/win32/kernel32/winnls/nls/arq.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/arq.nls rename to reactos/dll/win32/kernel32/winnls/nls/arq.nls diff --git a/reactos/dll/win32/kernel32/nls/ars.nls b/reactos/dll/win32/kernel32/winnls/nls/ars.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ars.nls rename to reactos/dll/win32/kernel32/winnls/nls/ars.nls diff --git a/reactos/dll/win32/kernel32/nls/art.nls b/reactos/dll/win32/kernel32/winnls/nls/art.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/art.nls rename to reactos/dll/win32/kernel32/winnls/nls/art.nls diff --git a/reactos/dll/win32/kernel32/nls/aru.nls b/reactos/dll/win32/kernel32/winnls/nls/aru.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/aru.nls rename to reactos/dll/win32/kernel32/winnls/nls/aru.nls diff --git a/reactos/dll/win32/kernel32/nls/ary.nls b/reactos/dll/win32/kernel32/winnls/nls/ary.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ary.nls rename to reactos/dll/win32/kernel32/winnls/nls/ary.nls diff --git a/reactos/dll/win32/kernel32/nls/aze.nls b/reactos/dll/win32/kernel32/winnls/nls/aze.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/aze.nls rename to reactos/dll/win32/kernel32/winnls/nls/aze.nls diff --git a/reactos/dll/win32/kernel32/nls/azl.nls b/reactos/dll/win32/kernel32/winnls/nls/azl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/azl.nls rename to reactos/dll/win32/kernel32/winnls/nls/azl.nls diff --git a/reactos/dll/win32/kernel32/nls/bel.nls b/reactos/dll/win32/kernel32/winnls/nls/bel.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/bel.nls rename to reactos/dll/win32/kernel32/winnls/nls/bel.nls diff --git a/reactos/dll/win32/kernel32/nls/bgr.nls b/reactos/dll/win32/kernel32/winnls/nls/bgr.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/bgr.nls rename to reactos/dll/win32/kernel32/winnls/nls/bgr.nls diff --git a/reactos/dll/win32/kernel32/nls/brf.nls b/reactos/dll/win32/kernel32/winnls/nls/brf.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/brf.nls rename to reactos/dll/win32/kernel32/winnls/nls/brf.nls diff --git a/reactos/dll/win32/kernel32/nls/cat.nls b/reactos/dll/win32/kernel32/winnls/nls/cat.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/cat.nls rename to reactos/dll/win32/kernel32/winnls/nls/cat.nls diff --git a/reactos/dll/win32/kernel32/nls/chs.nls b/reactos/dll/win32/kernel32/winnls/nls/chs.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/chs.nls rename to reactos/dll/win32/kernel32/winnls/nls/chs.nls diff --git a/reactos/dll/win32/kernel32/nls/cht.nls b/reactos/dll/win32/kernel32/winnls/nls/cht.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/cht.nls rename to reactos/dll/win32/kernel32/winnls/nls/cht.nls diff --git a/reactos/dll/win32/kernel32/nls/csy.nls b/reactos/dll/win32/kernel32/winnls/nls/csy.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/csy.nls rename to reactos/dll/win32/kernel32/winnls/nls/csy.nls diff --git a/reactos/dll/win32/kernel32/nls/cym.nls b/reactos/dll/win32/kernel32/winnls/nls/cym.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/cym.nls rename to reactos/dll/win32/kernel32/winnls/nls/cym.nls diff --git a/reactos/dll/win32/kernel32/nls/dan.nls b/reactos/dll/win32/kernel32/winnls/nls/dan.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/dan.nls rename to reactos/dll/win32/kernel32/winnls/nls/dan.nls diff --git a/reactos/dll/win32/kernel32/nls/dea.nls b/reactos/dll/win32/kernel32/winnls/nls/dea.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/dea.nls rename to reactos/dll/win32/kernel32/winnls/nls/dea.nls diff --git a/reactos/dll/win32/kernel32/nls/dec.nls b/reactos/dll/win32/kernel32/winnls/nls/dec.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/dec.nls rename to reactos/dll/win32/kernel32/winnls/nls/dec.nls diff --git a/reactos/dll/win32/kernel32/nls/del.nls b/reactos/dll/win32/kernel32/winnls/nls/del.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/del.nls rename to reactos/dll/win32/kernel32/winnls/nls/del.nls diff --git a/reactos/dll/win32/kernel32/nls/des.nls b/reactos/dll/win32/kernel32/winnls/nls/des.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/des.nls rename to reactos/dll/win32/kernel32/winnls/nls/des.nls diff --git a/reactos/dll/win32/kernel32/nls/deu.nls b/reactos/dll/win32/kernel32/winnls/nls/deu.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/deu.nls rename to reactos/dll/win32/kernel32/winnls/nls/deu.nls diff --git a/reactos/dll/win32/kernel32/nls/div.nls b/reactos/dll/win32/kernel32/winnls/nls/div.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/div.nls rename to reactos/dll/win32/kernel32/winnls/nls/div.nls diff --git a/reactos/dll/win32/kernel32/nls/ell.nls b/reactos/dll/win32/kernel32/winnls/nls/ell.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ell.nls rename to reactos/dll/win32/kernel32/winnls/nls/ell.nls diff --git a/reactos/dll/win32/kernel32/nls/ena.nls b/reactos/dll/win32/kernel32/winnls/nls/ena.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ena.nls rename to reactos/dll/win32/kernel32/winnls/nls/ena.nls diff --git a/reactos/dll/win32/kernel32/nls/enb.nls b/reactos/dll/win32/kernel32/winnls/nls/enb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enb.nls rename to reactos/dll/win32/kernel32/winnls/nls/enb.nls diff --git a/reactos/dll/win32/kernel32/nls/enc.nls b/reactos/dll/win32/kernel32/winnls/nls/enc.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enc.nls rename to reactos/dll/win32/kernel32/winnls/nls/enc.nls diff --git a/reactos/dll/win32/kernel32/nls/eng.nls b/reactos/dll/win32/kernel32/winnls/nls/eng.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/eng.nls rename to reactos/dll/win32/kernel32/winnls/nls/eng.nls diff --git a/reactos/dll/win32/kernel32/nls/eni.nls b/reactos/dll/win32/kernel32/winnls/nls/eni.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/eni.nls rename to reactos/dll/win32/kernel32/winnls/nls/eni.nls diff --git a/reactos/dll/win32/kernel32/nls/enj.nls b/reactos/dll/win32/kernel32/winnls/nls/enj.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enj.nls rename to reactos/dll/win32/kernel32/winnls/nls/enj.nls diff --git a/reactos/dll/win32/kernel32/nls/enl.nls b/reactos/dll/win32/kernel32/winnls/nls/enl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enl.nls rename to reactos/dll/win32/kernel32/winnls/nls/enl.nls diff --git a/reactos/dll/win32/kernel32/nls/enp.nls b/reactos/dll/win32/kernel32/winnls/nls/enp.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enp.nls rename to reactos/dll/win32/kernel32/winnls/nls/enp.nls diff --git a/reactos/dll/win32/kernel32/nls/ens.nls b/reactos/dll/win32/kernel32/winnls/nls/ens.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ens.nls rename to reactos/dll/win32/kernel32/winnls/nls/ens.nls diff --git a/reactos/dll/win32/kernel32/nls/ent.nls b/reactos/dll/win32/kernel32/winnls/nls/ent.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ent.nls rename to reactos/dll/win32/kernel32/winnls/nls/ent.nls diff --git a/reactos/dll/win32/kernel32/nls/enu.nls b/reactos/dll/win32/kernel32/winnls/nls/enu.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enu.nls rename to reactos/dll/win32/kernel32/winnls/nls/enu.nls diff --git a/reactos/dll/win32/kernel32/nls/enw.nls b/reactos/dll/win32/kernel32/winnls/nls/enw.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enw.nls rename to reactos/dll/win32/kernel32/winnls/nls/enw.nls diff --git a/reactos/dll/win32/kernel32/nls/enz.nls b/reactos/dll/win32/kernel32/winnls/nls/enz.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/enz.nls rename to reactos/dll/win32/kernel32/winnls/nls/enz.nls diff --git a/reactos/dll/win32/kernel32/nls/esa.nls b/reactos/dll/win32/kernel32/winnls/nls/esa.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esa.nls rename to reactos/dll/win32/kernel32/winnls/nls/esa.nls diff --git a/reactos/dll/win32/kernel32/nls/esb.nls b/reactos/dll/win32/kernel32/winnls/nls/esb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esb.nls rename to reactos/dll/win32/kernel32/winnls/nls/esb.nls diff --git a/reactos/dll/win32/kernel32/nls/esc.nls b/reactos/dll/win32/kernel32/winnls/nls/esc.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esc.nls rename to reactos/dll/win32/kernel32/winnls/nls/esc.nls diff --git a/reactos/dll/win32/kernel32/nls/esd.nls b/reactos/dll/win32/kernel32/winnls/nls/esd.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esd.nls rename to reactos/dll/win32/kernel32/winnls/nls/esd.nls diff --git a/reactos/dll/win32/kernel32/nls/ese.nls b/reactos/dll/win32/kernel32/winnls/nls/ese.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ese.nls rename to reactos/dll/win32/kernel32/winnls/nls/ese.nls diff --git a/reactos/dll/win32/kernel32/nls/esf.nls b/reactos/dll/win32/kernel32/winnls/nls/esf.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esf.nls rename to reactos/dll/win32/kernel32/winnls/nls/esf.nls diff --git a/reactos/dll/win32/kernel32/nls/esg.nls b/reactos/dll/win32/kernel32/winnls/nls/esg.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esg.nls rename to reactos/dll/win32/kernel32/winnls/nls/esg.nls diff --git a/reactos/dll/win32/kernel32/nls/esh.nls b/reactos/dll/win32/kernel32/winnls/nls/esh.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esh.nls rename to reactos/dll/win32/kernel32/winnls/nls/esh.nls diff --git a/reactos/dll/win32/kernel32/nls/esi.nls b/reactos/dll/win32/kernel32/winnls/nls/esi.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esi.nls rename to reactos/dll/win32/kernel32/winnls/nls/esi.nls diff --git a/reactos/dll/win32/kernel32/nls/esl.nls b/reactos/dll/win32/kernel32/winnls/nls/esl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esl.nls rename to reactos/dll/win32/kernel32/winnls/nls/esl.nls diff --git a/reactos/dll/win32/kernel32/nls/esm.nls b/reactos/dll/win32/kernel32/winnls/nls/esm.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esm.nls rename to reactos/dll/win32/kernel32/winnls/nls/esm.nls diff --git a/reactos/dll/win32/kernel32/nls/esn.nls b/reactos/dll/win32/kernel32/winnls/nls/esn.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esn.nls rename to reactos/dll/win32/kernel32/winnls/nls/esn.nls diff --git a/reactos/dll/win32/kernel32/nls/eso.nls b/reactos/dll/win32/kernel32/winnls/nls/eso.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/eso.nls rename to reactos/dll/win32/kernel32/winnls/nls/eso.nls diff --git a/reactos/dll/win32/kernel32/nls/esp.nls b/reactos/dll/win32/kernel32/winnls/nls/esp.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esp.nls rename to reactos/dll/win32/kernel32/winnls/nls/esp.nls diff --git a/reactos/dll/win32/kernel32/nls/esr.nls b/reactos/dll/win32/kernel32/winnls/nls/esr.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esr.nls rename to reactos/dll/win32/kernel32/winnls/nls/esr.nls diff --git a/reactos/dll/win32/kernel32/nls/ess.nls b/reactos/dll/win32/kernel32/winnls/nls/ess.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ess.nls rename to reactos/dll/win32/kernel32/winnls/nls/ess.nls diff --git a/reactos/dll/win32/kernel32/nls/esu.nls b/reactos/dll/win32/kernel32/winnls/nls/esu.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esu.nls rename to reactos/dll/win32/kernel32/winnls/nls/esu.nls diff --git a/reactos/dll/win32/kernel32/nls/esv.nls b/reactos/dll/win32/kernel32/winnls/nls/esv.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esv.nls rename to reactos/dll/win32/kernel32/winnls/nls/esv.nls diff --git a/reactos/dll/win32/kernel32/nls/esy.nls b/reactos/dll/win32/kernel32/winnls/nls/esy.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esy.nls rename to reactos/dll/win32/kernel32/winnls/nls/esy.nls diff --git a/reactos/dll/win32/kernel32/nls/esz.nls b/reactos/dll/win32/kernel32/winnls/nls/esz.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/esz.nls rename to reactos/dll/win32/kernel32/winnls/nls/esz.nls diff --git a/reactos/dll/win32/kernel32/nls/eti.nls b/reactos/dll/win32/kernel32/winnls/nls/eti.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/eti.nls rename to reactos/dll/win32/kernel32/winnls/nls/eti.nls diff --git a/reactos/dll/win32/kernel32/nls/euq.nls b/reactos/dll/win32/kernel32/winnls/nls/euq.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/euq.nls rename to reactos/dll/win32/kernel32/winnls/nls/euq.nls diff --git a/reactos/dll/win32/kernel32/nls/far.nls b/reactos/dll/win32/kernel32/winnls/nls/far.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/far.nls rename to reactos/dll/win32/kernel32/winnls/nls/far.nls diff --git a/reactos/dll/win32/kernel32/nls/fin.nls b/reactos/dll/win32/kernel32/winnls/nls/fin.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/fin.nls rename to reactos/dll/win32/kernel32/winnls/nls/fin.nls diff --git a/reactos/dll/win32/kernel32/nls/fos.nls b/reactos/dll/win32/kernel32/winnls/nls/fos.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/fos.nls rename to reactos/dll/win32/kernel32/winnls/nls/fos.nls diff --git a/reactos/dll/win32/kernel32/nls/fra.nls b/reactos/dll/win32/kernel32/winnls/nls/fra.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/fra.nls rename to reactos/dll/win32/kernel32/winnls/nls/fra.nls diff --git a/reactos/dll/win32/kernel32/nls/frb.nls b/reactos/dll/win32/kernel32/winnls/nls/frb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/frb.nls rename to reactos/dll/win32/kernel32/winnls/nls/frb.nls diff --git a/reactos/dll/win32/kernel32/nls/frc.nls b/reactos/dll/win32/kernel32/winnls/nls/frc.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/frc.nls rename to reactos/dll/win32/kernel32/winnls/nls/frc.nls diff --git a/reactos/dll/win32/kernel32/nls/frl.nls b/reactos/dll/win32/kernel32/winnls/nls/frl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/frl.nls rename to reactos/dll/win32/kernel32/winnls/nls/frl.nls diff --git a/reactos/dll/win32/kernel32/nls/frm.nls b/reactos/dll/win32/kernel32/winnls/nls/frm.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/frm.nls rename to reactos/dll/win32/kernel32/winnls/nls/frm.nls diff --git a/reactos/dll/win32/kernel32/nls/frs.nls b/reactos/dll/win32/kernel32/winnls/nls/frs.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/frs.nls rename to reactos/dll/win32/kernel32/winnls/nls/frs.nls diff --git a/reactos/dll/win32/kernel32/nls/glc.nls b/reactos/dll/win32/kernel32/winnls/nls/glc.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/glc.nls rename to reactos/dll/win32/kernel32/winnls/nls/glc.nls diff --git a/reactos/dll/win32/kernel32/nls/guj.nls b/reactos/dll/win32/kernel32/winnls/nls/guj.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/guj.nls rename to reactos/dll/win32/kernel32/winnls/nls/guj.nls diff --git a/reactos/dll/win32/kernel32/nls/heb.nls b/reactos/dll/win32/kernel32/winnls/nls/heb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/heb.nls rename to reactos/dll/win32/kernel32/winnls/nls/heb.nls diff --git a/reactos/dll/win32/kernel32/nls/hin.nls b/reactos/dll/win32/kernel32/winnls/nls/hin.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/hin.nls rename to reactos/dll/win32/kernel32/winnls/nls/hin.nls diff --git a/reactos/dll/win32/kernel32/nls/hrv.nls b/reactos/dll/win32/kernel32/winnls/nls/hrv.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/hrv.nls rename to reactos/dll/win32/kernel32/winnls/nls/hrv.nls diff --git a/reactos/dll/win32/kernel32/nls/hun.nls b/reactos/dll/win32/kernel32/winnls/nls/hun.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/hun.nls rename to reactos/dll/win32/kernel32/winnls/nls/hun.nls diff --git a/reactos/dll/win32/kernel32/nls/hye.nls b/reactos/dll/win32/kernel32/winnls/nls/hye.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/hye.nls rename to reactos/dll/win32/kernel32/winnls/nls/hye.nls diff --git a/reactos/dll/win32/kernel32/nls/ind.nls b/reactos/dll/win32/kernel32/winnls/nls/ind.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ind.nls rename to reactos/dll/win32/kernel32/winnls/nls/ind.nls diff --git a/reactos/dll/win32/kernel32/nls/isl.nls b/reactos/dll/win32/kernel32/winnls/nls/isl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/isl.nls rename to reactos/dll/win32/kernel32/winnls/nls/isl.nls diff --git a/reactos/dll/win32/kernel32/nls/ita.nls b/reactos/dll/win32/kernel32/winnls/nls/ita.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ita.nls rename to reactos/dll/win32/kernel32/winnls/nls/ita.nls diff --git a/reactos/dll/win32/kernel32/nls/its.nls b/reactos/dll/win32/kernel32/winnls/nls/its.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/its.nls rename to reactos/dll/win32/kernel32/winnls/nls/its.nls diff --git a/reactos/dll/win32/kernel32/nls/jpn.nls b/reactos/dll/win32/kernel32/winnls/nls/jpn.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/jpn.nls rename to reactos/dll/win32/kernel32/winnls/nls/jpn.nls diff --git a/reactos/dll/win32/kernel32/nls/kan.nls b/reactos/dll/win32/kernel32/winnls/nls/kan.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/kan.nls rename to reactos/dll/win32/kernel32/winnls/nls/kan.nls diff --git a/reactos/dll/win32/kernel32/nls/kat.nls b/reactos/dll/win32/kernel32/winnls/nls/kat.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/kat.nls rename to reactos/dll/win32/kernel32/winnls/nls/kat.nls diff --git a/reactos/dll/win32/kernel32/nls/kkz.nls b/reactos/dll/win32/kernel32/winnls/nls/kkz.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/kkz.nls rename to reactos/dll/win32/kernel32/winnls/nls/kkz.nls diff --git a/reactos/dll/win32/kernel32/nls/knk.nls b/reactos/dll/win32/kernel32/winnls/nls/knk.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/knk.nls rename to reactos/dll/win32/kernel32/winnls/nls/knk.nls diff --git a/reactos/dll/win32/kernel32/nls/kor.nls b/reactos/dll/win32/kernel32/winnls/nls/kor.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/kor.nls rename to reactos/dll/win32/kernel32/winnls/nls/kor.nls diff --git a/reactos/dll/win32/kernel32/nls/kyr.nls b/reactos/dll/win32/kernel32/winnls/nls/kyr.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/kyr.nls rename to reactos/dll/win32/kernel32/winnls/nls/kyr.nls diff --git a/reactos/dll/win32/kernel32/nls/lth.nls b/reactos/dll/win32/kernel32/winnls/nls/lth.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/lth.nls rename to reactos/dll/win32/kernel32/winnls/nls/lth.nls diff --git a/reactos/dll/win32/kernel32/nls/lvi.nls b/reactos/dll/win32/kernel32/winnls/nls/lvi.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/lvi.nls rename to reactos/dll/win32/kernel32/winnls/nls/lvi.nls diff --git a/reactos/dll/win32/kernel32/nls/mar.nls b/reactos/dll/win32/kernel32/winnls/nls/mar.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/mar.nls rename to reactos/dll/win32/kernel32/winnls/nls/mar.nls diff --git a/reactos/dll/win32/kernel32/nls/mki.nls b/reactos/dll/win32/kernel32/winnls/nls/mki.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/mki.nls rename to reactos/dll/win32/kernel32/winnls/nls/mki.nls diff --git a/reactos/dll/win32/kernel32/nls/mon.nls b/reactos/dll/win32/kernel32/winnls/nls/mon.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/mon.nls rename to reactos/dll/win32/kernel32/winnls/nls/mon.nls diff --git a/reactos/dll/win32/kernel32/nls/msb.nls b/reactos/dll/win32/kernel32/winnls/nls/msb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/msb.nls rename to reactos/dll/win32/kernel32/winnls/nls/msb.nls diff --git a/reactos/dll/win32/kernel32/nls/msl.nls b/reactos/dll/win32/kernel32/winnls/nls/msl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/msl.nls rename to reactos/dll/win32/kernel32/winnls/nls/msl.nls diff --git a/reactos/dll/win32/kernel32/nls/nlb.nls b/reactos/dll/win32/kernel32/winnls/nls/nlb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/nlb.nls rename to reactos/dll/win32/kernel32/winnls/nls/nlb.nls diff --git a/reactos/dll/win32/kernel32/nls/nld.nls b/reactos/dll/win32/kernel32/winnls/nls/nld.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/nld.nls rename to reactos/dll/win32/kernel32/winnls/nls/nld.nls diff --git a/reactos/dll/win32/kernel32/nls/non.nls b/reactos/dll/win32/kernel32/winnls/nls/non.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/non.nls rename to reactos/dll/win32/kernel32/winnls/nls/non.nls diff --git a/reactos/dll/win32/kernel32/nls/nor.nls b/reactos/dll/win32/kernel32/winnls/nls/nor.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/nor.nls rename to reactos/dll/win32/kernel32/winnls/nls/nor.nls diff --git a/reactos/dll/win32/kernel32/nls/pan.nls b/reactos/dll/win32/kernel32/winnls/nls/pan.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/pan.nls rename to reactos/dll/win32/kernel32/winnls/nls/pan.nls diff --git a/reactos/dll/win32/kernel32/nls/plk.nls b/reactos/dll/win32/kernel32/winnls/nls/plk.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/plk.nls rename to reactos/dll/win32/kernel32/winnls/nls/plk.nls diff --git a/reactos/dll/win32/kernel32/nls/ptb.nls b/reactos/dll/win32/kernel32/winnls/nls/ptb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ptb.nls rename to reactos/dll/win32/kernel32/winnls/nls/ptb.nls diff --git a/reactos/dll/win32/kernel32/nls/ptg.nls b/reactos/dll/win32/kernel32/winnls/nls/ptg.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ptg.nls rename to reactos/dll/win32/kernel32/winnls/nls/ptg.nls diff --git a/reactos/dll/win32/kernel32/nls/rmc.nls b/reactos/dll/win32/kernel32/winnls/nls/rmc.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/rmc.nls rename to reactos/dll/win32/kernel32/winnls/nls/rmc.nls diff --git a/reactos/dll/win32/kernel32/nls/rom.nls b/reactos/dll/win32/kernel32/winnls/nls/rom.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/rom.nls rename to reactos/dll/win32/kernel32/winnls/nls/rom.nls diff --git a/reactos/dll/win32/kernel32/nls/rus.nls b/reactos/dll/win32/kernel32/winnls/nls/rus.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/rus.nls rename to reactos/dll/win32/kernel32/winnls/nls/rus.nls diff --git a/reactos/dll/win32/kernel32/nls/san.nls b/reactos/dll/win32/kernel32/winnls/nls/san.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/san.nls rename to reactos/dll/win32/kernel32/winnls/nls/san.nls diff --git a/reactos/dll/win32/kernel32/nls/sky.nls b/reactos/dll/win32/kernel32/winnls/nls/sky.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/sky.nls rename to reactos/dll/win32/kernel32/winnls/nls/sky.nls diff --git a/reactos/dll/win32/kernel32/nls/slv.nls b/reactos/dll/win32/kernel32/winnls/nls/slv.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/slv.nls rename to reactos/dll/win32/kernel32/winnls/nls/slv.nls diff --git a/reactos/dll/win32/kernel32/nls/sqi.nls b/reactos/dll/win32/kernel32/winnls/nls/sqi.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/sqi.nls rename to reactos/dll/win32/kernel32/winnls/nls/sqi.nls diff --git a/reactos/dll/win32/kernel32/nls/srb.nls b/reactos/dll/win32/kernel32/winnls/nls/srb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/srb.nls rename to reactos/dll/win32/kernel32/winnls/nls/srb.nls diff --git a/reactos/dll/win32/kernel32/nls/srl.nls b/reactos/dll/win32/kernel32/winnls/nls/srl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/srl.nls rename to reactos/dll/win32/kernel32/winnls/nls/srl.nls diff --git a/reactos/dll/win32/kernel32/nls/sve.nls b/reactos/dll/win32/kernel32/winnls/nls/sve.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/sve.nls rename to reactos/dll/win32/kernel32/winnls/nls/sve.nls diff --git a/reactos/dll/win32/kernel32/nls/svf.nls b/reactos/dll/win32/kernel32/winnls/nls/svf.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/svf.nls rename to reactos/dll/win32/kernel32/winnls/nls/svf.nls diff --git a/reactos/dll/win32/kernel32/nls/swk.nls b/reactos/dll/win32/kernel32/winnls/nls/swk.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/swk.nls rename to reactos/dll/win32/kernel32/winnls/nls/swk.nls diff --git a/reactos/dll/win32/kernel32/nls/syr.nls b/reactos/dll/win32/kernel32/winnls/nls/syr.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/syr.nls rename to reactos/dll/win32/kernel32/winnls/nls/syr.nls diff --git a/reactos/dll/win32/kernel32/nls/tam.nls b/reactos/dll/win32/kernel32/winnls/nls/tam.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/tam.nls rename to reactos/dll/win32/kernel32/winnls/nls/tam.nls diff --git a/reactos/dll/win32/kernel32/nls/tel.nls b/reactos/dll/win32/kernel32/winnls/nls/tel.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/tel.nls rename to reactos/dll/win32/kernel32/winnls/nls/tel.nls diff --git a/reactos/dll/win32/kernel32/nls/tha.nls b/reactos/dll/win32/kernel32/winnls/nls/tha.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/tha.nls rename to reactos/dll/win32/kernel32/winnls/nls/tha.nls diff --git a/reactos/dll/win32/kernel32/nls/trk.nls b/reactos/dll/win32/kernel32/winnls/nls/trk.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/trk.nls rename to reactos/dll/win32/kernel32/winnls/nls/trk.nls diff --git a/reactos/dll/win32/kernel32/nls/ttt.nls b/reactos/dll/win32/kernel32/winnls/nls/ttt.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ttt.nls rename to reactos/dll/win32/kernel32/winnls/nls/ttt.nls diff --git a/reactos/dll/win32/kernel32/nls/ukr.nls b/reactos/dll/win32/kernel32/winnls/nls/ukr.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/ukr.nls rename to reactos/dll/win32/kernel32/winnls/nls/ukr.nls diff --git a/reactos/dll/win32/kernel32/nls/urd.nls b/reactos/dll/win32/kernel32/winnls/nls/urd.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/urd.nls rename to reactos/dll/win32/kernel32/winnls/nls/urd.nls diff --git a/reactos/dll/win32/kernel32/nls/uzb.nls b/reactos/dll/win32/kernel32/winnls/nls/uzb.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/uzb.nls rename to reactos/dll/win32/kernel32/winnls/nls/uzb.nls diff --git a/reactos/dll/win32/kernel32/nls/uzl.nls b/reactos/dll/win32/kernel32/winnls/nls/uzl.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/uzl.nls rename to reactos/dll/win32/kernel32/winnls/nls/uzl.nls diff --git a/reactos/dll/win32/kernel32/nls/vit.nls b/reactos/dll/win32/kernel32/winnls/nls/vit.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/vit.nls rename to reactos/dll/win32/kernel32/winnls/nls/vit.nls diff --git a/reactos/dll/win32/kernel32/nls/zhh.nls b/reactos/dll/win32/kernel32/winnls/nls/zhh.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/zhh.nls rename to reactos/dll/win32/kernel32/winnls/nls/zhh.nls diff --git a/reactos/dll/win32/kernel32/nls/zhi.nls b/reactos/dll/win32/kernel32/winnls/nls/zhi.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/zhi.nls rename to reactos/dll/win32/kernel32/winnls/nls/zhi.nls diff --git a/reactos/dll/win32/kernel32/nls/zhm.nls b/reactos/dll/win32/kernel32/winnls/nls/zhm.nls similarity index 100% rename from reactos/dll/win32/kernel32/nls/zhm.nls rename to reactos/dll/win32/kernel32/winnls/nls/zhm.nls diff --git a/reactos/dll/win32/kernel32/string/casemap.c b/reactos/dll/win32/kernel32/winnls/string/casemap.c similarity index 100% rename from reactos/dll/win32/kernel32/string/casemap.c rename to reactos/dll/win32/kernel32/winnls/string/casemap.c diff --git a/reactos/dll/win32/kernel32/string/chartype.c b/reactos/dll/win32/kernel32/winnls/string/chartype.c similarity index 100% rename from reactos/dll/win32/kernel32/string/chartype.c rename to reactos/dll/win32/kernel32/winnls/string/chartype.c diff --git a/reactos/dll/win32/kernel32/string/collation.c b/reactos/dll/win32/kernel32/winnls/string/collation.c similarity index 100% rename from reactos/dll/win32/kernel32/string/collation.c rename to reactos/dll/win32/kernel32/winnls/string/collation.c diff --git a/reactos/dll/win32/kernel32/string/fold.c b/reactos/dll/win32/kernel32/winnls/string/fold.c similarity index 100% rename from reactos/dll/win32/kernel32/string/fold.c rename to reactos/dll/win32/kernel32/winnls/string/fold.c diff --git a/reactos/dll/win32/kernel32/string/format_msg.c b/reactos/dll/win32/kernel32/winnls/string/format_msg.c similarity index 100% rename from reactos/dll/win32/kernel32/string/format_msg.c rename to reactos/dll/win32/kernel32/winnls/string/format_msg.c diff --git a/reactos/dll/win32/kernel32/string/lang.c b/reactos/dll/win32/kernel32/winnls/string/lang.c similarity index 100% rename from reactos/dll/win32/kernel32/string/lang.c rename to reactos/dll/win32/kernel32/winnls/string/lang.c diff --git a/reactos/dll/win32/kernel32/string/lcformat.c b/reactos/dll/win32/kernel32/winnls/string/lcformat.c similarity index 100% rename from reactos/dll/win32/kernel32/string/lcformat.c rename to reactos/dll/win32/kernel32/winnls/string/lcformat.c diff --git a/reactos/dll/win32/kernel32/string/lcformat_private.h b/reactos/dll/win32/kernel32/winnls/string/lcformat_private.h similarity index 100% rename from reactos/dll/win32/kernel32/string/lcformat_private.h rename to reactos/dll/win32/kernel32/winnls/string/lcformat_private.h diff --git a/reactos/dll/win32/kernel32/string/lstring.c b/reactos/dll/win32/kernel32/winnls/string/lstring.c similarity index 100% rename from reactos/dll/win32/kernel32/string/lstring.c rename to reactos/dll/win32/kernel32/winnls/string/lstring.c diff --git a/reactos/dll/win32/kernel32/string/nls.c b/reactos/dll/win32/kernel32/winnls/string/nls.c similarity index 100% rename from reactos/dll/win32/kernel32/string/nls.c rename to reactos/dll/win32/kernel32/winnls/string/nls.c diff --git a/reactos/dll/win32/kernel32/string/sortkey.c b/reactos/dll/win32/kernel32/winnls/string/sortkey.c similarity index 100% rename from reactos/dll/win32/kernel32/string/sortkey.c rename to reactos/dll/win32/kernel32/winnls/string/sortkey.c