diff --git a/reactos/dll/comdlg32/cdlg.h b/reactos/dll/win32/comdlg32/cdlg.h
similarity index 100%
rename from reactos/dll/comdlg32/cdlg.h
rename to reactos/dll/win32/comdlg32/cdlg.h
diff --git a/reactos/dll/comdlg32/cdlg16.h b/reactos/dll/win32/comdlg32/cdlg16.h
similarity index 100%
rename from reactos/dll/comdlg32/cdlg16.h
rename to reactos/dll/win32/comdlg32/cdlg16.h
diff --git a/reactos/dll/comdlg32/cdlg32.c b/reactos/dll/win32/comdlg32/cdlg32.c
similarity index 100%
rename from reactos/dll/comdlg32/cdlg32.c
rename to reactos/dll/win32/comdlg32/cdlg32.c
diff --git a/reactos/dll/comdlg32/cdlg_Bg.rc b/reactos/dll/win32/comdlg32/cdlg_Bg.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Bg.rc
rename to reactos/dll/win32/comdlg32/cdlg_Bg.rc
diff --git a/reactos/dll/comdlg32/cdlg_Ca.rc b/reactos/dll/win32/comdlg32/cdlg_Ca.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Ca.rc
rename to reactos/dll/win32/comdlg32/cdlg_Ca.rc
diff --git a/reactos/dll/comdlg32/cdlg_Cn.rc b/reactos/dll/win32/comdlg32/cdlg_Cn.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Cn.rc
rename to reactos/dll/win32/comdlg32/cdlg_Cn.rc
diff --git a/reactos/dll/comdlg32/cdlg_Cs.rc b/reactos/dll/win32/comdlg32/cdlg_Cs.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Cs.rc
rename to reactos/dll/win32/comdlg32/cdlg_Cs.rc
diff --git a/reactos/dll/comdlg32/cdlg_Da.rc b/reactos/dll/win32/comdlg32/cdlg_Da.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Da.rc
rename to reactos/dll/win32/comdlg32/cdlg_Da.rc
diff --git a/reactos/dll/comdlg32/cdlg_De.rc b/reactos/dll/win32/comdlg32/cdlg_De.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_De.rc
rename to reactos/dll/win32/comdlg32/cdlg_De.rc
diff --git a/reactos/dll/comdlg32/cdlg_En.rc b/reactos/dll/win32/comdlg32/cdlg_En.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_En.rc
rename to reactos/dll/win32/comdlg32/cdlg_En.rc
diff --git a/reactos/dll/comdlg32/cdlg_Eo.rc b/reactos/dll/win32/comdlg32/cdlg_Eo.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Eo.rc
rename to reactos/dll/win32/comdlg32/cdlg_Eo.rc
diff --git a/reactos/dll/comdlg32/cdlg_Es.rc b/reactos/dll/win32/comdlg32/cdlg_Es.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Es.rc
rename to reactos/dll/win32/comdlg32/cdlg_Es.rc
diff --git a/reactos/dll/comdlg32/cdlg_Fi.rc b/reactos/dll/win32/comdlg32/cdlg_Fi.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Fi.rc
rename to reactos/dll/win32/comdlg32/cdlg_Fi.rc
diff --git a/reactos/dll/comdlg32/cdlg_Fr.rc b/reactos/dll/win32/comdlg32/cdlg_Fr.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Fr.rc
rename to reactos/dll/win32/comdlg32/cdlg_Fr.rc
diff --git a/reactos/dll/comdlg32/cdlg_Hu.rc b/reactos/dll/win32/comdlg32/cdlg_Hu.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Hu.rc
rename to reactos/dll/win32/comdlg32/cdlg_Hu.rc
diff --git a/reactos/dll/comdlg32/cdlg_It.rc b/reactos/dll/win32/comdlg32/cdlg_It.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_It.rc
rename to reactos/dll/win32/comdlg32/cdlg_It.rc
diff --git a/reactos/dll/comdlg32/cdlg_Ja.rc b/reactos/dll/win32/comdlg32/cdlg_Ja.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Ja.rc
rename to reactos/dll/win32/comdlg32/cdlg_Ja.rc
diff --git a/reactos/dll/comdlg32/cdlg_Ko.rc b/reactos/dll/win32/comdlg32/cdlg_Ko.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Ko.rc
rename to reactos/dll/win32/comdlg32/cdlg_Ko.rc
diff --git a/reactos/dll/comdlg32/cdlg_Nl.rc b/reactos/dll/win32/comdlg32/cdlg_Nl.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Nl.rc
rename to reactos/dll/win32/comdlg32/cdlg_Nl.rc
diff --git a/reactos/dll/comdlg32/cdlg_No.rc b/reactos/dll/win32/comdlg32/cdlg_No.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_No.rc
rename to reactos/dll/win32/comdlg32/cdlg_No.rc
diff --git a/reactos/dll/comdlg32/cdlg_Pl.rc b/reactos/dll/win32/comdlg32/cdlg_Pl.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Pl.rc
rename to reactos/dll/win32/comdlg32/cdlg_Pl.rc
diff --git a/reactos/dll/comdlg32/cdlg_Pt.rc b/reactos/dll/win32/comdlg32/cdlg_Pt.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Pt.rc
rename to reactos/dll/win32/comdlg32/cdlg_Pt.rc
diff --git a/reactos/dll/comdlg32/cdlg_Ru.rc b/reactos/dll/win32/comdlg32/cdlg_Ru.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Ru.rc
rename to reactos/dll/win32/comdlg32/cdlg_Ru.rc
diff --git a/reactos/dll/comdlg32/cdlg_Si.rc b/reactos/dll/win32/comdlg32/cdlg_Si.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Si.rc
rename to reactos/dll/win32/comdlg32/cdlg_Si.rc
diff --git a/reactos/dll/comdlg32/cdlg_Sk.rc b/reactos/dll/win32/comdlg32/cdlg_Sk.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Sk.rc
rename to reactos/dll/win32/comdlg32/cdlg_Sk.rc
diff --git a/reactos/dll/comdlg32/cdlg_Sv.rc b/reactos/dll/win32/comdlg32/cdlg_Sv.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Sv.rc
rename to reactos/dll/win32/comdlg32/cdlg_Sv.rc
diff --git a/reactos/dll/comdlg32/cdlg_Th.rc b/reactos/dll/win32/comdlg32/cdlg_Th.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Th.rc
rename to reactos/dll/win32/comdlg32/cdlg_Th.rc
diff --git a/reactos/dll/comdlg32/cdlg_Uk.rc b/reactos/dll/win32/comdlg32/cdlg_Uk.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Uk.rc
rename to reactos/dll/win32/comdlg32/cdlg_Uk.rc
diff --git a/reactos/dll/comdlg32/cdlg_Wa.rc b/reactos/dll/win32/comdlg32/cdlg_Wa.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Wa.rc
rename to reactos/dll/win32/comdlg32/cdlg_Wa.rc
diff --git a/reactos/dll/comdlg32/cdlg_Zh.rc b/reactos/dll/win32/comdlg32/cdlg_Zh.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_Zh.rc
rename to reactos/dll/win32/comdlg32/cdlg_Zh.rc
diff --git a/reactos/dll/comdlg32/cdlg_xx.rc b/reactos/dll/win32/comdlg32/cdlg_xx.rc
similarity index 100%
rename from reactos/dll/comdlg32/cdlg_xx.rc
rename to reactos/dll/win32/comdlg32/cdlg_xx.rc
diff --git a/reactos/dll/comdlg32/colordlg.c b/reactos/dll/win32/comdlg32/colordlg.c
similarity index 100%
rename from reactos/dll/comdlg32/colordlg.c
rename to reactos/dll/win32/comdlg32/colordlg.c
diff --git a/reactos/dll/comdlg32/colordlg16.c b/reactos/dll/win32/comdlg32/colordlg16.c
similarity index 100%
rename from reactos/dll/comdlg32/colordlg16.c
rename to reactos/dll/win32/comdlg32/colordlg16.c
diff --git a/reactos/dll/comdlg32/comdlg32.spec b/reactos/dll/win32/comdlg32/comdlg32.spec
similarity index 100%
rename from reactos/dll/comdlg32/comdlg32.spec
rename to reactos/dll/win32/comdlg32/comdlg32.spec
diff --git a/reactos/dll/comdlg32/comdlg32.xml b/reactos/dll/win32/comdlg32/comdlg32.xml
similarity index 100%
rename from reactos/dll/comdlg32/comdlg32.xml
rename to reactos/dll/win32/comdlg32/comdlg32.xml
diff --git a/reactos/dll/comdlg32/commdlg.spec b/reactos/dll/win32/comdlg32/commdlg.spec
similarity index 100%
rename from reactos/dll/comdlg32/commdlg.spec
rename to reactos/dll/win32/comdlg32/commdlg.spec
diff --git a/reactos/dll/comdlg32/filedlg.c b/reactos/dll/win32/comdlg32/filedlg.c
similarity index 100%
rename from reactos/dll/comdlg32/filedlg.c
rename to reactos/dll/win32/comdlg32/filedlg.c
diff --git a/reactos/dll/comdlg32/filedlg16.c b/reactos/dll/win32/comdlg32/filedlg16.c
similarity index 100%
rename from reactos/dll/comdlg32/filedlg16.c
rename to reactos/dll/win32/comdlg32/filedlg16.c
diff --git a/reactos/dll/comdlg32/filedlg31.c b/reactos/dll/win32/comdlg32/filedlg31.c
similarity index 100%
rename from reactos/dll/comdlg32/filedlg31.c
rename to reactos/dll/win32/comdlg32/filedlg31.c
diff --git a/reactos/dll/comdlg32/filedlg31.h b/reactos/dll/win32/comdlg32/filedlg31.h
similarity index 100%
rename from reactos/dll/comdlg32/filedlg31.h
rename to reactos/dll/win32/comdlg32/filedlg31.h
diff --git a/reactos/dll/comdlg32/filedlgbrowser.c b/reactos/dll/win32/comdlg32/filedlgbrowser.c
similarity index 100%
rename from reactos/dll/comdlg32/filedlgbrowser.c
rename to reactos/dll/win32/comdlg32/filedlgbrowser.c
diff --git a/reactos/dll/comdlg32/filedlgbrowser.h b/reactos/dll/win32/comdlg32/filedlgbrowser.h
similarity index 100%
rename from reactos/dll/comdlg32/filedlgbrowser.h
rename to reactos/dll/win32/comdlg32/filedlgbrowser.h
diff --git a/reactos/dll/comdlg32/filetitle.c b/reactos/dll/win32/comdlg32/filetitle.c
similarity index 100%
rename from reactos/dll/comdlg32/filetitle.c
rename to reactos/dll/win32/comdlg32/filetitle.c
diff --git a/reactos/dll/comdlg32/finddlg.c b/reactos/dll/win32/comdlg32/finddlg.c
similarity index 100%
rename from reactos/dll/comdlg32/finddlg.c
rename to reactos/dll/win32/comdlg32/finddlg.c
diff --git a/reactos/dll/comdlg32/finddlg32.c b/reactos/dll/win32/comdlg32/finddlg32.c
similarity index 100%
rename from reactos/dll/comdlg32/finddlg32.c
rename to reactos/dll/win32/comdlg32/finddlg32.c
diff --git a/reactos/dll/comdlg32/fontdlg.c b/reactos/dll/win32/comdlg32/fontdlg.c
similarity index 100%
rename from reactos/dll/comdlg32/fontdlg.c
rename to reactos/dll/win32/comdlg32/fontdlg.c
diff --git a/reactos/dll/comdlg32/fontdlg16.c b/reactos/dll/win32/comdlg32/fontdlg16.c
similarity index 100%
rename from reactos/dll/comdlg32/fontdlg16.c
rename to reactos/dll/win32/comdlg32/fontdlg16.c
diff --git a/reactos/dll/comdlg32/printdlg.c b/reactos/dll/win32/comdlg32/printdlg.c
similarity index 100%
rename from reactos/dll/comdlg32/printdlg.c
rename to reactos/dll/win32/comdlg32/printdlg.c
diff --git a/reactos/dll/comdlg32/printdlg.h b/reactos/dll/win32/comdlg32/printdlg.h
similarity index 100%
rename from reactos/dll/comdlg32/printdlg.h
rename to reactos/dll/win32/comdlg32/printdlg.h
diff --git a/reactos/dll/comdlg32/printdlg16.c b/reactos/dll/win32/comdlg32/printdlg16.c
similarity index 100%
rename from reactos/dll/comdlg32/printdlg16.c
rename to reactos/dll/win32/comdlg32/printdlg16.c
diff --git a/reactos/dll/comdlg32/rsrc.rc b/reactos/dll/win32/comdlg32/rsrc.rc
similarity index 100%
rename from reactos/dll/comdlg32/rsrc.rc
rename to reactos/dll/win32/comdlg32/rsrc.rc