From b8a2e3b8a44c6a518cd88757b7cac5977b021903 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 16 Nov 2006 14:49:25 +0100
Subject: [PATCH] user32: Renamed the user/ directory to user32.

---
 Makefile.in                                   |  8 ++++----
 configure                                     | 14 +++++++-------
 configure.ac                                  |  6 +++---
 dlls/.gitignore                               |  3 +--
 dlls/Makefile.in                              | 19 +++++--------------
 dlls/{user => user32}/Makefile.in             |  0
 dlls/{user => user32}/bidi16.c                |  0
 dlls/{user => user32}/button.c                |  0
 dlls/{user => user32}/caret.c                 |  0
 dlls/{user => user32}/class.c                 |  0
 dlls/{user => user32}/clipboard.c             |  0
 dlls/{user => user32}/combo.c                 |  0
 dlls/{user => user32}/comm16.c                |  0
 dlls/{user => user32}/controls.h              |  0
 dlls/{user => user32}/cursoricon.c            |  0
 dlls/{user => user32}/dde_client.c            |  0
 dlls/{user => user32}/dde_misc.c              |  0
 dlls/{user => user32}/dde_private.h           |  0
 dlls/{user => user32}/dde_server.c            |  0
 dlls/{user => user32}/ddeml.spec              |  0
 dlls/{user => user32}/ddeml16.c               |  0
 dlls/{user => user32}/defdlg.c                |  0
 dlls/{user => user32}/defwnd.c                |  0
 dlls/{user => user32}/desktop.c               |  0
 dlls/{user => user32}/dialog.c                |  0
 dlls/{user => user32}/dialog16.c              |  0
 dlls/{user => user32}/display.c               |  0
 dlls/{user => user32}/display.drv.spec        |  0
 dlls/{user => user32}/driver.c                |  0
 dlls/{user => user32}/driver16.c              |  0
 dlls/{user => user32}/edit.c                  |  0
 dlls/{user => user32}/exticon.c               |  0
 dlls/{user => user32}/focus.c                 |  0
 dlls/{user => user32}/hook.c                  |  0
 dlls/{user => user32}/hook16.c                |  0
 dlls/{user => user32}/icontitle.c             |  0
 dlls/{user => user32}/input.c                 |  0
 dlls/{user => user32}/kbd16.c                 |  0
 dlls/{user => user32}/keyboard.drv.spec       |  0
 dlls/{user => user32}/listbox.c               |  0
 dlls/{user => user32}/lstr.c                  |  0
 dlls/{user => user32}/mdi.c                   |  0
 dlls/{user => user32}/menu.c                  |  0
 dlls/{user => user32}/message.c               |  0
 dlls/{user => user32}/misc.c                  |  0
 dlls/{user => user32}/mouse.drv.spec          |  0
 dlls/{user => user32}/mouse16.c               |  0
 dlls/{user => user32}/msg16.c                 |  0
 dlls/{user => user32}/msgbox.c                |  0
 dlls/{user => user32}/network.c               |  0
 dlls/{user => user32}/nonclient.c             |  0
 dlls/{user => user32}/painting.c              |  0
 dlls/{user => user32}/property.c              |  0
 dlls/{user => user32}/resource.c              |  0
 dlls/{user => user32}/resources/display.rc    |  0
 dlls/{user => user32}/resources/mouse.rc      |  0
 dlls/{user => user32}/resources/user32.rc     |  0
 dlls/{user => user32}/resources/user32_Bg.rc  |  0
 dlls/{user => user32}/resources/user32_Ca.rc  |  0
 dlls/{user => user32}/resources/user32_Cs.rc  |  0
 dlls/{user => user32}/resources/user32_Da.rc  |  0
 dlls/{user => user32}/resources/user32_De.rc  |  0
 dlls/{user => user32}/resources/user32_En.rc  |  0
 dlls/{user => user32}/resources/user32_Eo.rc  |  0
 dlls/{user => user32}/resources/user32_Es.rc  |  0
 dlls/{user => user32}/resources/user32_Fi.rc  |  0
 dlls/{user => user32}/resources/user32_Fr.rc  |  0
 dlls/{user => user32}/resources/user32_Hu.rc  |  0
 dlls/{user => user32}/resources/user32_It.rc  |  0
 dlls/{user => user32}/resources/user32_Ja.rc  |  0
 dlls/{user => user32}/resources/user32_Ko.rc  |  0
 dlls/{user => user32}/resources/user32_Nl.rc  |  0
 dlls/{user => user32}/resources/user32_No.rc  |  0
 dlls/{user => user32}/resources/user32_Pl.rc  |  0
 dlls/{user => user32}/resources/user32_Pt.rc  |  0
 dlls/{user => user32}/resources/user32_Ru.rc  |  0
 dlls/{user => user32}/resources/user32_Si.rc  |  0
 dlls/{user => user32}/resources/user32_Sk.rc  |  0
 dlls/{user => user32}/resources/user32_Sv.rc  |  0
 dlls/{user => user32}/resources/user32_Tr.rc  |  0
 dlls/{user => user32}/resources/user32_Uk.rc  |  0
 dlls/{user => user32}/resources/user32_Wa.rc  |  0
 dlls/{user => user32}/resources/user32_Zh.rc  |  0
 dlls/{user => user32}/resources/user32_bin.rc |  0
 dlls/{user => user32}/resources/version.rc    |  0
 dlls/{user => user32}/resources/version16.rc  |  0
 dlls/{user => user32}/scroll.c                |  0
 dlls/{user => user32}/spy.c                   |  0
 dlls/{user => user32}/static.c                |  0
 dlls/{user => user32}/sysparams.c             |  0
 dlls/{user => user32}/tests/Makefile.in       |  0
 dlls/{user => user32}/tests/class.c           |  0
 dlls/{user => user32}/tests/clipboard.c       |  0
 dlls/{user => user32}/tests/cursoricon.c      |  0
 dlls/{user => user32}/tests/dce.c             |  0
 dlls/{user => user32}/tests/dde.c             |  0
 dlls/{user => user32}/tests/dialog.c          |  0
 dlls/{user => user32}/tests/edit.c            |  0
 dlls/{user => user32}/tests/generated.c       |  0
 dlls/{user => user32}/tests/input.c           |  0
 dlls/{user => user32}/tests/listbox.c         |  0
 dlls/{user => user32}/tests/menu.c            |  0
 dlls/{user => user32}/tests/monitor.c         |  0
 dlls/{user => user32}/tests/msg.c             |  0
 dlls/{user => user32}/tests/resource.c        |  0
 dlls/{user => user32}/tests/resource.rc       |  0
 dlls/{user => user32}/tests/sysparams.c       |  0
 dlls/{user => user32}/tests/text.c            |  0
 dlls/{user => user32}/tests/win.c             |  0
 dlls/{user => user32}/tests/winstation.c      |  0
 dlls/{user => user32}/tests/wsprintf.c        |  0
 dlls/{user => user32}/text.c                  |  0
 dlls/{user => user32}/uitools.c               |  0
 dlls/{user => user32}/user.exe.spec           |  0
 dlls/{user => user32}/user16.c                |  0
 dlls/{user => user32}/user32.spec             |  0
 dlls/{user => user32}/user_main.c             |  0
 dlls/{user => user32}/user_private.h          |  0
 dlls/{user => user32}/win.c                   |  0
 dlls/{user => user32}/winhelp.c               |  0
 dlls/{user => user32}/winpos.c                |  0
 dlls/{user => user32}/winproc.c               |  0
 dlls/{user => user32}/winproc.h               |  0
 dlls/{user => user32}/winstation.c            |  0
 dlls/{user => user32}/wnd16.c                 |  0
 dlls/{user => user32}/wsprintf.c              |  0
 programs/winetest/Makefile.in                 |  4 ++--
 tools/winapi/tests.dat                        |  2 +-
 128 files changed, 23 insertions(+), 33 deletions(-)
 rename dlls/{user => user32}/Makefile.in (100%)
 rename dlls/{user => user32}/bidi16.c (100%)
 rename dlls/{user => user32}/button.c (100%)
 rename dlls/{user => user32}/caret.c (100%)
 rename dlls/{user => user32}/class.c (100%)
 rename dlls/{user => user32}/clipboard.c (100%)
 rename dlls/{user => user32}/combo.c (100%)
 rename dlls/{user => user32}/comm16.c (100%)
 rename dlls/{user => user32}/controls.h (100%)
 rename dlls/{user => user32}/cursoricon.c (100%)
 rename dlls/{user => user32}/dde_client.c (100%)
 rename dlls/{user => user32}/dde_misc.c (100%)
 rename dlls/{user => user32}/dde_private.h (100%)
 rename dlls/{user => user32}/dde_server.c (100%)
 rename dlls/{user => user32}/ddeml.spec (100%)
 rename dlls/{user => user32}/ddeml16.c (100%)
 rename dlls/{user => user32}/defdlg.c (100%)
 rename dlls/{user => user32}/defwnd.c (100%)
 rename dlls/{user => user32}/desktop.c (100%)
 rename dlls/{user => user32}/dialog.c (100%)
 rename dlls/{user => user32}/dialog16.c (100%)
 rename dlls/{user => user32}/display.c (100%)
 rename dlls/{user => user32}/display.drv.spec (100%)
 rename dlls/{user => user32}/driver.c (100%)
 rename dlls/{user => user32}/driver16.c (100%)
 rename dlls/{user => user32}/edit.c (100%)
 rename dlls/{user => user32}/exticon.c (100%)
 rename dlls/{user => user32}/focus.c (100%)
 rename dlls/{user => user32}/hook.c (100%)
 rename dlls/{user => user32}/hook16.c (100%)
 rename dlls/{user => user32}/icontitle.c (100%)
 rename dlls/{user => user32}/input.c (100%)
 rename dlls/{user => user32}/kbd16.c (100%)
 rename dlls/{user => user32}/keyboard.drv.spec (100%)
 rename dlls/{user => user32}/listbox.c (100%)
 rename dlls/{user => user32}/lstr.c (100%)
 rename dlls/{user => user32}/mdi.c (100%)
 rename dlls/{user => user32}/menu.c (100%)
 rename dlls/{user => user32}/message.c (100%)
 rename dlls/{user => user32}/misc.c (100%)
 rename dlls/{user => user32}/mouse.drv.spec (100%)
 rename dlls/{user => user32}/mouse16.c (100%)
 rename dlls/{user => user32}/msg16.c (100%)
 rename dlls/{user => user32}/msgbox.c (100%)
 rename dlls/{user => user32}/network.c (100%)
 rename dlls/{user => user32}/nonclient.c (100%)
 rename dlls/{user => user32}/painting.c (100%)
 rename dlls/{user => user32}/property.c (100%)
 rename dlls/{user => user32}/resource.c (100%)
 rename dlls/{user => user32}/resources/display.rc (100%)
 rename dlls/{user => user32}/resources/mouse.rc (100%)
 rename dlls/{user => user32}/resources/user32.rc (100%)
 rename dlls/{user => user32}/resources/user32_Bg.rc (100%)
 rename dlls/{user => user32}/resources/user32_Ca.rc (100%)
 rename dlls/{user => user32}/resources/user32_Cs.rc (100%)
 rename dlls/{user => user32}/resources/user32_Da.rc (100%)
 rename dlls/{user => user32}/resources/user32_De.rc (100%)
 rename dlls/{user => user32}/resources/user32_En.rc (100%)
 rename dlls/{user => user32}/resources/user32_Eo.rc (100%)
 rename dlls/{user => user32}/resources/user32_Es.rc (100%)
 rename dlls/{user => user32}/resources/user32_Fi.rc (100%)
 rename dlls/{user => user32}/resources/user32_Fr.rc (100%)
 rename dlls/{user => user32}/resources/user32_Hu.rc (100%)
 rename dlls/{user => user32}/resources/user32_It.rc (100%)
 rename dlls/{user => user32}/resources/user32_Ja.rc (100%)
 rename dlls/{user => user32}/resources/user32_Ko.rc (100%)
 rename dlls/{user => user32}/resources/user32_Nl.rc (100%)
 rename dlls/{user => user32}/resources/user32_No.rc (100%)
 rename dlls/{user => user32}/resources/user32_Pl.rc (100%)
 rename dlls/{user => user32}/resources/user32_Pt.rc (100%)
 rename dlls/{user => user32}/resources/user32_Ru.rc (100%)
 rename dlls/{user => user32}/resources/user32_Si.rc (100%)
 rename dlls/{user => user32}/resources/user32_Sk.rc (100%)
 rename dlls/{user => user32}/resources/user32_Sv.rc (100%)
 rename dlls/{user => user32}/resources/user32_Tr.rc (100%)
 rename dlls/{user => user32}/resources/user32_Uk.rc (100%)
 rename dlls/{user => user32}/resources/user32_Wa.rc (100%)
 rename dlls/{user => user32}/resources/user32_Zh.rc (100%)
 rename dlls/{user => user32}/resources/user32_bin.rc (100%)
 rename dlls/{user => user32}/resources/version.rc (100%)
 rename dlls/{user => user32}/resources/version16.rc (100%)
 rename dlls/{user => user32}/scroll.c (100%)
 rename dlls/{user => user32}/spy.c (100%)
 rename dlls/{user => user32}/static.c (100%)
 rename dlls/{user => user32}/sysparams.c (100%)
 rename dlls/{user => user32}/tests/Makefile.in (100%)
 rename dlls/{user => user32}/tests/class.c (100%)
 rename dlls/{user => user32}/tests/clipboard.c (100%)
 rename dlls/{user => user32}/tests/cursoricon.c (100%)
 rename dlls/{user => user32}/tests/dce.c (100%)
 rename dlls/{user => user32}/tests/dde.c (100%)
 rename dlls/{user => user32}/tests/dialog.c (100%)
 rename dlls/{user => user32}/tests/edit.c (100%)
 rename dlls/{user => user32}/tests/generated.c (100%)
 rename dlls/{user => user32}/tests/input.c (100%)
 rename dlls/{user => user32}/tests/listbox.c (100%)
 rename dlls/{user => user32}/tests/menu.c (100%)
 rename dlls/{user => user32}/tests/monitor.c (100%)
 rename dlls/{user => user32}/tests/msg.c (100%)
 rename dlls/{user => user32}/tests/resource.c (100%)
 rename dlls/{user => user32}/tests/resource.rc (100%)
 rename dlls/{user => user32}/tests/sysparams.c (100%)
 rename dlls/{user => user32}/tests/text.c (100%)
 rename dlls/{user => user32}/tests/win.c (100%)
 rename dlls/{user => user32}/tests/winstation.c (100%)
 rename dlls/{user => user32}/tests/wsprintf.c (100%)
 rename dlls/{user => user32}/text.c (100%)
 rename dlls/{user => user32}/uitools.c (100%)
 rename dlls/{user => user32}/user.exe.spec (100%)
 rename dlls/{user => user32}/user16.c (100%)
 rename dlls/{user => user32}/user32.spec (100%)
 rename dlls/{user => user32}/user_main.c (100%)
 rename dlls/{user => user32}/user_private.h (100%)
 rename dlls/{user => user32}/win.c (100%)
 rename dlls/{user => user32}/winhelp.c (100%)
 rename dlls/{user => user32}/winpos.c (100%)
 rename dlls/{user => user32}/winproc.c (100%)
 rename dlls/{user => user32}/winproc.h (100%)
 rename dlls/{user => user32}/winstation.c (100%)
 rename dlls/{user => user32}/wnd16.c (100%)
 rename dlls/{user => user32}/wsprintf.c (100%)

