diff --git a/reactos/base/CMakeLists.txt b/reactos/base/CMakeLists.txt
index 5dafa0b5aff..01732d6e3cb 100644
--- a/reactos/base/CMakeLists.txt
+++ b/reactos/base/CMakeLists.txt
@@ -4,3 +4,4 @@ add_subdirectory(services)
 add_subdirectory(setup)
 add_subdirectory(shell)
 add_subdirectory(system)
+add_subdirectory(wmi)
diff --git a/reactos/base/applications/cmdutils/CMakeLists.txt b/reactos/base/applications/cmdutils/CMakeLists.txt
index 07642853147..bd62a1a5b53 100644
--- a/reactos/base/applications/cmdutils/CMakeLists.txt
+++ b/reactos/base/applications/cmdutils/CMakeLists.txt
@@ -9,7 +9,6 @@ add_subdirectory(help)
 add_subdirectory(hostname)
 add_subdirectory(lodctr)
 add_subdirectory(mode)
-add_subdirectory(mofcomp)
 add_subdirectory(more)
 add_subdirectory(reg)
 add_subdirectory(schtasks)
@@ -17,6 +16,5 @@ add_subdirectory(sort)
 add_subdirectory(taskkill)
 add_subdirectory(tree)
 add_subdirectory(whoami)
-add_subdirectory(wmic)
 add_subdirectory(wscript)
 add_subdirectory(xcopy)
diff --git a/reactos/base/services/CMakeLists.txt b/reactos/base/services/CMakeLists.txt
index fa0c0171c9c..13773bbb5bf 100644
--- a/reactos/base/services/CMakeLists.txt
+++ b/reactos/base/services/CMakeLists.txt
@@ -13,4 +13,3 @@ add_subdirectory(thmsvc)
 add_subdirectory(umpnpmgr)
 add_subdirectory(wkssvc)
 add_subdirectory(wlansvc)