diff --git a/Makefile.in b/Makefile.in
index 6c3c656073e..ca6b0aa4504 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -361,8 +361,8 @@ ALL_MAKEFILES = \
 	dlls/url/Makefile \
 	dlls/urlmon/Makefile \
 	dlls/urlmon/tests/Makefile \
-	dlls/user/Makefile \
-	dlls/user/tests/Makefile \
+	dlls/user32/Makefile \
+	dlls/user32/tests/Makefile \
 	dlls/userenv/Makefile \
 	dlls/usp10/Makefile \
 	dlls/usp10/tests/Makefile \
@@ -685,8 +685,8 @@ dlls/unicows/Makefile: dlls/unicows/Makefile.in dlls/Makedll.rules
 dlls/url/Makefile: dlls/url/Makefile.in dlls/Makedll.rules
 dlls/urlmon/Makefile: dlls/urlmon/Makefile.in dlls/Makedll.rules
 dlls/urlmon/tests/Makefile: dlls/urlmon/tests/Makefile.in dlls/Maketest.rules
-dlls/user/Makefile: dlls/user/Makefile.in dlls/Makedll.rules
-dlls/user/tests/Makefile: dlls/user/tests/Makefile.in dlls/Maketest.rules
+dlls/user32/Makefile: dlls/user32/Makefile.in dlls/Makedll.rules
+dlls/user32/tests/Makefile: dlls/user32/tests/Makefile.in dlls/Maketest.rules
 dlls/userenv/Makefile: dlls/userenv/Makefile.in dlls/Makedll.rules
 dlls/usp10/Makefile: dlls/usp10/Makefile.in dlls/Makedll.rules
 dlls/usp10/tests/Makefile: dlls/usp10/tests/Makefile.in dlls/Maketest.rules
diff --git a/configure b/configure
index 64e16d1b4cb..2693498a364 100755
--- a/configure
+++ b/configure
@@ -23699,7 +23699,7 @@ ac_config_commands="$ac_config_commands dlls/gdi32/mfdrv"
 
 ac_config_commands="$ac_config_commands dlls/kernel32/nls"
 
-ac_config_commands="$ac_config_commands dlls/user/resources"
+ac_config_commands="$ac_config_commands dlls/user32/resources"
 
 ac_config_commands="$ac_config_commands dlls/wineps.drv/data"
 
@@ -23721,7 +23721,7 @@ MAKE_TEST_RULES=dlls/Maketest.rules
 MAKE_PROG_RULES=programs/Makeprog.rules
 
 
-ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user/Makefile dlls/user/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
+ac_config_files="$ac_config_files Make.rules dlls/Makedll.rules dlls/Makeimplib.rules dlls/Maketest.rules programs/Makeprog.rules Makefile dlls/Makefile dlls/activeds/Makefile dlls/advapi32/Makefile dlls/advapi32/tests/Makefile dlls/advpack/Makefile dlls/advpack/tests/Makefile dlls/amstream/Makefile dlls/atl/Makefile dlls/avicap32/Makefile dlls/avifil32/Makefile dlls/cabinet/Makefile dlls/cabinet/tests/Makefile dlls/capi2032/Makefile dlls/cards/Makefile dlls/cfgmgr32/Makefile dlls/clusapi/Makefile dlls/comcat/Makefile dlls/comcat/tests/Makefile dlls/comctl32/Makefile dlls/comctl32/tests/Makefile dlls/comdlg32/Makefile dlls/comdlg32/tests/Makefile dlls/compstui/Makefile dlls/crtdll/Makefile dlls/crypt32/Makefile dlls/crypt32/tests/Makefile dlls/cryptdll/Makefile dlls/cryptnet/Makefile dlls/ctl3d32/Makefile dlls/d3d8/Makefile dlls/d3d8/tests/Makefile dlls/d3d9/Makefile dlls/d3d9/tests/Makefile dlls/d3dim/Makefile dlls/d3drm/Makefile dlls/d3dx8/Makefile dlls/d3dxof/Makefile dlls/dbghelp/Makefile dlls/dciman32/Makefile dlls/ddraw/Makefile dlls/ddraw/tests/Makefile dlls/devenum/Makefile dlls/dinput/Makefile dlls/dinput/tests/Makefile dlls/dinput8/Makefile dlls/dmband/Makefile dlls/dmcompos/Makefile dlls/dmime/Makefile dlls/dmloader/Makefile dlls/dmscript/Makefile dlls/dmstyle/Makefile dlls/dmsynth/Makefile dlls/dmusic/Makefile dlls/dmusic32/Makefile dlls/dnsapi/Makefile dlls/dnsapi/tests/Makefile dlls/dplay/Makefile dlls/dplayx/Makefile dlls/dpnet/Makefile dlls/dpnhpast/Makefile dlls/dsound/Makefile dlls/dsound/tests/Makefile dlls/dswave/Makefile dlls/dxdiagn/Makefile dlls/dxerr8/Makefile dlls/dxerr9/Makefile dlls/dxguid/Makefile dlls/gdi32/Makefile dlls/gdi32/tests/Makefile dlls/glu32/Makefile dlls/glut32/Makefile dlls/gphoto2.ds/Makefile dlls/hhctrl.ocx/Makefile dlls/hid/Makefile dlls/hlink/Makefile dlls/hlink/tests/Makefile dlls/iccvid/Makefile dlls/icmp/Makefile dlls/ifsmgr.vxd/Makefile dlls/imaadp32.acm/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile dlls/infosoft/Makefile dlls/infosoft/tests/Makefile dlls/inseng/Makefile dlls/iphlpapi/Makefile dlls/iphlpapi/tests/Makefile dlls/itss/Makefile dlls/kernel32/Makefile dlls/kernel32/tests/Makefile dlls/localspl/Makefile dlls/localspl/tests/Makefile dlls/lz32/Makefile dlls/lz32/tests/Makefile dlls/mapi32/Makefile dlls/mapi32/tests/Makefile dlls/mciavi32/Makefile dlls/mcicda/Makefile dlls/mciseq/Makefile dlls/mciwave/Makefile dlls/midimap/Makefile dlls/mlang/Makefile dlls/mlang/tests/Makefile dlls/mmdevldr.vxd/Makefile dlls/monodebg.vxd/Makefile dlls/mpr/Makefile dlls/mprapi/Makefile dlls/msacm32.drv/Makefile dlls/msacm32/Makefile dlls/msacm32/tests/Makefile dlls/msadp32.acm/Makefile dlls/mscms/Makefile dlls/mscms/tests/Makefile dlls/mscoree/Makefile dlls/msdmo/Makefile dlls/msftedit/Makefile dlls/msg711.acm/Makefile dlls/mshtml/Makefile dlls/mshtml/tests/Makefile dlls/msi/Makefile dlls/msi/tests/Makefile dlls/msimg32/Makefile dlls/msisys.ocx/Makefile dlls/msnet32/Makefile dlls/msrle32/Makefile dlls/msvcrt/Makefile dlls/msvcrt/tests/Makefile dlls/msvcrt20/Makefile dlls/msvcrt40/Makefile dlls/msvcrtd/Makefile dlls/msvcrtd/tests/Makefile dlls/msvfw32/Makefile dlls/msvidc32/Makefile dlls/mswsock/Makefile dlls/msxml3/Makefile dlls/msxml3/tests/Makefile dlls/nddeapi/Makefile dlls/netapi32/Makefile dlls/netapi32/tests/Makefile dlls/newdev/Makefile dlls/ntdll/Makefile dlls/ntdll/tests/Makefile dlls/ntdsapi/Makefile dlls/objsel/Makefile dlls/odbc32/Makefile dlls/odbccp32/Makefile dlls/ole32/Makefile dlls/ole32/tests/Makefile dlls/oleacc/Makefile dlls/oleaut32/Makefile dlls/oleaut32/tests/Makefile dlls/olecli32/Makefile dlls/oledlg/Makefile dlls/olepro32/Makefile dlls/olesvr32/Makefile dlls/opengl32/Makefile dlls/powrprof/Makefile dlls/psapi/Makefile dlls/psapi/tests/Makefile dlls/pstorec/Makefile dlls/qcap/Makefile dlls/quartz/Makefile dlls/quartz/tests/Makefile dlls/query/Makefile dlls/rasapi32/Makefile dlls/resutils/Makefile dlls/riched20/Makefile dlls/riched20/tests/Makefile dlls/riched32/Makefile dlls/rpcrt4/Makefile dlls/rpcrt4/tests/Makefile dlls/rsabase/Makefile dlls/rsabase/tests/Makefile dlls/rsaenh/Makefile dlls/rsaenh/tests/Makefile dlls/sane.ds/Makefile dlls/secur32/Makefile dlls/secur32/tests/Makefile dlls/security/Makefile dlls/sensapi/Makefile dlls/serialui/Makefile dlls/setupapi/Makefile dlls/setupapi/tests/Makefile dlls/sfc/Makefile dlls/shdoclc/Makefile dlls/shdocvw/Makefile dlls/shdocvw/tests/Makefile dlls/shell32/Makefile dlls/shell32/tests/Makefile dlls/shfolder/Makefile dlls/shlwapi/Makefile dlls/shlwapi/tests/Makefile dlls/snmpapi/Makefile dlls/spoolss/Makefile dlls/stdole2.tlb/Makefile dlls/stdole32.tlb/Makefile dlls/sti/Makefile dlls/strmiids/Makefile dlls/svrapi/Makefile dlls/tapi32/Makefile dlls/twain_32/Makefile dlls/unicows/Makefile dlls/url/Makefile dlls/urlmon/Makefile dlls/urlmon/tests/Makefile dlls/user32/Makefile dlls/user32/tests/Makefile dlls/userenv/Makefile dlls/usp10/Makefile dlls/usp10/tests/Makefile dlls/uuid/Makefile dlls/uxtheme/Makefile dlls/uxtheme/tests/Makefile dlls/vdhcp.vxd/Makefile dlls/vdmdbg/Makefile dlls/version/Makefile dlls/version/tests/Makefile dlls/vmm.vxd/Makefile dlls/vnbt.vxd/Makefile dlls/vnetbios.vxd/Makefile dlls/vtdapi.vxd/Makefile dlls/vwin32.vxd/Makefile dlls/w32skrnl/Makefile dlls/winecrt0/Makefile dlls/wined3d/Makefile dlls/winedos/Makefile dlls/winemp3.acm/Makefile dlls/wineps.drv/Makefile dlls/winequartz.drv/Makefile dlls/winex11.drv/Makefile dlls/wininet/Makefile dlls/wininet/tests/Makefile dlls/winmm/Makefile dlls/winmm/joystick/Makefile dlls/winmm/tests/Makefile dlls/winmm/winealsa/Makefile dlls/winmm/winearts/Makefile dlls/winmm/wineaudioio/Makefile dlls/winmm/winecoreaudio/Makefile dlls/winmm/wineesd/Makefile dlls/winmm/winejack/Makefile dlls/winmm/winenas/Makefile dlls/winmm/wineoss/Makefile dlls/winnls32/Makefile dlls/winspool.drv/Makefile dlls/winspool.drv/tests/Makefile dlls/wintab32/Makefile dlls/wintrust/Makefile dlls/wintrust/tests/Makefile dlls/wldap32/Makefile dlls/wnaspi32/Makefile dlls/wow32/Makefile dlls/ws2_32/Makefile dlls/ws2_32/tests/Makefile dlls/wsock32/Makefile dlls/wtsapi32/Makefile documentation/Makefile fonts/Makefile include/Makefile libs/Makefile libs/port/Makefile libs/wine/Makefile libs/wpp/Makefile loader/Makefile programs/Makefile programs/clock/Makefile programs/cmd/Makefile programs/cmdlgtst/Makefile programs/control/Makefile programs/eject/Makefile programs/expand/Makefile programs/explorer/Makefile programs/hh/Makefile programs/icinfo/Makefile programs/iexplore/Makefile programs/msiexec/Makefile programs/notepad/Makefile programs/oleview/Makefile programs/progman/Makefile programs/regedit/Makefile programs/regsvr32/Makefile programs/rpcss/Makefile programs/rundll32/Makefile programs/start/Makefile programs/taskmgr/Makefile programs/uninstaller/Makefile programs/view/Makefile programs/wineboot/Makefile programs/winebrowser/Makefile programs/winecfg/Makefile programs/wineconsole/Makefile programs/winedbg/Makefile programs/winefile/Makefile programs/winemenubuilder/Makefile programs/winemine/Makefile programs/winepath/Makefile programs/winetest/Makefile programs/winevdm/Makefile programs/winhelp/Makefile programs/winver/Makefile programs/wordpad/Makefile server/Makefile tools/Makefile tools/widl/Makefile tools/winebuild/Makefile tools/winedump/Makefile tools/winegcc/Makefile tools/wmc/Makefile tools/wrc/Makefile"
 
 
 cat >confcache <<\_ACEOF