-add_subdirectory(wmisvc)
diff --git a/reactos/base/wmi/CMakeLists.txt b/reactos/base/wmi/CMakeLists.txt
new file mode 100644
index 00000000000..2e2918e15c0
--- /dev/null
+++ b/reactos/base/wmi/CMakeLists.txt
@@ -0,0 +1,11 @@
+
+add_subdirectory(framedyn)
+add_subdirectory(mofcomp)
+add_subdirectory(wbemdisp)
+add_subdirectory(wbemprox)
+add_subdirectory(wmi)
+add_subdirectory(wmic)
+add_subdirectory(wmisvc)
+add_subdirectory(wmiutils)
+
+add_registry_inf(wbem_reg.inf)
diff --git a/reactos/dll/win32/framedyn/CMakeLists.txt b/reactos/base/wmi/framedyn/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/framedyn/CMakeLists.txt
rename to reactos/base/wmi/framedyn/CMakeLists.txt
diff --git a/reactos/dll/win32/framedyn/alias_gcc.s b/reactos/base/wmi/framedyn/alias_gcc.s
similarity index 100%
rename from reactos/dll/win32/framedyn/alias_gcc.s
rename to reactos/base/wmi/framedyn/alias_gcc.s
diff --git a/reactos/dll/win32/framedyn/chstring.cpp b/reactos/base/wmi/framedyn/chstring.cpp
similarity index 100%
rename from reactos/dll/win32/framedyn/chstring.cpp
rename to reactos/base/wmi/framedyn/chstring.cpp
diff --git a/reactos/dll/win32/framedyn/framedyn.spec b/reactos/base/wmi/framedyn/framedyn.spec
similarity index 100%
rename from reactos/dll/win32/framedyn/framedyn.spec
rename to reactos/base/wmi/framedyn/framedyn.spec
diff --git a/reactos/dll/win32/framedyn/main.c b/reactos/base/wmi/framedyn/main.c
similarity index 100%
rename from reactos/dll/win32/framedyn/main.c
rename to reactos/base/wmi/framedyn/main.c
diff --git a/reactos/dll/win32/framedyn/provider.cpp b/reactos/base/wmi/framedyn/provider.cpp
similarity index 100%
rename from reactos/dll/win32/framedyn/provider.cpp
rename to reactos/base/wmi/framedyn/provider.cpp
diff --git a/reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt b/reactos/base/wmi/mofcomp/CMakeLists.txt
similarity index 100%
rename from reactos/base/applications/cmdutils/mofcomp/CMakeLists.txt
rename to reactos/base/wmi/mofcomp/CMakeLists.txt
diff --git a/reactos/base/applications/cmdutils/mofcomp/mofcomp.c b/reactos/base/wmi/mofcomp/mofcomp.c
similarity index 100%
rename from reactos/base/applications/cmdutils/mofcomp/mofcomp.c
rename to reactos/base/wmi/mofcomp/mofcomp.c
diff --git a/reactos/base/wmi/wbem_reg.inf b/reactos/base/wmi/wbem_reg.inf
new file mode 100644
index 00000000000..65712a45fbc
--- /dev/null
+++ b/reactos/base/wmi/wbem_reg.inf
@@ -0,0 +1,7 @@
+; WBem
+[AddReg]
+HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012
+HKLM,"SOFTWARE\Microsoft\wbem","Installation Directory",0x00020000,"%SystemRoot%\system32\wbem"
+HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install Directory",0x00020000,"%SystemRoot%\system32\wbem\mof"
diff --git a/reactos/dll/win32/wbemdisp/CMakeLists.txt b/reactos/base/wmi/wbemdisp/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/wbemdisp/CMakeLists.txt
rename to reactos/base/wmi/wbemdisp/CMakeLists.txt
diff --git a/reactos/dll/win32/wbemdisp/guid.c b/reactos/base/wmi/wbemdisp/guid.c
similarity index 100%
rename from reactos/dll/win32/wbemdisp/guid.c
rename to reactos/base/wmi/wbemdisp/guid.c
diff --git a/reactos/dll/win32/wbemdisp/locator.c b/reactos/base/wmi/wbemdisp/locator.c
similarity index 100%
rename from reactos/dll/win32/wbemdisp/locator.c
rename to reactos/base/wmi/wbemdisp/locator.c
diff --git a/reactos/dll/win32/wbemdisp/main.c b/reactos/base/wmi/wbemdisp/main.c
similarity index 100%
rename from reactos/dll/win32/wbemdisp/main.c
rename to reactos/base/wmi/wbemdisp/main.c
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp.rc b/reactos/base/wmi/wbemdisp/wbemdisp.rc
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp.rc
rename to reactos/base/wmi/wbemdisp/wbemdisp.rc
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp.spec b/reactos/base/wmi/wbemdisp/wbemdisp.spec
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp.spec
rename to reactos/base/wmi/wbemdisp/wbemdisp.spec
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_classes.idl b/reactos/base/wmi/wbemdisp/wbemdisp_classes.idl
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp_classes.idl
rename to reactos/base/wmi/wbemdisp/wbemdisp_classes.idl
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_classes.rgs b/reactos/base/wmi/wbemdisp/wbemdisp_classes.rgs
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp_classes.rgs
rename to reactos/base/wmi/wbemdisp/wbemdisp_classes.rgs
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_private.h b/reactos/base/wmi/wbemdisp/wbemdisp_private.h
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp_private.h
rename to reactos/base/wmi/wbemdisp/wbemdisp_private.h
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl b/reactos/base/wmi/wbemdisp/wbemdisp_tlb.idl
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp_tlb.idl
rename to reactos/base/wmi/wbemdisp/wbemdisp_tlb.idl
diff --git a/reactos/dll/win32/wbemdisp/wbemdisp_tlb.rgs b/reactos/base/wmi/wbemdisp/wbemdisp_tlb.rgs
similarity index 100%
rename from reactos/dll/win32/wbemdisp/wbemdisp_tlb.rgs
rename to reactos/base/wmi/wbemdisp/wbemdisp_tlb.rgs
diff --git a/reactos/dll/win32/wbemprox/CMakeLists.txt b/reactos/base/wmi/wbemprox/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/wbemprox/CMakeLists.txt
rename to reactos/base/wmi/wbemprox/CMakeLists.txt
diff --git a/reactos/dll/win32/wbemprox/builtin.c b/reactos/base/wmi/wbemprox/builtin.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/builtin.c
rename to reactos/base/wmi/wbemprox/builtin.c
diff --git a/reactos/dll/win32/wbemprox/class.c b/reactos/base/wmi/wbemprox/class.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/class.c
rename to reactos/base/wmi/wbemprox/class.c
diff --git a/reactos/dll/win32/wbemprox/guid.c b/reactos/base/wmi/wbemprox/guid.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/guid.c
rename to reactos/base/wmi/wbemprox/guid.c
diff --git a/reactos/dll/win32/wbemprox/main.c b/reactos/base/wmi/wbemprox/main.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/main.c
rename to reactos/base/wmi/wbemprox/main.c
diff --git a/reactos/dll/win32/wbemprox/process.c b/reactos/base/wmi/wbemprox/process.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/process.c
rename to reactos/base/wmi/wbemprox/process.c
diff --git a/reactos/dll/win32/wbemprox/qualifier.c b/reactos/base/wmi/wbemprox/qualifier.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/qualifier.c
rename to reactos/base/wmi/wbemprox/qualifier.c
diff --git a/reactos/dll/win32/wbemprox/query.c b/reactos/base/wmi/wbemprox/query.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/query.c
rename to reactos/base/wmi/wbemprox/query.c
diff --git a/reactos/dll/win32/wbemprox/reg.c b/reactos/base/wmi/wbemprox/reg.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/reg.c
rename to reactos/base/wmi/wbemprox/reg.c
diff --git a/reactos/dll/win32/wbemprox/security.c b/reactos/base/wmi/wbemprox/security.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/security.c
rename to reactos/base/wmi/wbemprox/security.c
diff --git a/reactos/dll/win32/wbemprox/service.c b/reactos/base/wmi/wbemprox/service.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/service.c
rename to reactos/base/wmi/wbemprox/service.c
diff --git a/reactos/dll/win32/wbemprox/services.c b/reactos/base/wmi/wbemprox/services.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/services.c
rename to reactos/base/wmi/wbemprox/services.c
diff --git a/reactos/dll/win32/wbemprox/table.c b/reactos/base/wmi/wbemprox/table.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/table.c
rename to reactos/base/wmi/wbemprox/table.c
diff --git a/reactos/dll/win32/wbemprox/wbemlocator.c b/reactos/base/wmi/wbemprox/wbemlocator.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemlocator.c
rename to reactos/base/wmi/wbemprox/wbemlocator.c
diff --git a/reactos/dll/win32/wbemprox/wbemprox.idl b/reactos/base/wmi/wbemprox/wbemprox.idl
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemprox.idl
rename to reactos/base/wmi/wbemprox/wbemprox.idl
diff --git a/reactos/dll/win32/wbemprox/wbemprox.rc b/reactos/base/wmi/wbemprox/wbemprox.rc
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemprox.rc
rename to reactos/base/wmi/wbemprox/wbemprox.rc
diff --git a/reactos/dll/win32/wbemprox/wbemprox.rgs b/reactos/base/wmi/wbemprox/wbemprox.rgs
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemprox.rgs
rename to reactos/base/wmi/wbemprox/wbemprox.rgs
diff --git a/reactos/dll/win32/wbemprox/wbemprox.spec b/reactos/base/wmi/wbemprox/wbemprox.spec
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemprox.spec
rename to reactos/base/wmi/wbemprox/wbemprox.spec
diff --git a/reactos/dll/win32/wbemprox/wbemprox_private.h b/reactos/base/wmi/wbemprox/wbemprox_private.h
similarity index 100%
rename from reactos/dll/win32/wbemprox/wbemprox_private.h
rename to reactos/base/wmi/wbemprox/wbemprox_private.h
diff --git a/reactos/dll/win32/wbemprox/wql.tab.c b/reactos/base/wmi/wbemprox/wql.tab.c
similarity index 100%
rename from reactos/dll/win32/wbemprox/wql.tab.c
rename to reactos/base/wmi/wbemprox/wql.tab.c
diff --git a/reactos/dll/win32/wbemprox/wql.y b/reactos/base/wmi/wbemprox/wql.y
similarity index 100%
rename from reactos/dll/win32/wbemprox/wql.y
rename to reactos/base/wmi/wbemprox/wql.y
diff --git a/reactos/dll/win32/wmi/CMakeLists.txt b/reactos/base/wmi/wmi/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/wmi/CMakeLists.txt
rename to reactos/base/wmi/wmi/CMakeLists.txt
diff --git a/reactos/dll/win32/wmi/wmi.rc b/reactos/base/wmi/wmi/wmi.rc
similarity index 100%
rename from reactos/dll/win32/wmi/wmi.rc
rename to reactos/base/wmi/wmi/wmi.rc
diff --git a/reactos/dll/win32/wmi/wmi.spec b/reactos/base/wmi/wmi/wmi.spec
similarity index 100%
rename from reactos/dll/win32/wmi/wmi.spec
rename to reactos/base/wmi/wmi/wmi.spec
diff --git a/reactos/base/applications/cmdutils/wmic/CMakeLists.txt b/reactos/base/wmi/wmic/CMakeLists.txt
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/CMakeLists.txt
rename to reactos/base/wmi/wmic/CMakeLists.txt
diff --git a/reactos/base/applications/cmdutils/wmic/lang/de-DE.rc b/reactos/base/wmi/wmic/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/de-DE.rc
rename to reactos/base/wmi/wmic/lang/de-DE.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/en-US.rc b/reactos/base/wmi/wmic/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/en-US.rc
rename to reactos/base/wmi/wmic/lang/en-US.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc b/reactos/base/wmi/wmic/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc
rename to reactos/base/wmi/wmic/lang/ro-RO.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc b/reactos/base/wmi/wmic/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/ru-RU.rc
rename to reactos/base/wmi/wmic/lang/ru-RU.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc b/reactos/base/wmi/wmic/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/sq-AL.rc
rename to reactos/base/wmi/wmic/lang/sq-AL.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc b/reactos/base/wmi/wmic/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/tr-TR.rc
rename to reactos/base/wmi/wmic/lang/tr-TR.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc b/reactos/base/wmi/wmic/lang/zh-CN.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/zh-CN.rc
rename to reactos/base/wmi/wmic/lang/zh-CN.rc
diff --git a/reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc b/reactos/base/wmi/wmic/lang/zh-TW.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/lang/zh-TW.rc
rename to reactos/base/wmi/wmic/lang/zh-TW.rc
diff --git a/reactos/base/applications/cmdutils/wmic/main.c b/reactos/base/wmi/wmic/main.c
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/main.c
rename to reactos/base/wmi/wmic/main.c
diff --git a/reactos/base/applications/cmdutils/wmic/wmic.h b/reactos/base/wmi/wmic/wmic.h
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/wmic.h
rename to reactos/base/wmi/wmic/wmic.h
diff --git a/reactos/base/applications/cmdutils/wmic/wmic.rc b/reactos/base/wmi/wmic/wmic.rc
similarity index 100%
rename from reactos/base/applications/cmdutils/wmic/wmic.rc
rename to reactos/base/wmi/wmic/wmic.rc
diff --git a/reactos/base/services/wmisvc/CMakeLists.txt b/reactos/base/wmi/wmisvc/CMakeLists.txt
similarity index 90%
rename from reactos/base/services/wmisvc/CMakeLists.txt
rename to reactos/base/wmi/wmisvc/CMakeLists.txt
index 3c8b8f9f924..8bc5dfb401d 100644
--- a/reactos/base/services/wmisvc/CMakeLists.txt
+++ b/reactos/base/wmi/wmisvc/CMakeLists.txt
@@ -8,3 +8,4 @@ add_library(wmisvc SHARED
 set_module_type(wmisvc win32dll UNICODE)
 add_importlibs(wmisvc advapi32 msvcrt kernel32 ntdll)
 add_cd_file(TARGET wmisvc DESTINATION reactos/system32/wbem FOR all)
+add_registry_inf(wmisvc_reg.inf)
diff --git a/reactos/base/services/wmisvc/wmisvc.c b/reactos/base/wmi/wmisvc/wmisvc.c
similarity index 100%
rename from reactos/base/services/wmisvc/wmisvc.c
rename to reactos/base/wmi/wmisvc/wmisvc.c
diff --git a/reactos/base/services/wmisvc/wmisvc.rc b/reactos/base/wmi/wmisvc/wmisvc.rc
similarity index 100%
rename from reactos/base/services/wmisvc/wmisvc.rc
rename to reactos/base/wmi/wmisvc/wmisvc.rc
diff --git a/reactos/base/services/wmisvc/wmisvc.spec b/reactos/base/wmi/wmisvc/wmisvc.spec
similarity index 100%
rename from reactos/base/services/wmisvc/wmisvc.spec
rename to reactos/base/wmi/wmisvc/wmisvc.spec
diff --git a/reactos/base/wmi/wmisvc/wmisvc_reg.inf b/reactos/base/wmi/wmisvc/wmisvc_reg.inf
new file mode 100644
index 00000000000..25dfa811cbf
--- /dev/null
+++ b/reactos/base/wmi/wmisvc/wmisvc_reg.inf
@@ -0,0 +1,12 @@
+; WMI Service
+[AddReg]
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS Management Infrastructure"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides interface to system management information"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem"
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020
+HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll"
diff --git a/reactos/dll/win32/wmiutils/CMakeLists.txt b/reactos/base/wmi/wmiutils/CMakeLists.txt
similarity index 100%
rename from reactos/dll/win32/wmiutils/CMakeLists.txt
rename to reactos/base/wmi/wmiutils/CMakeLists.txt
diff --git a/reactos/dll/win32/wmiutils/main.c b/reactos/base/wmi/wmiutils/main.c
similarity index 100%
rename from reactos/dll/win32/wmiutils/main.c
rename to reactos/base/wmi/wmiutils/main.c
diff --git a/reactos/dll/win32/wmiutils/path.c b/reactos/base/wmi/wmiutils/path.c
similarity index 100%
rename from reactos/dll/win32/wmiutils/path.c
rename to reactos/base/wmi/wmiutils/path.c
diff --git a/reactos/dll/win32/wmiutils/statuscode.c b/reactos/base/wmi/wmiutils/statuscode.c
similarity index 100%
rename from reactos/dll/win32/wmiutils/statuscode.c
rename to reactos/base/wmi/wmiutils/statuscode.c
diff --git a/reactos/dll/win32/wmiutils/wmiutils.rc b/reactos/base/wmi/wmiutils/wmiutils.rc
similarity index 100%
rename from reactos/dll/win32/wmiutils/wmiutils.rc
rename to reactos/base/wmi/wmiutils/wmiutils.rc
diff --git a/reactos/dll/win32/wmiutils/wmiutils.spec b/reactos/base/wmi/wmiutils/wmiutils.spec
similarity index 100%
rename from reactos/dll/win32/wmiutils/wmiutils.spec
rename to reactos/base/wmi/wmiutils/wmiutils.spec
diff --git a/reactos/dll/win32/wmiutils/wmiutils_classes.idl b/reactos/base/wmi/wmiutils/wmiutils_classes.idl
similarity index 100%
rename from reactos/dll/win32/wmiutils/wmiutils_classes.idl
rename to reactos/base/wmi/wmiutils/wmiutils_classes.idl
diff --git a/reactos/dll/win32/wmiutils/wmiutils_classes.rgs b/reactos/base/wmi/wmiutils/wmiutils_classes.rgs
similarity index 100%
rename from reactos/dll/win32/wmiutils/wmiutils_classes.rgs
rename to reactos/base/wmi/wmiutils/wmiutils_classes.rgs
diff --git a/reactos/dll/win32/wmiutils/wmiutils_private.h b/reactos/base/wmi/wmiutils/wmiutils_private.h
similarity index 100%
rename from reactos/dll/win32/wmiutils/wmiutils_private.h
rename to reactos/base/wmi/wmiutils/wmiutils_private.h
diff --git a/reactos/boot/bootdata/hivesft.inf b/reactos/boot/bootdata/hivesft.inf
index 85f1a6e65ff..f7b809f5ce4 100644
--- a/reactos/boot/bootdata/hivesft.inf
+++ b/reactos/boot/bootdata/hivesft.inf
@@ -92,13 +92,6 @@ HKLM,"SOFTWARE\Microsoft\Rpc\SecurityService","9",2,"secur32.dll"
 
 HKLM,"SOFTWARE\Microsoft\Secure",,0x00000012
 
-; WBem
-HKLM,"SOFTWARE\Microsoft\wbem\ess",,0x00000012
-HKLM,"SOFTWARE\Microsoft\wbem\Transports",,0x00000012
-HKLM,"SOFTWARE\Microsoft\wbem\Scripting",,0x00000012
-HKLM,"SOFTWARE\Microsoft\wbem","Installation Directory",0x00020000,"%SystemRoot%\system32\wbem"
-HKLM,"SOFTWARE\Microsoft\wbem","MOF Self-Install Directory",0x00020000,"%SystemRoot%\system32\wbem\mof"
-
 ; HTML Help
 HKLM,"SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9}",,2,"HTML Help"
 HKLM,"SOFTWARE\Microsoft\Active Setup\Installed Components\{de5aed00-a4bf-11d1-9948-00c04f98bbc9}","ComponentID",2,"HTMLHelp"
diff --git a/reactos/boot/bootdata/hivesys.inf b/reactos/boot/bootdata/hivesys.inf
index 9c198fe5c33..5993f16c2ed 100644
--- a/reactos/boot/bootdata/hivesys.inf
+++ b/reactos/boot/bootdata/hivesys.inf
@@ -1997,18 +1997,6 @@ HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","ObjectName",0x00000000,"Loca
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Start",0x00010001,0x00000003
 HKLM,"SYSTEM\CurrentControlSet\Services\MSIServer","Type",0x00010001,0x00000020
 
-; WMI Service
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DependOnService",0x00010000,"RPCSS"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","DisplayName",0x00000000,"ReactOS Management Infrastructure"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Description",0x00000000,"Provides interface to system management information"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ErrorControl",0x00010001,0x00000001
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Group",0x00000000,"WMI"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ImagePath",0x00020000,"%SystemRoot%\system32\svchost.exe -k netsvcs"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","ObjectName",0x00000000,"LocalSystem"
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Start",0x00010001,0x00000002
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt","Type",0x00010001,0x00000020
-HKLM,"SYSTEM\CurrentControlSet\Services\winmgmt\Parameters","ServiceDll",0x00020000,"%SystemRoot%\system32\wbem\wmisvc.dll"
-
 ; Sound Blaster (NT4)
 ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","Description",0x00000000,"Sound Blaster (NT4)"
 ;HKLM,"SYSTEM\CurrentControlSet\Services\sndblst","ErrorControl",0x00010001,0x00000001
diff --git a/reactos/dll/win32/CMakeLists.txt b/reactos/dll/win32/CMakeLists.txt
index 54621f96a15..b18f76e65b8 100644
--- a/reactos/dll/win32/CMakeLists.txt
+++ b/reactos/dll/win32/CMakeLists.txt
@@ -42,7 +42,6 @@ add_subdirectory(faultrep)
 add_subdirectory(fltlib)
 add_subdirectory(fmifs)
 add_subdirectory(fontsub)
-add_subdirectory(framedyn)
 add_subdirectory(fusion)
 add_subdirectory(gdiplus)
 add_subdirectory(getuname)
@@ -220,8 +219,6 @@ add_subdirectory(uxtheme)
 add_subdirectory(vbscript)
 add_subdirectory(version)
 add_subdirectory(vssapi)
-add_subdirectory(wbemdisp)
-add_subdirectory(wbemprox)
 if(ARCH STREQUAL "i386")
     add_subdirectory(wdmaud.drv)
 endif()
@@ -238,8 +235,6 @@ add_subdirectory(winsta)
 add_subdirectory(wintrust)
 add_subdirectory(wlanapi)
 add_subdirectory(wldap32)
-add_subdirectory(wmi)
-add_subdirectory(wmiutils)
 add_subdirectory(wmvcore)
 add_subdirectory(ws2_32)
 add_subdirectory(ws2help)
diff --git a/reactos/media/doc/README.WINE b/reactos/media/doc/README.WINE
index 8f60802ee67..65b33d83c0b 100644
--- a/reactos/media/doc/README.WINE
+++ b/reactos/media/doc/README.WINE
@@ -21,6 +21,11 @@ reactos/sdk/tools/wpp                   # Synced to WineStaging-1.9.11
 
 The following libraries are shared with Wine.
 
+reactos/base/wmi/wbemdisp               # Synced to WineStaging-1.9.16
+reactos/base/wmi/wbemprox               # Synced to WineStaging-1.9.23
+reactos/base/wmi/wmi                    # Synced to WineStaging-1.9.11
+reactos/base/wmi/wmiutils               # Synced to WineStaging-1.9.11
+
 reactos/dll/directx/wine/amstream       # Synced to WineStaging-1.9.23
 reactos/dll/directx/wine/d3d8           # Synced to WineStaging-1.9.4
 reactos/dll/directx/wine/d3d9           # Synced to WineStaging-1.9.4
@@ -194,8 +199,6 @@ reactos/dll/win32/uxtheme             # Forked
 reactos/dll/win32/vbscript            # Synced to WineStaging-1.9.23
 reactos/dll/win32/version             # Synced to WineStaging-1.9.11
 reactos/dll/win32/vssapi              # Synced to WineStaging-1.9.11
-reactos/dll/win32/wbemdisp            # Synced to WineStaging-1.9.16
-reactos/dll/win32/wbemprox            # Synced to WineStaging-1.9.23
 reactos/dll/win32/windowscodecs       # Synced to WineStaging-1.9.23
 reactos/dll/win32/windowscodecsext    # Synced to WineStaging-1.9.11
 reactos/dll/win32/winemp3.acm         # Synced to WineStaging-1.9.23
@@ -208,8 +211,6 @@ reactos/dll/win32/winmm/wavemap       # Forked at Wine-20050628
 reactos/dll/win32/winscard            # Synced to WineStaging-1.9.11
 reactos/dll/win32/wintrust            # Synced to WineStaging-1.9.23
 reactos/dll/win32/wldap32             # Synced to WineStaging-1.9.11
-reactos/dll/win32/wmi                 # Synced to WineStaging-1.9.11
-reactos/dll/win32/wmiutils            # Synced to WineStaging-1.9.11
 reactos/dll/win32/wmvcore             # Synced to WineStaging-1.9.11
 reactos/dll/win32/wshom.ocx           # Synced to WineStaging-1.9.11
 reactos/dll/win32/wtsapi32            # Synced to WineStaging-1.9.11
@@ -230,7 +231,6 @@ reactos/base/applications/cmdutils/cscript  # Synced to WineStaging-1.9.11
 reactos/base/applications/cmdutils/reg      # Synced to WineStaging-1.9.16
 reactos/base/applications/cmdutils/schtasks # Synced to WineStaging-1.9.14
 reactos/base/applications/cmdutils/taskkill # Synced to WineStaging-1.9.11
-reactos/base/applications/cmdutils/wmic     # Synced to WineStaging-1.9.11
 reactos/base/applications/cmdutils/wscript  # Synced to WineStaging-1.9.16
 reactos/base/applications/cmdutils/xcopy    # Synced to WineStaging-1.9.11
 reactos/base/applications/games/winmine     # Synced to WineStaging-1.9.16 with our own resources.
@@ -244,6 +244,10 @@ reactos/base/applications/write             # Synced to WineStaging-1.9.16
 reactos/base/services/rpcss                 # Synced to WineStaging-1.9.16
 reactos/base/system/expand                  # Synced to WineStaging-1.9.11
 reactos/base/system/msiexec                 # Synced to WineStaging-1.9.11
+
+reactos/base/wmi/mofcomp                    # Synced to Wine-2.2
+reactos/base/wmi/wmic                       # Synced to WineStaging-1.9.11
+
 reactos/modules/rosapps/winfile             # Autosync
 
 In addition the following libs, dlls and source files are mostly based on code ported