@@ -24273,7 +24273,7 @@ do
     "dlls/gdi32/enhmfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/enhmfdrv" ;;
     "dlls/gdi32/mfdrv") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/gdi32/mfdrv" ;;
     "dlls/kernel32/nls") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/kernel32/nls" ;;
-    "dlls/user/resources") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user/resources" ;;
+    "dlls/user32/resources") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/user32/resources" ;;
     "dlls/wineps.drv/data") CONFIG_COMMANDS="$CONFIG_COMMANDS dlls/wineps.drv/data" ;;
     "include/wine") CONFIG_COMMANDS="$CONFIG_COMMANDS include/wine" ;;
     "Make.rules") CONFIG_FILES="$CONFIG_FILES Make.rules" ;;
@@ -24487,8 +24487,8 @@ do
     "dlls/url/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/url/Makefile" ;;
     "dlls/urlmon/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/Makefile" ;;
     "dlls/urlmon/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/urlmon/tests/Makefile" ;;
-    "dlls/user/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user/Makefile" ;;
-    "dlls/user/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user/tests/Makefile" ;;
+    "dlls/user32/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/Makefile" ;;
+    "dlls/user32/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/user32/tests/Makefile" ;;
     "dlls/userenv/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/userenv/Makefile" ;;
     "dlls/usp10/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/Makefile" ;;
     "dlls/usp10/tests/Makefile") CONFIG_FILES="$CONFIG_FILES dlls/usp10/tests/Makefile" ;;
@@ -25292,8 +25292,8 @@ echo "$as_me: creating dlls/gdi32/enhmfdrv" >&6;} && mkdir "dlls/gdi32/enhmfdrv"
 echo "$as_me: creating dlls/gdi32/mfdrv" >&6;} && mkdir "dlls/gdi32/mfdrv") ;;
     "dlls/kernel32/nls":C) test -d "dlls/kernel32/nls" || ({ echo "$as_me:$LINENO: creating dlls/kernel32/nls" >&5
 echo "$as_me: creating dlls/kernel32/nls" >&6;} && mkdir "dlls/kernel32/nls") ;;
-    "dlls/user/resources":C) test -d "dlls/user/resources" || ({ echo "$as_me:$LINENO: creating dlls/user/resources" >&5
-echo "$as_me: creating dlls/user/resources" >&6;} && mkdir "dlls/user/resources") ;;
+    "dlls/user32/resources":C) test -d "dlls/user32/resources" || ({ echo "$as_me:$LINENO: creating dlls/user32/resources" >&5
+echo "$as_me: creating dlls/user32/resources" >&6;} && mkdir "dlls/user32/resources") ;;
     "dlls/wineps.drv/data":C) test -d "dlls/wineps.drv/data" || ({ echo "$as_me:$LINENO: creating dlls/wineps.drv/data" >&5
 echo "$as_me: creating dlls/wineps.drv/data" >&6;} && mkdir "dlls/wineps.drv/data") ;;
     "include/wine":C) test -d "include/wine" || ({ echo "$as_me:$LINENO: creating include/wine" >&5
diff --git a/configure.ac b/configure.ac
index 37cc2ae9ed1..ab3556b81a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1498,7 +1498,7 @@ AC_CONFIG_COMMANDS([include/stamp-h], [echo timestamp > include/stamp-h])
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/enhmfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/gdi32/mfdrv)
 WINE_CONFIG_EXTRA_DIR(dlls/kernel32/nls)
-WINE_CONFIG_EXTRA_DIR(dlls/user/resources)
+WINE_CONFIG_EXTRA_DIR(dlls/user32/resources)
 WINE_CONFIG_EXTRA_DIR(dlls/wineps.drv/data)
 WINE_CONFIG_EXTRA_DIR(include/wine)
 
@@ -1729,8 +1729,8 @@ dlls/unicows/Makefile
 dlls/url/Makefile
 dlls/urlmon/Makefile
 dlls/urlmon/tests/Makefile
-dlls/user/Makefile
-dlls/user/tests/Makefile
+dlls/user32/Makefile
+dlls/user32/tests/Makefile
 dlls/userenv/Makefile
 dlls/usp10/Makefile
 dlls/usp10/tests/Makefile
diff --git a/dlls/.gitignore b/dlls/.gitignore
index 372ddaf6c07..7ac473bf051 100644
--- a/dlls/.gitignore
+++ b/dlls/.gitignore
@@ -17,7 +17,6 @@
 /imm.dll16
 /keyboard.drv16
 /krnl386.exe16
-/libuser32.def
 /libwinspool.def
 /lzexpand.dll16
 /mmsystem.dll16
@@ -155,7 +154,7 @@ tapi32/libtapi32.def
 unicows/libunicows.def
 url/liburl.def
 urlmon/liburlmon.def
-user/libuser32.def
+user32/libuser32.def
 usp10/libusp10.def
 uxtheme/libuxtheme.def
 vdmdbg/libvdmdbg.def
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index 41b0a5e428c..69e95d92e60 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -169,7 +169,7 @@ BASEDIRS = \
 	unicows \
 	url \
 	urlmon \
-	user \
+	user32 \
 	userenv \
 	usp10 \
 	uxtheme \
@@ -261,7 +261,7 @@ TESTSUBDIRS = \
 	shell32/tests \
 	shlwapi/tests \
 	urlmon/tests \
-	user/tests \
+	user32/tests \
 	usp10/tests \
 	uxtheme/tests \
 	version/tests \
@@ -344,7 +344,6 @@ WIN16_FILES = \
 SYMLINKS_SO = \
 	@WIN16_FILES@ \
 	joystick.drv.so \
-	user32.dll.so \
 	winealsa.drv.so \
 	winearts.drv.so \
 	wineaudioio.drv.so \
@@ -369,9 +368,6 @@ symlinks: $(BUILDSUBDIRS)
 joystick.drv.so: winmm/joystick/joystick.drv.so
 	$(RM) $@ && $(LN_S) winmm/joystick/joystick.drv.so $@
 
-user32.dll.so: user/user32.dll.so
-	$(RM) $@ && $(LN_S) user/user32.dll.so $@
-
 winealsa.drv.so: winmm/winealsa/winealsa.drv.so
 	$(RM) $@ && $(LN_S) winmm/winealsa/winealsa.drv.so $@
 
@@ -484,7 +480,6 @@ winsock.dll16:
 STATIC_IMPLIBEXT = $(IMPLIBEXT:def=def.a)
 
 IMPORT_SYMLINKS = \
-	libuser32.$(IMPLIBEXT) \
 	libwinspool.$(IMPLIBEXT)
 
 IMPORT_LIBS = \
@@ -596,7 +591,7 @@ IMPORT_LIBS = \
 	unicows/libunicows.$(IMPLIBEXT) \
 	url/liburl.$(IMPLIBEXT) \
 	urlmon/liburlmon.$(IMPLIBEXT) \
-	user/libuser32.$(IMPLIBEXT) \
+	user32/libuser32.$(IMPLIBEXT) \
 	usp10/libusp10.$(IMPLIBEXT) \
 	uxtheme/libuxtheme.$(IMPLIBEXT) \
 	vdmdbg/libvdmdbg.$(IMPLIBEXT) \
@@ -921,8 +916,8 @@ url/liburl.$(IMPLIBEXT): url/url.spec $(WINEBUILD)
 urlmon/liburlmon.$(IMPLIBEXT): urlmon/urlmon.spec $(WINEBUILD)
 	@cd urlmon && $(MAKE) liburlmon.$(IMPLIBEXT)
 
-user/libuser32.$(IMPLIBEXT): user/user32.spec $(WINEBUILD)
-	@cd user && $(MAKE) libuser32.$(IMPLIBEXT)
+user32/libuser32.$(IMPLIBEXT): user32/user32.spec $(WINEBUILD)
+	@cd user32 && $(MAKE) libuser32.$(IMPLIBEXT)
 
 usp10/libusp10.$(IMPLIBEXT): usp10/usp10.spec $(WINEBUILD)
 	@cd usp10 && $(MAKE) libusp10.$(IMPLIBEXT)
@@ -978,9 +973,6 @@ wsock32/libwsock32.$(IMPLIBEXT): wsock32/wsock32.spec $(WINEBUILD)
 wtsapi32/libwtsapi32.$(IMPLIBEXT): wtsapi32/wtsapi32.spec $(WINEBUILD)
 	@cd wtsapi32 && $(MAKE) libwtsapi32.$(IMPLIBEXT)
 
-libuser32.$(IMPLIBEXT): user/libuser32.$(IMPLIBEXT)
-	$(RM) $@ && $(LN_S) user/libuser32.$(IMPLIBEXT) $@
-
 libwinspool.$(IMPLIBEXT): winspool.drv/libwinspool.$(IMPLIBEXT)
 	$(RM) $@ && $(LN_S) winspool.drv/libwinspool.$(IMPLIBEXT) $@
 
@@ -990,7 +982,6 @@ $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__install-lib__): $(IMPOR
 # Map library name to the corresponding directory
 
 winmm/joystick/joystick.drv.so: winmm/joystick
-user/user32.dll.so: user
 winmm/winealsa/winealsa.drv.so: winmm/winealsa
 winmm/winearts/winearts.drv.so: winmm/winearts
 winmm/wineaudioio/wineaudioio.drv.so: winmm/wineaudioio
diff --git a/dlls/user/Makefile.in b/dlls/user32/Makefile.in
similarity index 100%
rename from dlls/user/Makefile.in
rename to dlls/user32/Makefile.in
diff --git a/dlls/user/bidi16.c b/dlls/user32/bidi16.c
similarity index 100%
rename from dlls/user/bidi16.c
rename to dlls/user32/bidi16.c
diff --git a/dlls/user/button.c b/dlls/user32/button.c
similarity index 100%
rename from dlls/user/button.c
rename to dlls/user32/button.c
diff --git a/dlls/user/caret.c b/dlls/user32/caret.c
similarity index 100%
rename from dlls/user/caret.c
rename to dlls/user32/caret.c
diff --git a/dlls/user/class.c b/dlls/user32/class.c
similarity index 100%
rename from dlls/user/class.c
rename to dlls/user32/class.c
diff --git a/dlls/user/clipboard.c b/dlls/user32/clipboard.c
similarity index 100%
rename from dlls/user/clipboard.c
rename to dlls/user32/clipboard.c
diff --git a/dlls/user/combo.c b/dlls/user32/combo.c
similarity index 100%
rename from dlls/user/combo.c
rename to dlls/user32/combo.c
diff --git a/dlls/user/comm16.c b/dlls/user32/comm16.c
similarity index 100%
rename from dlls/user/comm16.c
rename to dlls/user32/comm16.c
diff --git a/dlls/user/controls.h b/dlls/user32/controls.h
similarity index 100%
rename from dlls/user/controls.h
rename to dlls/user32/controls.h
diff --git a/dlls/user/cursoricon.c b/dlls/user32/cursoricon.c
similarity index 100%
rename from dlls/user/cursoricon.c
rename to dlls/user32/cursoricon.c
diff --git a/dlls/user/dde_client.c b/dlls/user32/dde_client.c
similarity index 100%
rename from dlls/user/dde_client.c
rename to dlls/user32/dde_client.c
diff --git a/dlls/user/dde_misc.c b/dlls/user32/dde_misc.c
similarity index 100%
rename from dlls/user/dde_misc.c
rename to dlls/user32/dde_misc.c
diff --git a/dlls/user/dde_private.h b/dlls/user32/dde_private.h
similarity index 100%
rename from dlls/user/dde_private.h
rename to dlls/user32/dde_private.h
diff --git a/dlls/user/dde_server.c b/dlls/user32/dde_server.c
similarity index 100%
rename from dlls/user/dde_server.c
rename to dlls/user32/dde_server.c
diff --git a/dlls/user/ddeml.spec b/dlls/user32/ddeml.spec
similarity index 100%
rename from dlls/user/ddeml.spec
rename to dlls/user32/ddeml.spec
diff --git a/dlls/user/ddeml16.c b/dlls/user32/ddeml16.c
similarity index 100%
rename from dlls/user/ddeml16.c
rename to dlls/user32/ddeml16.c
diff --git a/dlls/user/defdlg.c b/dlls/user32/defdlg.c
similarity index 100%
rename from dlls/user/defdlg.c
rename to dlls/user32/defdlg.c
diff --git a/dlls/user/defwnd.c b/dlls/user32/defwnd.c
similarity index 100%
rename from dlls/user/defwnd.c
rename to dlls/user32/defwnd.c
diff --git a/dlls/user/desktop.c b/dlls/user32/desktop.c
similarity index 100%
rename from dlls/user/desktop.c
rename to dlls/user32/desktop.c
diff --git a/dlls/user/dialog.c b/dlls/user32/dialog.c
similarity index 100%
rename from dlls/user/dialog.c
rename to dlls/user32/dialog.c
diff --git a/dlls/user/dialog16.c b/dlls/user32/dialog16.c
similarity index 100%
rename from dlls/user/dialog16.c
rename to dlls/user32/dialog16.c
diff --git a/dlls/user/display.c b/dlls/user32/display.c
similarity index 100%
rename from dlls/user/display.c
rename to dlls/user32/display.c
diff --git a/dlls/user/display.drv.spec b/dlls/user32/display.drv.spec
similarity index 100%
rename from dlls/user/display.drv.spec
rename to dlls/user32/display.drv.spec
diff --git a/dlls/user/driver.c b/dlls/user32/driver.c
similarity index 100%
rename from dlls/user/driver.c
rename to dlls/user32/driver.c
diff --git a/dlls/user/driver16.c b/dlls/user32/driver16.c
similarity index 100%
rename from dlls/user/driver16.c
rename to dlls/user32/driver16.c
diff --git a/dlls/user/edit.c b/dlls/user32/edit.c
similarity index 100%
rename from dlls/user/edit.c
rename to dlls/user32/edit.c
diff --git a/dlls/user/exticon.c b/dlls/user32/exticon.c
similarity index 100%
rename from dlls/user/exticon.c
rename to dlls/user32/exticon.c
diff --git a/dlls/user/focus.c b/dlls/user32/focus.c
similarity index 100%
rename from dlls/user/focus.c
rename to dlls/user32/focus.c
diff --git a/dlls/user/hook.c b/dlls/user32/hook.c
similarity index 100%
rename from dlls/user/hook.c
rename to dlls/user32/hook.c
diff --git a/dlls/user/hook16.c b/dlls/user32/hook16.c
similarity index 100%
rename from dlls/user/hook16.c
rename to dlls/user32/hook16.c
diff --git a/dlls/user/icontitle.c b/dlls/user32/icontitle.c
similarity index 100%
rename from dlls/user/icontitle.c
rename to dlls/user32/icontitle.c
diff --git a/dlls/user/input.c b/dlls/user32/input.c
similarity index 100%
rename from dlls/user/input.c
rename to dlls/user32/input.c
diff --git a/dlls/user/kbd16.c b/dlls/user32/kbd16.c
similarity index 100%
rename from dlls/user/kbd16.c
rename to dlls/user32/kbd16.c
diff --git a/dlls/user/keyboard.drv.spec b/dlls/user32/keyboard.drv.spec
similarity index 100%
rename from dlls/user/keyboard.drv.spec
rename to dlls/user32/keyboard.drv.spec
diff --git a/dlls/user/listbox.c b/dlls/user32/listbox.c
similarity index 100%
rename from dlls/user/listbox.c
rename to dlls/user32/listbox.c
diff --git a/dlls/user/lstr.c b/dlls/user32/lstr.c
similarity index 100%
rename from dlls/user/lstr.c
rename to dlls/user32/lstr.c
diff --git a/dlls/user/mdi.c b/dlls/user32/mdi.c
similarity index 100%
rename from dlls/user/mdi.c
rename to dlls/user32/mdi.c
diff --git a/dlls/user/menu.c b/dlls/user32/menu.c
similarity index 100%
rename from dlls/user/menu.c
rename to dlls/user32/menu.c
diff --git a/dlls/user/message.c b/dlls/user32/message.c
similarity index 100%
rename from dlls/user/message.c
rename to dlls/user32/message.c
diff --git a/dlls/user/misc.c b/dlls/user32/misc.c
similarity index 100%
rename from dlls/user/misc.c
rename to dlls/user32/misc.c
diff --git a/dlls/user/mouse.drv.spec b/dlls/user32/mouse.drv.spec
similarity index 100%
rename from dlls/user/mouse.drv.spec
rename to dlls/user32/mouse.drv.spec
diff --git a/dlls/user/mouse16.c b/dlls/user32/mouse16.c
similarity index 100%
rename from dlls/user/mouse16.c
rename to dlls/user32/mouse16.c
diff --git a/dlls/user/msg16.c b/dlls/user32/msg16.c
similarity index 100%
rename from dlls/user/msg16.c
rename to dlls/user32/msg16.c
diff --git a/dlls/user/msgbox.c b/dlls/user32/msgbox.c
similarity index 100%
rename from dlls/user/msgbox.c
rename to dlls/user32/msgbox.c
diff --git a/dlls/user/network.c b/dlls/user32/network.c
similarity index 100%
rename from dlls/user/network.c
rename to dlls/user32/network.c
diff --git a/dlls/user/nonclient.c b/dlls/user32/nonclient.c
similarity index 100%
rename from dlls/user/nonclient.c
rename to dlls/user32/nonclient.c
diff --git a/dlls/user/painting.c b/dlls/user32/painting.c
similarity index 100%
rename from dlls/user/painting.c
rename to dlls/user32/painting.c
diff --git a/dlls/user/property.c b/dlls/user32/property.c
similarity index 100%
rename from dlls/user/property.c
rename to dlls/user32/property.c
diff --git a/dlls/user/resource.c b/dlls/user32/resource.c
similarity index 100%
rename from dlls/user/resource.c
rename to dlls/user32/resource.c
diff --git a/dlls/user/resources/display.rc b/dlls/user32/resources/display.rc
similarity index 100%
rename from dlls/user/resources/display.rc
rename to dlls/user32/resources/display.rc
diff --git a/dlls/user/resources/mouse.rc b/dlls/user32/resources/mouse.rc
similarity index 100%
rename from dlls/user/resources/mouse.rc
rename to dlls/user32/resources/mouse.rc
diff --git a/dlls/user/resources/user32.rc b/dlls/user32/resources/user32.rc
similarity index 100%
rename from dlls/user/resources/user32.rc
rename to dlls/user32/resources/user32.rc
diff --git a/dlls/user/resources/user32_Bg.rc b/dlls/user32/resources/user32_Bg.rc
similarity index 100%
rename from dlls/user/resources/user32_Bg.rc
rename to dlls/user32/resources/user32_Bg.rc
diff --git a/dlls/user/resources/user32_Ca.rc b/dlls/user32/resources/user32_Ca.rc
similarity index 100%
rename from dlls/user/resources/user32_Ca.rc
rename to dlls/user32/resources/user32_Ca.rc
diff --git a/dlls/user/resources/user32_Cs.rc b/dlls/user32/resources/user32_Cs.rc
similarity index 100%
rename from dlls/user/resources/user32_Cs.rc
rename to dlls/user32/resources/user32_Cs.rc
diff --git a/dlls/user/resources/user32_Da.rc b/dlls/user32/resources/user32_Da.rc
similarity index 100%
rename from dlls/user/resources/user32_Da.rc
rename to dlls/user32/resources/user32_Da.rc
diff --git a/dlls/user/resources/user32_De.rc b/dlls/user32/resources/user32_De.rc
similarity index 100%
rename from dlls/user/resources/user32_De.rc
rename to dlls/user32/resources/user32_De.rc
diff --git a/dlls/user/resources/user32_En.rc b/dlls/user32/resources/user32_En.rc
similarity index 100%
rename from dlls/user/resources/user32_En.rc
rename to dlls/user32/resources/user32_En.rc
diff --git a/dlls/user/resources/user32_Eo.rc b/dlls/user32/resources/user32_Eo.rc
similarity index 100%
rename from dlls/user/resources/user32_Eo.rc
rename to dlls/user32/resources/user32_Eo.rc
diff --git a/dlls/user/resources/user32_Es.rc b/dlls/user32/resources/user32_Es.rc
similarity index 100%
rename from dlls/user/resources/user32_Es.rc
rename to dlls/user32/resources/user32_Es.rc
diff --git a/dlls/user/resources/user32_Fi.rc b/dlls/user32/resources/user32_Fi.rc
similarity index 100%
rename from dlls/user/resources/user32_Fi.rc
rename to dlls/user32/resources/user32_Fi.rc
diff --git a/dlls/user/resources/user32_Fr.rc b/dlls/user32/resources/user32_Fr.rc
similarity index 100%
rename from dlls/user/resources/user32_Fr.rc
rename to dlls/user32/resources/user32_Fr.rc
diff --git a/dlls/user/resources/user32_Hu.rc b/dlls/user32/resources/user32_Hu.rc
similarity index 100%
rename from dlls/user/resources/user32_Hu.rc
rename to dlls/user32/resources/user32_Hu.rc
diff --git a/dlls/user/resources/user32_It.rc b/dlls/user32/resources/user32_It.rc
similarity index 100%
rename from dlls/user/resources/user32_It.rc
rename to dlls/user32/resources/user32_It.rc
diff --git a/dlls/user/resources/user32_Ja.rc b/dlls/user32/resources/user32_Ja.rc
similarity index 100%
rename from dlls/user/resources/user32_Ja.rc
rename to dlls/user32/resources/user32_Ja.rc
diff --git a/dlls/user/resources/user32_Ko.rc b/dlls/user32/resources/user32_Ko.rc
similarity index 100%
rename from dlls/user/resources/user32_Ko.rc
rename to dlls/user32/resources/user32_Ko.rc
diff --git a/dlls/user/resources/user32_Nl.rc b/dlls/user32/resources/user32_Nl.rc
similarity index 100%
rename from dlls/user/resources/user32_Nl.rc
rename to dlls/user32/resources/user32_Nl.rc
diff --git a/dlls/user/resources/user32_No.rc b/dlls/user32/resources/user32_No.rc
similarity index 100%
rename from dlls/user/resources/user32_No.rc
rename to dlls/user32/resources/user32_No.rc
diff --git a/dlls/user/resources/user32_Pl.rc b/dlls/user32/resources/user32_Pl.rc
similarity index 100%
rename from dlls/user/resources/user32_Pl.rc
rename to dlls/user32/resources/user32_Pl.rc
diff --git a/dlls/user/resources/user32_Pt.rc b/dlls/user32/resources/user32_Pt.rc
similarity index 100%
rename from dlls/user/resources/user32_Pt.rc
rename to dlls/user32/resources/user32_Pt.rc
diff --git a/dlls/user/resources/user32_Ru.rc b/dlls/user32/resources/user32_Ru.rc
similarity index 100%
rename from dlls/user/resources/user32_Ru.rc
rename to dlls/user32/resources/user32_Ru.rc
diff --git a/dlls/user/resources/user32_Si.rc b/dlls/user32/resources/user32_Si.rc
similarity index 100%
rename from dlls/user/resources/user32_Si.rc
rename to dlls/user32/resources/user32_Si.rc
diff --git a/dlls/user/resources/user32_Sk.rc b/dlls/user32/resources/user32_Sk.rc
similarity index 100%
rename from dlls/user/resources/user32_Sk.rc
rename to dlls/user32/resources/user32_Sk.rc
diff --git a/dlls/user/resources/user32_Sv.rc b/dlls/user32/resources/user32_Sv.rc
similarity index 100%
rename from dlls/user/resources/user32_Sv.rc
rename to dlls/user32/resources/user32_Sv.rc
diff --git a/dlls/user/resources/user32_Tr.rc b/dlls/user32/resources/user32_Tr.rc
similarity index 100%
rename from dlls/user/resources/user32_Tr.rc
rename to dlls/user32/resources/user32_Tr.rc
diff --git a/dlls/user/resources/user32_Uk.rc b/dlls/user32/resources/user32_Uk.rc
similarity index 100%
rename from dlls/user/resources/user32_Uk.rc
rename to dlls/user32/resources/user32_Uk.rc
diff --git a/dlls/user/resources/user32_Wa.rc b/dlls/user32/resources/user32_Wa.rc
similarity index 100%
rename from dlls/user/resources/user32_Wa.rc
rename to dlls/user32/resources/user32_Wa.rc
diff --git a/dlls/user/resources/user32_Zh.rc b/dlls/user32/resources/user32_Zh.rc
similarity index 100%
rename from dlls/user/resources/user32_Zh.rc
rename to dlls/user32/resources/user32_Zh.rc
diff --git a/dlls/user/resources/user32_bin.rc b/dlls/user32/resources/user32_bin.rc
similarity index 100%
rename from dlls/user/resources/user32_bin.rc
rename to dlls/user32/resources/user32_bin.rc
diff --git a/dlls/user/resources/version.rc b/dlls/user32/resources/version.rc
similarity index 100%
rename from dlls/user/resources/version.rc
rename to dlls/user32/resources/version.rc
diff --git a/dlls/user/resources/version16.rc b/dlls/user32/resources/version16.rc
similarity index 100%
rename from dlls/user/resources/version16.rc
rename to dlls/user32/resources/version16.rc
diff --git a/dlls/user/scroll.c b/dlls/user32/scroll.c
similarity index 100%
rename from dlls/user/scroll.c
rename to dlls/user32/scroll.c
diff --git a/dlls/user/spy.c b/dlls/user32/spy.c
similarity index 100%
rename from dlls/user/spy.c
rename to dlls/user32/spy.c
diff --git a/dlls/user/static.c b/dlls/user32/static.c
similarity index 100%
rename from dlls/user/static.c
rename to dlls/user32/static.c
diff --git a/dlls/user/sysparams.c b/dlls/user32/sysparams.c
similarity index 100%
rename from dlls/user/sysparams.c
rename to dlls/user32/sysparams.c
diff --git a/dlls/user/tests/Makefile.in b/dlls/user32/tests/Makefile.in
similarity index 100%
rename from dlls/user/tests/Makefile.in
rename to dlls/user32/tests/Makefile.in
diff --git a/dlls/user/tests/class.c b/dlls/user32/tests/class.c
similarity index 100%
rename from dlls/user/tests/class.c
rename to dlls/user32/tests/class.c
diff --git a/dlls/user/tests/clipboard.c b/dlls/user32/tests/clipboard.c
similarity index 100%
rename from dlls/user/tests/clipboard.c
rename to dlls/user32/tests/clipboard.c
diff --git a/dlls/user/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c
similarity index 100%
rename from dlls/user/tests/cursoricon.c
rename to dlls/user32/tests/cursoricon.c
diff --git a/dlls/user/tests/dce.c b/dlls/user32/tests/dce.c
similarity index 100%
rename from dlls/user/tests/dce.c
rename to dlls/user32/tests/dce.c
diff --git a/dlls/user/tests/dde.c b/dlls/user32/tests/dde.c
similarity index 100%
rename from dlls/user/tests/dde.c
rename to dlls/user32/tests/dde.c
diff --git a/dlls/user/tests/dialog.c b/dlls/user32/tests/dialog.c
similarity index 100%
rename from dlls/user/tests/dialog.c
rename to dlls/user32/tests/dialog.c
diff --git a/dlls/user/tests/edit.c b/dlls/user32/tests/edit.c
similarity index 100%
rename from dlls/user/tests/edit.c
rename to dlls/user32/tests/edit.c
diff --git a/dlls/user/tests/generated.c b/dlls/user32/tests/generated.c
similarity index 100%
rename from dlls/user/tests/generated.c
rename to dlls/user32/tests/generated.c
diff --git a/dlls/user/tests/input.c b/dlls/user32/tests/input.c
similarity index 100%
rename from dlls/user/tests/input.c
rename to dlls/user32/tests/input.c
diff --git a/dlls/user/tests/listbox.c b/dlls/user32/tests/listbox.c
similarity index 100%
rename from dlls/user/tests/listbox.c
rename to dlls/user32/tests/listbox.c
diff --git a/dlls/user/tests/menu.c b/dlls/user32/tests/menu.c
similarity index 100%
rename from dlls/user/tests/menu.c
rename to dlls/user32/tests/menu.c
diff --git a/dlls/user/tests/monitor.c b/dlls/user32/tests/monitor.c
similarity index 100%
rename from dlls/user/tests/monitor.c
rename to dlls/user32/tests/monitor.c
diff --git a/dlls/user/tests/msg.c b/dlls/user32/tests/msg.c
similarity index 100%
rename from dlls/user/tests/msg.c
rename to dlls/user32/tests/msg.c
diff --git a/dlls/user/tests/resource.c b/dlls/user32/tests/resource.c
similarity index 100%
rename from dlls/user/tests/resource.c
rename to dlls/user32/tests/resource.c
diff --git a/dlls/user/tests/resource.rc b/dlls/user32/tests/resource.rc
similarity index 100%
rename from dlls/user/tests/resource.rc
rename to dlls/user32/tests/resource.rc
diff --git a/dlls/user/tests/sysparams.c b/dlls/user32/tests/sysparams.c
similarity index 100%
rename from dlls/user/tests/sysparams.c
rename to dlls/user32/tests/sysparams.c
diff --git a/dlls/user/tests/text.c b/dlls/user32/tests/text.c
similarity index 100%
rename from dlls/user/tests/text.c
rename to dlls/user32/tests/text.c
diff --git a/dlls/user/tests/win.c b/dlls/user32/tests/win.c
similarity index 100%
rename from dlls/user/tests/win.c
rename to dlls/user32/tests/win.c
diff --git a/dlls/user/tests/winstation.c b/dlls/user32/tests/winstation.c
similarity index 100%
rename from dlls/user/tests/winstation.c
rename to dlls/user32/tests/winstation.c
diff --git a/dlls/user/tests/wsprintf.c b/dlls/user32/tests/wsprintf.c
similarity index 100%
rename from dlls/user/tests/wsprintf.c
rename to dlls/user32/tests/wsprintf.c
diff --git a/dlls/user/text.c b/dlls/user32/text.c
similarity index 100%
rename from dlls/user/text.c
rename to dlls/user32/text.c
diff --git a/dlls/user/uitools.c b/dlls/user32/uitools.c
similarity index 100%
rename from dlls/user/uitools.c
rename to dlls/user32/uitools.c
diff --git a/dlls/user/user.exe.spec b/dlls/user32/user.exe.spec
similarity index 100%
rename from dlls/user/user.exe.spec
rename to dlls/user32/user.exe.spec
diff --git a/dlls/user/user16.c b/dlls/user32/user16.c
similarity index 100%
rename from dlls/user/user16.c
rename to dlls/user32/user16.c
diff --git a/dlls/user/user32.spec b/dlls/user32/user32.spec
similarity index 100%
rename from dlls/user/user32.spec
rename to dlls/user32/user32.spec
diff --git a/dlls/user/user_main.c b/dlls/user32/user_main.c
similarity index 100%
rename from dlls/user/user_main.c
rename to dlls/user32/user_main.c
diff --git a/dlls/user/user_private.h b/dlls/user32/user_private.h
similarity index 100%
rename from dlls/user/user_private.h
rename to dlls/user32/user_private.h
diff --git a/dlls/user/win.c b/dlls/user32/win.c
similarity index 100%
rename from dlls/user/win.c
rename to dlls/user32/win.c
diff --git a/dlls/user/winhelp.c b/dlls/user32/winhelp.c
similarity index 100%
rename from dlls/user/winhelp.c
rename to dlls/user32/winhelp.c
diff --git a/dlls/user/winpos.c b/dlls/user32/winpos.c
similarity index 100%
rename from dlls/user/winpos.c
rename to dlls/user32/winpos.c
diff --git a/dlls/user/winproc.c b/dlls/user32/winproc.c
similarity index 100%
rename from dlls/user/winproc.c
rename to dlls/user32/winproc.c
diff --git a/dlls/user/winproc.h b/dlls/user32/winproc.h
similarity index 100%
rename from dlls/user/winproc.h
rename to dlls/user32/winproc.h
diff --git a/dlls/user/winstation.c b/dlls/user32/winstation.c
similarity index 100%
rename from dlls/user/winstation.c
rename to dlls/user32/winstation.c
diff --git a/dlls/user/wnd16.c b/dlls/user32/wnd16.c
similarity index 100%
rename from dlls/user/wnd16.c
rename to dlls/user32/wnd16.c
diff --git a/dlls/user/wsprintf.c b/dlls/user32/wsprintf.c
similarity index 100%
rename from dlls/user/wsprintf.c
rename to dlls/user32/wsprintf.c
diff --git a/programs/winetest/Makefile.in b/programs/winetest/Makefile.in
index 2b5bc185118..338a3fd5f50 100644
--- a/programs/winetest/Makefile.in
+++ b/programs/winetest/Makefile.in
@@ -168,8 +168,8 @@ shlwapi_test.exe: $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT)
 	cp $(DLLDIR)/shlwapi/tests/shlwapi_test.exe$(DLLEXT) $@ && $(STRIP) $@
 urlmon_test.exe: $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT)
 	cp $(DLLDIR)/urlmon/tests/urlmon_test.exe$(DLLEXT) $@ && $(STRIP) $@
-user32_test.exe: $(DLLDIR)/user/tests/user32_test.exe$(DLLEXT)
-	cp $(DLLDIR)/user/tests/user32_test.exe$(DLLEXT) $@ && $(STRIP) $@
+user32_test.exe: $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT)
+	cp $(DLLDIR)/user32/tests/user32_test.exe$(DLLEXT) $@ && $(STRIP) $@
 usp10_test.exe: $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT)
 	cp $(DLLDIR)/usp10/tests/usp10_test.exe$(DLLEXT) $@ && $(STRIP) $@
 uxtheme_test.exe: $(DLLDIR)/uxtheme/tests/uxtheme_test.exe$(DLLEXT)
diff --git a/tools/winapi/tests.dat b/tools/winapi/tests.dat
index 3776a001eec..8c159b3376e 100644
--- a/tools/winapi/tests.dat
+++ b/tools/winapi/tests.dat
@@ -1294,7 +1294,7 @@ REMSECURITY_ATTRIBUTES
 RemBINDINFO
 RemFORMATETC
 
-%%%dlls/user/tests
+%%%dlls/user32/tests
 
 %%pack