diff --git a/reactos/dll/3rdparty/.gitignore b/reactos/dll/3rdparty/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/reactos/lib/cpl/access/De.rc b/reactos/dll/cpl/access/De.rc
similarity index 100%
rename from reactos/lib/cpl/access/De.rc
rename to reactos/dll/cpl/access/De.rc
diff --git a/reactos/lib/cpl/access/En.rc b/reactos/dll/cpl/access/En.rc
similarity index 100%
rename from reactos/lib/cpl/access/En.rc
rename to reactos/dll/cpl/access/En.rc
diff --git a/reactos/lib/cpl/access/Es.rc b/reactos/dll/cpl/access/Es.rc
similarity index 100%
rename from reactos/lib/cpl/access/Es.rc
rename to reactos/dll/cpl/access/Es.rc
diff --git a/reactos/lib/cpl/access/Fr.rc b/reactos/dll/cpl/access/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/access/Fr.rc
rename to reactos/dll/cpl/access/Fr.rc
diff --git a/reactos/lib/cpl/access/Hu.rc b/reactos/dll/cpl/access/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/access/Hu.rc
rename to reactos/dll/cpl/access/Hu.rc
diff --git a/reactos/lib/cpl/access/Ja.rc b/reactos/dll/cpl/access/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/access/Ja.rc
rename to reactos/dll/cpl/access/Ja.rc
diff --git a/reactos/lib/cpl/access/Nl.rc b/reactos/dll/cpl/access/Nl.rc
similarity index 100%
rename from reactos/lib/cpl/access/Nl.rc
rename to reactos/dll/cpl/access/Nl.rc
diff --git a/reactos/lib/cpl/access/Pl.rc b/reactos/dll/cpl/access/Pl.rc
similarity index 100%
rename from reactos/lib/cpl/access/Pl.rc
rename to reactos/dll/cpl/access/Pl.rc
diff --git a/reactos/lib/cpl/access/access.c b/reactos/dll/cpl/access/access.c
similarity index 100%
rename from reactos/lib/cpl/access/access.c
rename to reactos/dll/cpl/access/access.c
diff --git a/reactos/lib/cpl/access/access.def b/reactos/dll/cpl/access/access.def
similarity index 100%
rename from reactos/lib/cpl/access/access.def
rename to reactos/dll/cpl/access/access.def
diff --git a/reactos/lib/cpl/access/access.h b/reactos/dll/cpl/access/access.h
similarity index 100%
rename from reactos/lib/cpl/access/access.h
rename to reactos/dll/cpl/access/access.h
diff --git a/reactos/lib/cpl/access/access.rc b/reactos/dll/cpl/access/access.rc
similarity index 100%
rename from reactos/lib/cpl/access/access.rc
rename to reactos/dll/cpl/access/access.rc
diff --git a/reactos/lib/cpl/access/access.xml b/reactos/dll/cpl/access/access.xml
similarity index 100%
rename from reactos/lib/cpl/access/access.xml
rename to reactos/dll/cpl/access/access.xml
diff --git a/reactos/lib/cpl/access/display.c b/reactos/dll/cpl/access/display.c
similarity index 100%
rename from reactos/lib/cpl/access/display.c
rename to reactos/dll/cpl/access/display.c
diff --git a/reactos/lib/cpl/access/general.c b/reactos/dll/cpl/access/general.c
similarity index 100%
rename from reactos/lib/cpl/access/general.c
rename to reactos/dll/cpl/access/general.c
diff --git a/reactos/lib/cpl/access/keyboard.c b/reactos/dll/cpl/access/keyboard.c
similarity index 100%
rename from reactos/lib/cpl/access/keyboard.c
rename to reactos/dll/cpl/access/keyboard.c
diff --git a/reactos/lib/cpl/access/mouse.c b/reactos/dll/cpl/access/mouse.c
similarity index 100%
rename from reactos/lib/cpl/access/mouse.c
rename to reactos/dll/cpl/access/mouse.c
diff --git a/reactos/lib/cpl/access/resource.h b/reactos/dll/cpl/access/resource.h
similarity index 100%
rename from reactos/lib/cpl/access/resource.h
rename to reactos/dll/cpl/access/resource.h
diff --git a/reactos/lib/cpl/access/resources/applet.ico b/reactos/dll/cpl/access/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/access/resources/applet.ico
rename to reactos/dll/cpl/access/resources/applet.ico
diff --git a/reactos/lib/cpl/access/sound.c b/reactos/dll/cpl/access/sound.c
similarity index 100%
rename from reactos/lib/cpl/access/sound.c
rename to reactos/dll/cpl/access/sound.c
diff --git a/reactos/lib/cpl/appwiz/Cz.rc b/reactos/dll/cpl/appwiz/Cz.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Cz.rc
rename to reactos/dll/cpl/appwiz/Cz.rc
diff --git a/reactos/lib/cpl/appwiz/De.rc b/reactos/dll/cpl/appwiz/De.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/De.rc
rename to reactos/dll/cpl/appwiz/De.rc
diff --git a/reactos/lib/cpl/appwiz/Dk.rc b/reactos/dll/cpl/appwiz/Dk.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Dk.rc
rename to reactos/dll/cpl/appwiz/Dk.rc
diff --git a/reactos/lib/cpl/appwiz/En.rc b/reactos/dll/cpl/appwiz/En.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/En.rc
rename to reactos/dll/cpl/appwiz/En.rc
diff --git a/reactos/lib/cpl/appwiz/Es.rc b/reactos/dll/cpl/appwiz/Es.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Es.rc
rename to reactos/dll/cpl/appwiz/Es.rc
diff --git a/reactos/lib/cpl/appwiz/Fr.rc b/reactos/dll/cpl/appwiz/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Fr.rc
rename to reactos/dll/cpl/appwiz/Fr.rc
diff --git a/reactos/lib/cpl/appwiz/Gr.rc b/reactos/dll/cpl/appwiz/Gr.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Gr.rc
rename to reactos/dll/cpl/appwiz/Gr.rc
diff --git a/reactos/lib/cpl/appwiz/Hu.rc b/reactos/dll/cpl/appwiz/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Hu.rc
rename to reactos/dll/cpl/appwiz/Hu.rc
diff --git a/reactos/lib/cpl/appwiz/Ja.rc b/reactos/dll/cpl/appwiz/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Ja.rc
rename to reactos/dll/cpl/appwiz/Ja.rc
diff --git a/reactos/lib/cpl/appwiz/Nl.rc b/reactos/dll/cpl/appwiz/Nl.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Nl.rc
rename to reactos/dll/cpl/appwiz/Nl.rc
diff --git a/reactos/lib/cpl/appwiz/Pl.rc b/reactos/dll/cpl/appwiz/Pl.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Pl.rc
rename to reactos/dll/cpl/appwiz/Pl.rc
diff --git a/reactos/lib/cpl/appwiz/Ru.rc b/reactos/dll/cpl/appwiz/Ru.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/Ru.rc
rename to reactos/dll/cpl/appwiz/Ru.rc
diff --git a/reactos/lib/cpl/appwiz/appwiz.c b/reactos/dll/cpl/appwiz/appwiz.c
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.c
rename to reactos/dll/cpl/appwiz/appwiz.c
diff --git a/reactos/lib/cpl/appwiz/appwiz.def b/reactos/dll/cpl/appwiz/appwiz.def
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.def
rename to reactos/dll/cpl/appwiz/appwiz.def
diff --git a/reactos/lib/cpl/appwiz/appwiz.dsp b/reactos/dll/cpl/appwiz/appwiz.dsp
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.dsp
rename to reactos/dll/cpl/appwiz/appwiz.dsp
diff --git a/reactos/lib/cpl/appwiz/appwiz.dsw b/reactos/dll/cpl/appwiz/appwiz.dsw
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.dsw
rename to reactos/dll/cpl/appwiz/appwiz.dsw
diff --git a/reactos/lib/cpl/appwiz/appwiz.h b/reactos/dll/cpl/appwiz/appwiz.h
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.h
rename to reactos/dll/cpl/appwiz/appwiz.h
diff --git a/reactos/lib/cpl/appwiz/appwiz.rc b/reactos/dll/cpl/appwiz/appwiz.rc
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.rc
rename to reactos/dll/cpl/appwiz/appwiz.rc
diff --git a/reactos/lib/cpl/appwiz/appwiz.xml b/reactos/dll/cpl/appwiz/appwiz.xml
similarity index 100%
rename from reactos/lib/cpl/appwiz/appwiz.xml
rename to reactos/dll/cpl/appwiz/appwiz.xml
diff --git a/reactos/lib/cpl/appwiz/resource.h b/reactos/dll/cpl/appwiz/resource.h
similarity index 100%
rename from reactos/lib/cpl/appwiz/resource.h
rename to reactos/dll/cpl/appwiz/resource.h
diff --git a/reactos/lib/cpl/appwiz/resources/applet.ico b/reactos/dll/cpl/appwiz/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/appwiz/resources/applet.ico
rename to reactos/dll/cpl/appwiz/resources/applet.ico
diff --git a/reactos/lib/cpl/control/Cz.rc b/reactos/dll/cpl/control/Cz.rc
similarity index 100%
rename from reactos/lib/cpl/control/Cz.rc
rename to reactos/dll/cpl/control/Cz.rc
diff --git a/reactos/lib/cpl/control/De.rc b/reactos/dll/cpl/control/De.rc
similarity index 100%
rename from reactos/lib/cpl/control/De.rc
rename to reactos/dll/cpl/control/De.rc
diff --git a/reactos/lib/cpl/control/Dk.rc b/reactos/dll/cpl/control/Dk.rc
similarity index 100%
rename from reactos/lib/cpl/control/Dk.rc
rename to reactos/dll/cpl/control/Dk.rc
diff --git a/reactos/lib/cpl/control/En.rc b/reactos/dll/cpl/control/En.rc
similarity index 100%
rename from reactos/lib/cpl/control/En.rc
rename to reactos/dll/cpl/control/En.rc
diff --git a/reactos/lib/cpl/control/Es.rc b/reactos/dll/cpl/control/Es.rc
similarity index 100%
rename from reactos/lib/cpl/control/Es.rc
rename to reactos/dll/cpl/control/Es.rc
diff --git a/reactos/lib/cpl/control/Gr.rc b/reactos/dll/cpl/control/Gr.rc
similarity index 100%
rename from reactos/lib/cpl/control/Gr.rc
rename to reactos/dll/cpl/control/Gr.rc
diff --git a/reactos/lib/cpl/control/Hu.rc b/reactos/dll/cpl/control/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/control/Hu.rc
rename to reactos/dll/cpl/control/Hu.rc
diff --git a/reactos/lib/cpl/control/Ja.rc b/reactos/dll/cpl/control/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/control/Ja.rc
rename to reactos/dll/cpl/control/Ja.rc
diff --git a/reactos/lib/cpl/control/Nl.rc b/reactos/dll/cpl/control/Nl.rc
similarity index 100%
rename from reactos/lib/cpl/control/Nl.rc
rename to reactos/dll/cpl/control/Nl.rc
diff --git a/reactos/lib/cpl/control/Pl.rc b/reactos/dll/cpl/control/Pl.rc
similarity index 100%
rename from reactos/lib/cpl/control/Pl.rc
rename to reactos/dll/cpl/control/Pl.rc
diff --git a/reactos/lib/cpl/control/Ru.rc b/reactos/dll/cpl/control/Ru.rc
similarity index 100%
rename from reactos/lib/cpl/control/Ru.rc
rename to reactos/dll/cpl/control/Ru.rc
diff --git a/reactos/lib/cpl/control/Sv.rc b/reactos/dll/cpl/control/Sv.rc
similarity index 100%
rename from reactos/lib/cpl/control/Sv.rc
rename to reactos/dll/cpl/control/Sv.rc
diff --git a/reactos/lib/cpl/control/control.c b/reactos/dll/cpl/control/control.c
similarity index 100%
rename from reactos/lib/cpl/control/control.c
rename to reactos/dll/cpl/control/control.c
diff --git a/reactos/lib/cpl/control/control.dsp b/reactos/dll/cpl/control/control.dsp
similarity index 100%
rename from reactos/lib/cpl/control/control.dsp
rename to reactos/dll/cpl/control/control.dsp
diff --git a/reactos/lib/cpl/control/control.dsw b/reactos/dll/cpl/control/control.dsw
similarity index 100%
rename from reactos/lib/cpl/control/control.dsw
rename to reactos/dll/cpl/control/control.dsw
diff --git a/reactos/lib/cpl/control/control.rc b/reactos/dll/cpl/control/control.rc
similarity index 100%
rename from reactos/lib/cpl/control/control.rc
rename to reactos/dll/cpl/control/control.rc
diff --git a/reactos/lib/cpl/control/control.xml b/reactos/dll/cpl/control/control.xml
similarity index 100%
rename from reactos/lib/cpl/control/control.xml
rename to reactos/dll/cpl/control/control.xml
diff --git a/reactos/lib/cpl/control/resource.h b/reactos/dll/cpl/control/resource.h
similarity index 100%
rename from reactos/lib/cpl/control/resource.h
rename to reactos/dll/cpl/control/resource.h
diff --git a/reactos/lib/cpl/control/resources/config.ico b/reactos/dll/cpl/control/resources/config.ico
similarity index 100%
rename from reactos/lib/cpl/control/resources/config.ico
rename to reactos/dll/cpl/control/resources/config.ico
diff --git a/reactos/lib/cpl/cplsample/cplsample.c b/reactos/dll/cpl/cplsample/cplsample.c
similarity index 100%
rename from reactos/lib/cpl/cplsample/cplsample.c
rename to reactos/dll/cpl/cplsample/cplsample.c
diff --git a/reactos/lib/cpl/cplsample/cplsample.def b/reactos/dll/cpl/cplsample/cplsample.def
similarity index 100%
rename from reactos/lib/cpl/cplsample/cplsample.def
rename to reactos/dll/cpl/cplsample/cplsample.def
diff --git a/reactos/lib/cpl/cplsample/cplsample.h b/reactos/dll/cpl/cplsample/cplsample.h
similarity index 100%
rename from reactos/lib/cpl/cplsample/cplsample.h
rename to reactos/dll/cpl/cplsample/cplsample.h
diff --git a/reactos/lib/cpl/cplsample/cplsample.rc b/reactos/dll/cpl/cplsample/cplsample.rc
similarity index 100%
rename from reactos/lib/cpl/cplsample/cplsample.rc
rename to reactos/dll/cpl/cplsample/cplsample.rc
diff --git a/reactos/lib/cpl/cplsample/resource.h b/reactos/dll/cpl/cplsample/resource.h
similarity index 100%
rename from reactos/lib/cpl/cplsample/resource.h
rename to reactos/dll/cpl/cplsample/resource.h
diff --git a/reactos/lib/cpl/cplsample/resources/cpl_icon1.ico b/reactos/dll/cpl/cplsample/resources/cpl_icon1.ico
similarity index 100%
rename from reactos/lib/cpl/cplsample/resources/cpl_icon1.ico
rename to reactos/dll/cpl/cplsample/resources/cpl_icon1.ico
diff --git a/reactos/lib/cpl/desk/Fr.rc b/reactos/dll/cpl/desk/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/desk/Fr.rc
rename to reactos/dll/cpl/desk/Fr.rc
diff --git a/reactos/lib/cpl/desk/Ja.rc b/reactos/dll/cpl/desk/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/desk/Ja.rc
rename to reactos/dll/cpl/desk/Ja.rc
diff --git a/reactos/lib/cpl/desk/appearance.c b/reactos/dll/cpl/desk/appearance.c
similarity index 100%
rename from reactos/lib/cpl/desk/appearance.c
rename to reactos/dll/cpl/desk/appearance.c
diff --git a/reactos/lib/cpl/desk/background.c b/reactos/dll/cpl/desk/background.c
similarity index 100%
rename from reactos/lib/cpl/desk/background.c
rename to reactos/dll/cpl/desk/background.c
diff --git a/reactos/lib/cpl/desk/classinst.c b/reactos/dll/cpl/desk/classinst.c
similarity index 100%
rename from reactos/lib/cpl/desk/classinst.c
rename to reactos/dll/cpl/desk/classinst.c
diff --git a/reactos/lib/cpl/desk/cz.rc b/reactos/dll/cpl/desk/cz.rc
similarity index 100%
rename from reactos/lib/cpl/desk/cz.rc
rename to reactos/dll/cpl/desk/cz.rc
diff --git a/reactos/lib/cpl/desk/de.rc b/reactos/dll/cpl/desk/de.rc
similarity index 100%
rename from reactos/lib/cpl/desk/de.rc
rename to reactos/dll/cpl/desk/de.rc
diff --git a/reactos/lib/cpl/desk/desk.c b/reactos/dll/cpl/desk/desk.c
similarity index 100%
rename from reactos/lib/cpl/desk/desk.c
rename to reactos/dll/cpl/desk/desk.c
diff --git a/reactos/lib/cpl/desk/desk.def b/reactos/dll/cpl/desk/desk.def
similarity index 100%
rename from reactos/lib/cpl/desk/desk.def
rename to reactos/dll/cpl/desk/desk.def
diff --git a/reactos/lib/cpl/desk/desk.h b/reactos/dll/cpl/desk/desk.h
similarity index 100%
rename from reactos/lib/cpl/desk/desk.h
rename to reactos/dll/cpl/desk/desk.h
diff --git a/reactos/lib/cpl/desk/desk.rc b/reactos/dll/cpl/desk/desk.rc
similarity index 100%
rename from reactos/lib/cpl/desk/desk.rc
rename to reactos/dll/cpl/desk/desk.rc
diff --git a/reactos/lib/cpl/desk/desk.xml b/reactos/dll/cpl/desk/desk.xml
similarity index 100%
rename from reactos/lib/cpl/desk/desk.xml
rename to reactos/dll/cpl/desk/desk.xml
diff --git a/reactos/lib/cpl/desk/dibitmap.c b/reactos/dll/cpl/desk/dibitmap.c
similarity index 100%
rename from reactos/lib/cpl/desk/dibitmap.c
rename to reactos/dll/cpl/desk/dibitmap.c
diff --git a/reactos/lib/cpl/desk/en.rc b/reactos/dll/cpl/desk/en.rc
similarity index 100%
rename from reactos/lib/cpl/desk/en.rc
rename to reactos/dll/cpl/desk/en.rc
diff --git a/reactos/lib/cpl/desk/es.rc b/reactos/dll/cpl/desk/es.rc
similarity index 100%
rename from reactos/lib/cpl/desk/es.rc
rename to reactos/dll/cpl/desk/es.rc
diff --git a/reactos/lib/cpl/desk/gr.rc b/reactos/dll/cpl/desk/gr.rc
similarity index 100%
rename from reactos/lib/cpl/desk/gr.rc
rename to reactos/dll/cpl/desk/gr.rc
diff --git a/reactos/lib/cpl/desk/hu.rc b/reactos/dll/cpl/desk/hu.rc
similarity index 100%
rename from reactos/lib/cpl/desk/hu.rc
rename to reactos/dll/cpl/desk/hu.rc
diff --git a/reactos/lib/cpl/desk/nl.rc b/reactos/dll/cpl/desk/nl.rc
similarity index 100%
rename from reactos/lib/cpl/desk/nl.rc
rename to reactos/dll/cpl/desk/nl.rc
diff --git a/reactos/lib/cpl/desk/pl.rc b/reactos/dll/cpl/desk/pl.rc
similarity index 100%
rename from reactos/lib/cpl/desk/pl.rc
rename to reactos/dll/cpl/desk/pl.rc
diff --git a/reactos/lib/cpl/desk/resource.h b/reactos/dll/cpl/desk/resource.h
similarity index 100%
rename from reactos/lib/cpl/desk/resource.h
rename to reactos/dll/cpl/desk/resource.h
diff --git a/reactos/lib/cpl/desk/resources/applet.ico b/reactos/dll/cpl/desk/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/desk/resources/applet.ico
rename to reactos/dll/cpl/desk/resources/applet.ico
diff --git a/reactos/lib/cpl/desk/screensaver.c b/reactos/dll/cpl/desk/screensaver.c
similarity index 100%
rename from reactos/lib/cpl/desk/screensaver.c
rename to reactos/dll/cpl/desk/screensaver.c
diff --git a/reactos/lib/cpl/desk/settings.c b/reactos/dll/cpl/desk/settings.c
similarity index 100%
rename from reactos/lib/cpl/desk/settings.c
rename to reactos/dll/cpl/desk/settings.c
diff --git a/reactos/lib/cpl/desk/sv.rc b/reactos/dll/cpl/desk/sv.rc
similarity index 100%
rename from reactos/lib/cpl/desk/sv.rc
rename to reactos/dll/cpl/desk/sv.rc
diff --git a/reactos/lib/cpl/directory.xml b/reactos/dll/cpl/directory.xml
similarity index 100%
rename from reactos/lib/cpl/directory.xml
rename to reactos/dll/cpl/directory.xml
diff --git a/reactos/lib/cpl/hdwwiz/De.rc b/reactos/dll/cpl/hdwwiz/De.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/De.rc
rename to reactos/dll/cpl/hdwwiz/De.rc
diff --git a/reactos/lib/cpl/hdwwiz/En.rc b/reactos/dll/cpl/hdwwiz/En.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/En.rc
rename to reactos/dll/cpl/hdwwiz/En.rc
diff --git a/reactos/lib/cpl/hdwwiz/Es.rc b/reactos/dll/cpl/hdwwiz/Es.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/Es.rc
rename to reactos/dll/cpl/hdwwiz/Es.rc
diff --git a/reactos/lib/cpl/hdwwiz/Fr.rc b/reactos/dll/cpl/hdwwiz/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/Fr.rc
rename to reactos/dll/cpl/hdwwiz/Fr.rc
diff --git a/reactos/lib/cpl/hdwwiz/Hu.rc b/reactos/dll/cpl/hdwwiz/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/Hu.rc
rename to reactos/dll/cpl/hdwwiz/Hu.rc
diff --git a/reactos/lib/cpl/hdwwiz/Ja.rc b/reactos/dll/cpl/hdwwiz/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/Ja.rc
rename to reactos/dll/cpl/hdwwiz/Ja.rc
diff --git a/reactos/lib/cpl/hdwwiz/hdwwiz.c b/reactos/dll/cpl/hdwwiz/hdwwiz.c
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/hdwwiz.c
rename to reactos/dll/cpl/hdwwiz/hdwwiz.c
diff --git a/reactos/lib/cpl/hdwwiz/hdwwiz.def b/reactos/dll/cpl/hdwwiz/hdwwiz.def
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/hdwwiz.def
rename to reactos/dll/cpl/hdwwiz/hdwwiz.def
diff --git a/reactos/lib/cpl/hdwwiz/hdwwiz.h b/reactos/dll/cpl/hdwwiz/hdwwiz.h
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/hdwwiz.h
rename to reactos/dll/cpl/hdwwiz/hdwwiz.h
diff --git a/reactos/lib/cpl/hdwwiz/hdwwiz.rc b/reactos/dll/cpl/hdwwiz/hdwwiz.rc
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/hdwwiz.rc
rename to reactos/dll/cpl/hdwwiz/hdwwiz.rc
diff --git a/reactos/lib/cpl/hdwwiz/hdwwiz.xml b/reactos/dll/cpl/hdwwiz/hdwwiz.xml
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/hdwwiz.xml
rename to reactos/dll/cpl/hdwwiz/hdwwiz.xml
diff --git a/reactos/lib/cpl/hdwwiz/resource.h b/reactos/dll/cpl/hdwwiz/resource.h
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/resource.h
rename to reactos/dll/cpl/hdwwiz/resource.h
diff --git a/reactos/lib/cpl/hdwwiz/resources/applet.ico b/reactos/dll/cpl/hdwwiz/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/hdwwiz/resources/applet.ico
rename to reactos/dll/cpl/hdwwiz/resources/applet.ico
diff --git a/reactos/lib/cpl/intl/Fr.rc b/reactos/dll/cpl/intl/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/intl/Fr.rc
rename to reactos/dll/cpl/intl/Fr.rc
diff --git a/reactos/lib/cpl/intl/Ja.rc b/reactos/dll/cpl/intl/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/intl/Ja.rc
rename to reactos/dll/cpl/intl/Ja.rc
diff --git a/reactos/lib/cpl/intl/currency.c b/reactos/dll/cpl/intl/currency.c
similarity index 100%
rename from reactos/lib/cpl/intl/currency.c
rename to reactos/dll/cpl/intl/currency.c
diff --git a/reactos/lib/cpl/intl/cz.rc b/reactos/dll/cpl/intl/cz.rc
similarity index 100%
rename from reactos/lib/cpl/intl/cz.rc
rename to reactos/dll/cpl/intl/cz.rc
diff --git a/reactos/lib/cpl/intl/date.c b/reactos/dll/cpl/intl/date.c
similarity index 100%
rename from reactos/lib/cpl/intl/date.c
rename to reactos/dll/cpl/intl/date.c
diff --git a/reactos/lib/cpl/intl/de.rc b/reactos/dll/cpl/intl/de.rc
similarity index 100%
rename from reactos/lib/cpl/intl/de.rc
rename to reactos/dll/cpl/intl/de.rc
diff --git a/reactos/lib/cpl/intl/en.rc b/reactos/dll/cpl/intl/en.rc
similarity index 100%
rename from reactos/lib/cpl/intl/en.rc
rename to reactos/dll/cpl/intl/en.rc
diff --git a/reactos/lib/cpl/intl/es.rc b/reactos/dll/cpl/intl/es.rc
similarity index 100%
rename from reactos/lib/cpl/intl/es.rc
rename to reactos/dll/cpl/intl/es.rc
diff --git a/reactos/lib/cpl/intl/general.c b/reactos/dll/cpl/intl/general.c
similarity index 100%
rename from reactos/lib/cpl/intl/general.c
rename to reactos/dll/cpl/intl/general.c
diff --git a/reactos/lib/cpl/intl/hu.rc b/reactos/dll/cpl/intl/hu.rc
similarity index 100%
rename from reactos/lib/cpl/intl/hu.rc
rename to reactos/dll/cpl/intl/hu.rc
diff --git a/reactos/lib/cpl/intl/intl.c b/reactos/dll/cpl/intl/intl.c
similarity index 100%
rename from reactos/lib/cpl/intl/intl.c
rename to reactos/dll/cpl/intl/intl.c
diff --git a/reactos/lib/cpl/intl/intl.def b/reactos/dll/cpl/intl/intl.def
similarity index 100%
rename from reactos/lib/cpl/intl/intl.def
rename to reactos/dll/cpl/intl/intl.def
diff --git a/reactos/lib/cpl/intl/intl.h b/reactos/dll/cpl/intl/intl.h
similarity index 100%
rename from reactos/lib/cpl/intl/intl.h
rename to reactos/dll/cpl/intl/intl.h
diff --git a/reactos/lib/cpl/intl/intl.rc b/reactos/dll/cpl/intl/intl.rc
similarity index 100%
rename from reactos/lib/cpl/intl/intl.rc
rename to reactos/dll/cpl/intl/intl.rc
diff --git a/reactos/lib/cpl/intl/intl.xml b/reactos/dll/cpl/intl/intl.xml
similarity index 100%
rename from reactos/lib/cpl/intl/intl.xml
rename to reactos/dll/cpl/intl/intl.xml
diff --git a/reactos/lib/cpl/intl/locale.c b/reactos/dll/cpl/intl/locale.c
similarity index 100%
rename from reactos/lib/cpl/intl/locale.c
rename to reactos/dll/cpl/intl/locale.c
diff --git a/reactos/lib/cpl/intl/nl.rc b/reactos/dll/cpl/intl/nl.rc
similarity index 100%
rename from reactos/lib/cpl/intl/nl.rc
rename to reactos/dll/cpl/intl/nl.rc
diff --git a/reactos/lib/cpl/intl/numbers.c b/reactos/dll/cpl/intl/numbers.c
similarity index 100%
rename from reactos/lib/cpl/intl/numbers.c
rename to reactos/dll/cpl/intl/numbers.c
diff --git a/reactos/lib/cpl/intl/resource.h b/reactos/dll/cpl/intl/resource.h
similarity index 100%
rename from reactos/lib/cpl/intl/resource.h
rename to reactos/dll/cpl/intl/resource.h
diff --git a/reactos/lib/cpl/intl/resources/applet.ico b/reactos/dll/cpl/intl/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/intl/resources/applet.ico
rename to reactos/dll/cpl/intl/resources/applet.ico
diff --git a/reactos/lib/cpl/intl/resources/flags.ico b/reactos/dll/cpl/intl/resources/flags.ico
similarity index 100%
rename from reactos/lib/cpl/intl/resources/flags.ico
rename to reactos/dll/cpl/intl/resources/flags.ico
diff --git a/reactos/lib/cpl/intl/sv.rc b/reactos/dll/cpl/intl/sv.rc
similarity index 100%
rename from reactos/lib/cpl/intl/sv.rc
rename to reactos/dll/cpl/intl/sv.rc
diff --git a/reactos/lib/cpl/intl/time.c b/reactos/dll/cpl/intl/time.c
similarity index 100%
rename from reactos/lib/cpl/intl/time.c
rename to reactos/dll/cpl/intl/time.c
diff --git a/reactos/lib/cpl/liccpa/De.rc b/reactos/dll/cpl/liccpa/De.rc
similarity index 100%
rename from reactos/lib/cpl/liccpa/De.rc
rename to reactos/dll/cpl/liccpa/De.rc
diff --git a/reactos/lib/cpl/liccpa/En.rc b/reactos/dll/cpl/liccpa/En.rc
similarity index 100%
rename from reactos/lib/cpl/liccpa/En.rc
rename to reactos/dll/cpl/liccpa/En.rc
diff --git a/reactos/lib/cpl/liccpa/Es.rc b/reactos/dll/cpl/liccpa/Es.rc
similarity index 100%
rename from reactos/lib/cpl/liccpa/Es.rc
rename to reactos/dll/cpl/liccpa/Es.rc
diff --git a/reactos/lib/cpl/liccpa/Ja.rc b/reactos/dll/cpl/liccpa/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/liccpa/Ja.rc
rename to reactos/dll/cpl/liccpa/Ja.rc
diff --git a/reactos/lib/cpl/liccpa/liccpa.c b/reactos/dll/cpl/liccpa/liccpa.c
similarity index 100%
rename from reactos/lib/cpl/liccpa/liccpa.c
rename to reactos/dll/cpl/liccpa/liccpa.c
diff --git a/reactos/lib/cpl/liccpa/liccpa.def b/reactos/dll/cpl/liccpa/liccpa.def
similarity index 100%
rename from reactos/lib/cpl/liccpa/liccpa.def
rename to reactos/dll/cpl/liccpa/liccpa.def
diff --git a/reactos/lib/cpl/liccpa/liccpa.h b/reactos/dll/cpl/liccpa/liccpa.h
similarity index 100%
rename from reactos/lib/cpl/liccpa/liccpa.h
rename to reactos/dll/cpl/liccpa/liccpa.h
diff --git a/reactos/lib/cpl/liccpa/liccpa.rc b/reactos/dll/cpl/liccpa/liccpa.rc
similarity index 100%
rename from reactos/lib/cpl/liccpa/liccpa.rc
rename to reactos/dll/cpl/liccpa/liccpa.rc
diff --git a/reactos/lib/cpl/liccpa/resource.h b/reactos/dll/cpl/liccpa/resource.h
similarity index 100%
rename from reactos/lib/cpl/liccpa/resource.h
rename to reactos/dll/cpl/liccpa/resource.h
diff --git a/reactos/lib/cpl/liccpa/resources/cpl_icon1.ico b/reactos/dll/cpl/liccpa/resources/cpl_icon1.ico
similarity index 100%
rename from reactos/lib/cpl/liccpa/resources/cpl_icon1.ico
rename to reactos/dll/cpl/liccpa/resources/cpl_icon1.ico
diff --git a/reactos/lib/cpl/main/De.rc b/reactos/dll/cpl/main/De.rc
similarity index 100%
rename from reactos/lib/cpl/main/De.rc
rename to reactos/dll/cpl/main/De.rc
diff --git a/reactos/lib/cpl/main/En.rc b/reactos/dll/cpl/main/En.rc
similarity index 100%
rename from reactos/lib/cpl/main/En.rc
rename to reactos/dll/cpl/main/En.rc
diff --git a/reactos/lib/cpl/main/Es.rc b/reactos/dll/cpl/main/Es.rc
similarity index 100%
rename from reactos/lib/cpl/main/Es.rc
rename to reactos/dll/cpl/main/Es.rc
diff --git a/reactos/lib/cpl/main/Hu.rc b/reactos/dll/cpl/main/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/main/Hu.rc
rename to reactos/dll/cpl/main/Hu.rc
diff --git a/reactos/lib/cpl/main/Ja.rc b/reactos/dll/cpl/main/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/main/Ja.rc
rename to reactos/dll/cpl/main/Ja.rc
diff --git a/reactos/lib/cpl/main/Nl.rc b/reactos/dll/cpl/main/Nl.rc
similarity index 100%
rename from reactos/lib/cpl/main/Nl.rc
rename to reactos/dll/cpl/main/Nl.rc
diff --git a/reactos/lib/cpl/main/keyboard.c b/reactos/dll/cpl/main/keyboard.c
similarity index 100%
rename from reactos/lib/cpl/main/keyboard.c
rename to reactos/dll/cpl/main/keyboard.c
diff --git a/reactos/lib/cpl/main/main.c b/reactos/dll/cpl/main/main.c
similarity index 100%
rename from reactos/lib/cpl/main/main.c
rename to reactos/dll/cpl/main/main.c
diff --git a/reactos/lib/cpl/main/main.def b/reactos/dll/cpl/main/main.def
similarity index 100%
rename from reactos/lib/cpl/main/main.def
rename to reactos/dll/cpl/main/main.def
diff --git a/reactos/lib/cpl/main/main.h b/reactos/dll/cpl/main/main.h
similarity index 100%
rename from reactos/lib/cpl/main/main.h
rename to reactos/dll/cpl/main/main.h
diff --git a/reactos/lib/cpl/main/main.rc b/reactos/dll/cpl/main/main.rc
similarity index 100%
rename from reactos/lib/cpl/main/main.rc
rename to reactos/dll/cpl/main/main.rc
diff --git a/reactos/lib/cpl/main/main.xml b/reactos/dll/cpl/main/main.xml
similarity index 100%
rename from reactos/lib/cpl/main/main.xml
rename to reactos/dll/cpl/main/main.xml
diff --git a/reactos/lib/cpl/main/mouse.c b/reactos/dll/cpl/main/mouse.c
similarity index 100%
rename from reactos/lib/cpl/main/mouse.c
rename to reactos/dll/cpl/main/mouse.c
diff --git a/reactos/lib/cpl/main/resource.h b/reactos/dll/cpl/main/resource.h
similarity index 100%
rename from reactos/lib/cpl/main/resource.h
rename to reactos/dll/cpl/main/resource.h
diff --git a/reactos/lib/cpl/main/resources/keyboard.ico b/reactos/dll/cpl/main/resources/keyboard.ico
similarity index 100%
rename from reactos/lib/cpl/main/resources/keyboard.ico
rename to reactos/dll/cpl/main/resources/keyboard.ico
diff --git a/reactos/lib/cpl/main/resources/mouse.ico b/reactos/dll/cpl/main/resources/mouse.ico
similarity index 100%
rename from reactos/lib/cpl/main/resources/mouse.ico
rename to reactos/dll/cpl/main/resources/mouse.ico
diff --git a/reactos/lib/cpl/mmsys/De.rc b/reactos/dll/cpl/mmsys/De.rc
similarity index 100%
rename from reactos/lib/cpl/mmsys/De.rc
rename to reactos/dll/cpl/mmsys/De.rc
diff --git a/reactos/lib/cpl/mmsys/En.rc b/reactos/dll/cpl/mmsys/En.rc
similarity index 100%
rename from reactos/lib/cpl/mmsys/En.rc
rename to reactos/dll/cpl/mmsys/En.rc
diff --git a/reactos/lib/cpl/mmsys/Es.rc b/reactos/dll/cpl/mmsys/Es.rc
similarity index 100%
rename from reactos/lib/cpl/mmsys/Es.rc
rename to reactos/dll/cpl/mmsys/Es.rc
diff --git a/reactos/lib/cpl/mmsys/mmsys.c b/reactos/dll/cpl/mmsys/mmsys.c
similarity index 100%
rename from reactos/lib/cpl/mmsys/mmsys.c
rename to reactos/dll/cpl/mmsys/mmsys.c
diff --git a/reactos/lib/cpl/mmsys/mmsys.def b/reactos/dll/cpl/mmsys/mmsys.def
similarity index 100%
rename from reactos/lib/cpl/mmsys/mmsys.def
rename to reactos/dll/cpl/mmsys/mmsys.def
diff --git a/reactos/lib/cpl/mmsys/mmsys.h b/reactos/dll/cpl/mmsys/mmsys.h
similarity index 100%
rename from reactos/lib/cpl/mmsys/mmsys.h
rename to reactos/dll/cpl/mmsys/mmsys.h
diff --git a/reactos/lib/cpl/mmsys/mmsys.rc b/reactos/dll/cpl/mmsys/mmsys.rc
similarity index 100%
rename from reactos/lib/cpl/mmsys/mmsys.rc
rename to reactos/dll/cpl/mmsys/mmsys.rc
diff --git a/reactos/lib/cpl/mmsys/mmsys.xml b/reactos/dll/cpl/mmsys/mmsys.xml
similarity index 100%
rename from reactos/lib/cpl/mmsys/mmsys.xml
rename to reactos/dll/cpl/mmsys/mmsys.xml
diff --git a/reactos/lib/cpl/mmsys/resource.h b/reactos/dll/cpl/mmsys/resource.h
similarity index 100%
rename from reactos/lib/cpl/mmsys/resource.h
rename to reactos/dll/cpl/mmsys/resource.h
diff --git a/reactos/lib/cpl/mmsys/resources/mmsys.ico b/reactos/dll/cpl/mmsys/resources/mmsys.ico
similarity index 100%
rename from reactos/lib/cpl/mmsys/resources/mmsys.ico
rename to reactos/dll/cpl/mmsys/resources/mmsys.ico
diff --git a/reactos/lib/cpl/ncpa/Ja.rc b/reactos/dll/cpl/ncpa/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/Ja.rc
rename to reactos/dll/cpl/ncpa/Ja.rc
diff --git a/reactos/lib/cpl/ncpa/cz.rc b/reactos/dll/cpl/ncpa/cz.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/cz.rc
rename to reactos/dll/cpl/ncpa/cz.rc
diff --git a/reactos/lib/cpl/ncpa/de.rc b/reactos/dll/cpl/ncpa/de.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/de.rc
rename to reactos/dll/cpl/ncpa/de.rc
diff --git a/reactos/lib/cpl/ncpa/dk.rc b/reactos/dll/cpl/ncpa/dk.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/dk.rc
rename to reactos/dll/cpl/ncpa/dk.rc
diff --git a/reactos/lib/cpl/ncpa/en.rc b/reactos/dll/cpl/ncpa/en.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/en.rc
rename to reactos/dll/cpl/ncpa/en.rc
diff --git a/reactos/lib/cpl/ncpa/es.rc b/reactos/dll/cpl/ncpa/es.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/es.rc
rename to reactos/dll/cpl/ncpa/es.rc
diff --git a/reactos/lib/cpl/ncpa/hu.rc b/reactos/dll/cpl/ncpa/hu.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/hu.rc
rename to reactos/dll/cpl/ncpa/hu.rc
diff --git a/reactos/lib/cpl/ncpa/ncpa.c b/reactos/dll/cpl/ncpa/ncpa.c
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.c
rename to reactos/dll/cpl/ncpa/ncpa.c
diff --git a/reactos/lib/cpl/ncpa/ncpa.def b/reactos/dll/cpl/ncpa/ncpa.def
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.def
rename to reactos/dll/cpl/ncpa/ncpa.def
diff --git a/reactos/lib/cpl/ncpa/ncpa.dsp b/reactos/dll/cpl/ncpa/ncpa.dsp
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.dsp
rename to reactos/dll/cpl/ncpa/ncpa.dsp
diff --git a/reactos/lib/cpl/ncpa/ncpa.dsw b/reactos/dll/cpl/ncpa/ncpa.dsw
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.dsw
rename to reactos/dll/cpl/ncpa/ncpa.dsw
diff --git a/reactos/lib/cpl/ncpa/ncpa.h b/reactos/dll/cpl/ncpa/ncpa.h
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.h
rename to reactos/dll/cpl/ncpa/ncpa.h
diff --git a/reactos/lib/cpl/ncpa/ncpa.rc b/reactos/dll/cpl/ncpa/ncpa.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.rc
rename to reactos/dll/cpl/ncpa/ncpa.rc
diff --git a/reactos/lib/cpl/ncpa/ncpa.xml b/reactos/dll/cpl/ncpa/ncpa.xml
similarity index 100%
rename from reactos/lib/cpl/ncpa/ncpa.xml
rename to reactos/dll/cpl/ncpa/ncpa.xml
diff --git a/reactos/lib/cpl/ncpa/nl.rc b/reactos/dll/cpl/ncpa/nl.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/nl.rc
rename to reactos/dll/cpl/ncpa/nl.rc
diff --git a/reactos/lib/cpl/ncpa/resource.h b/reactos/dll/cpl/ncpa/resource.h
similarity index 100%
rename from reactos/lib/cpl/ncpa/resource.h
rename to reactos/dll/cpl/ncpa/resource.h
diff --git a/reactos/lib/cpl/ncpa/resources/HORIZ.ICO b/reactos/dll/cpl/ncpa/resources/HORIZ.ICO
similarity index 100%
rename from reactos/lib/cpl/ncpa/resources/HORIZ.ICO
rename to reactos/dll/cpl/ncpa/resources/HORIZ.ICO
diff --git a/reactos/lib/cpl/ncpa/resources/NETCONN.ICO b/reactos/dll/cpl/ncpa/resources/NETCONN.ICO
similarity index 100%
rename from reactos/lib/cpl/ncpa/resources/NETCONN.ICO
rename to reactos/dll/cpl/ncpa/resources/NETCONN.ICO
diff --git a/reactos/lib/cpl/ncpa/resources/VERTIC.ICO b/reactos/dll/cpl/ncpa/resources/VERTIC.ICO
similarity index 100%
rename from reactos/lib/cpl/ncpa/resources/VERTIC.ICO
rename to reactos/dll/cpl/ncpa/resources/VERTIC.ICO
diff --git a/reactos/lib/cpl/ncpa/resources/applet.ico b/reactos/dll/cpl/ncpa/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/ncpa/resources/applet.ico
rename to reactos/dll/cpl/ncpa/resources/applet.ico
diff --git a/reactos/lib/cpl/ncpa/sv.rc b/reactos/dll/cpl/ncpa/sv.rc
similarity index 100%
rename from reactos/lib/cpl/ncpa/sv.rc
rename to reactos/dll/cpl/ncpa/sv.rc
diff --git a/reactos/lib/cpl/ncpa/tcpip_properties.c b/reactos/dll/cpl/ncpa/tcpip_properties.c
similarity index 100%
rename from reactos/lib/cpl/ncpa/tcpip_properties.c
rename to reactos/dll/cpl/ncpa/tcpip_properties.c
diff --git a/reactos/lib/cpl/sysdm/Ja.rc b/reactos/dll/cpl/sysdm/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/Ja.rc
rename to reactos/dll/cpl/sysdm/Ja.rc
diff --git a/reactos/lib/cpl/sysdm/advanced.c b/reactos/dll/cpl/sysdm/advanced.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/advanced.c
rename to reactos/dll/cpl/sysdm/advanced.c
diff --git a/reactos/lib/cpl/sysdm/computer.c b/reactos/dll/cpl/sysdm/computer.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/computer.c
rename to reactos/dll/cpl/sysdm/computer.c
diff --git a/reactos/lib/cpl/sysdm/cz.rc b/reactos/dll/cpl/sysdm/cz.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/cz.rc
rename to reactos/dll/cpl/sysdm/cz.rc
diff --git a/reactos/lib/cpl/sysdm/de.rc b/reactos/dll/cpl/sysdm/de.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/de.rc
rename to reactos/dll/cpl/sysdm/de.rc
diff --git a/reactos/lib/cpl/sysdm/dk.rc b/reactos/dll/cpl/sysdm/dk.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/dk.rc
rename to reactos/dll/cpl/sysdm/dk.rc
diff --git a/reactos/lib/cpl/sysdm/en.rc b/reactos/dll/cpl/sysdm/en.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/en.rc
rename to reactos/dll/cpl/sysdm/en.rc
diff --git a/reactos/lib/cpl/sysdm/environment.c b/reactos/dll/cpl/sysdm/environment.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/environment.c
rename to reactos/dll/cpl/sysdm/environment.c
diff --git a/reactos/lib/cpl/sysdm/es.rc b/reactos/dll/cpl/sysdm/es.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/es.rc
rename to reactos/dll/cpl/sysdm/es.rc
diff --git a/reactos/lib/cpl/sysdm/fr.rc b/reactos/dll/cpl/sysdm/fr.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/fr.rc
rename to reactos/dll/cpl/sysdm/fr.rc
diff --git a/reactos/lib/cpl/sysdm/general.c b/reactos/dll/cpl/sysdm/general.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/general.c
rename to reactos/dll/cpl/sysdm/general.c
diff --git a/reactos/lib/cpl/sysdm/hardware.c b/reactos/dll/cpl/sysdm/hardware.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/hardware.c
rename to reactos/dll/cpl/sysdm/hardware.c
diff --git a/reactos/lib/cpl/sysdm/hu.rc b/reactos/dll/cpl/sysdm/hu.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/hu.rc
rename to reactos/dll/cpl/sysdm/hu.rc
diff --git a/reactos/lib/cpl/sysdm/nl.rc b/reactos/dll/cpl/sysdm/nl.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/nl.rc
rename to reactos/dll/cpl/sysdm/nl.rc
diff --git a/reactos/lib/cpl/sysdm/resource.h b/reactos/dll/cpl/sysdm/resource.h
similarity index 100%
rename from reactos/lib/cpl/sysdm/resource.h
rename to reactos/dll/cpl/sysdm/resource.h
diff --git a/reactos/lib/cpl/sysdm/resources/applet.ico b/reactos/dll/cpl/sysdm/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/sysdm/resources/applet.ico
rename to reactos/dll/cpl/sysdm/resources/applet.ico
diff --git a/reactos/lib/cpl/sysdm/resources/devmgr.ico b/reactos/dll/cpl/sysdm/resources/devmgr.ico
similarity index 100%
rename from reactos/lib/cpl/sysdm/resources/devmgr.ico
rename to reactos/dll/cpl/sysdm/resources/devmgr.ico
diff --git a/reactos/lib/cpl/sysdm/resources/gpl.txt b/reactos/dll/cpl/sysdm/resources/gpl.txt
similarity index 100%
rename from reactos/lib/cpl/sysdm/resources/gpl.txt
rename to reactos/dll/cpl/sysdm/resources/gpl.txt
diff --git a/reactos/lib/cpl/sysdm/sv.rc b/reactos/dll/cpl/sysdm/sv.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/sv.rc
rename to reactos/dll/cpl/sysdm/sv.rc
diff --git a/reactos/lib/cpl/sysdm/sysdm.c b/reactos/dll/cpl/sysdm/sysdm.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/sysdm.c
rename to reactos/dll/cpl/sysdm/sysdm.c
diff --git a/reactos/lib/cpl/sysdm/sysdm.def b/reactos/dll/cpl/sysdm/sysdm.def
similarity index 100%
rename from reactos/lib/cpl/sysdm/sysdm.def
rename to reactos/dll/cpl/sysdm/sysdm.def
diff --git a/reactos/lib/cpl/sysdm/sysdm.h b/reactos/dll/cpl/sysdm/sysdm.h
similarity index 100%
rename from reactos/lib/cpl/sysdm/sysdm.h
rename to reactos/dll/cpl/sysdm/sysdm.h
diff --git a/reactos/lib/cpl/sysdm/sysdm.rc b/reactos/dll/cpl/sysdm/sysdm.rc
similarity index 100%
rename from reactos/lib/cpl/sysdm/sysdm.rc
rename to reactos/dll/cpl/sysdm/sysdm.rc
diff --git a/reactos/lib/cpl/sysdm/sysdm.xml b/reactos/dll/cpl/sysdm/sysdm.xml
similarity index 100%
rename from reactos/lib/cpl/sysdm/sysdm.xml
rename to reactos/dll/cpl/sysdm/sysdm.xml
diff --git a/reactos/lib/cpl/sysdm/userprofile.c b/reactos/dll/cpl/sysdm/userprofile.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/userprofile.c
rename to reactos/dll/cpl/sysdm/userprofile.c
diff --git a/reactos/lib/cpl/sysdm/virtmem.c b/reactos/dll/cpl/sysdm/virtmem.c
similarity index 100%
rename from reactos/lib/cpl/sysdm/virtmem.c
rename to reactos/dll/cpl/sysdm/virtmem.c
diff --git a/reactos/lib/cpl/timedate/Cz.rc b/reactos/dll/cpl/timedate/Cz.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Cz.rc
rename to reactos/dll/cpl/timedate/Cz.rc
diff --git a/reactos/lib/cpl/timedate/De.rc b/reactos/dll/cpl/timedate/De.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/De.rc
rename to reactos/dll/cpl/timedate/De.rc
diff --git a/reactos/lib/cpl/timedate/Dk.rc b/reactos/dll/cpl/timedate/Dk.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Dk.rc
rename to reactos/dll/cpl/timedate/Dk.rc
diff --git a/reactos/lib/cpl/timedate/En.rc b/reactos/dll/cpl/timedate/En.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/En.rc
rename to reactos/dll/cpl/timedate/En.rc
diff --git a/reactos/lib/cpl/timedate/Es.rc b/reactos/dll/cpl/timedate/Es.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Es.rc
rename to reactos/dll/cpl/timedate/Es.rc
diff --git a/reactos/lib/cpl/timedate/Fr.rc b/reactos/dll/cpl/timedate/Fr.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Fr.rc
rename to reactos/dll/cpl/timedate/Fr.rc
diff --git a/reactos/lib/cpl/timedate/Gr.rc b/reactos/dll/cpl/timedate/Gr.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Gr.rc
rename to reactos/dll/cpl/timedate/Gr.rc
diff --git a/reactos/lib/cpl/timedate/Hu.rc b/reactos/dll/cpl/timedate/Hu.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Hu.rc
rename to reactos/dll/cpl/timedate/Hu.rc
diff --git a/reactos/lib/cpl/timedate/Ja.rc b/reactos/dll/cpl/timedate/Ja.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Ja.rc
rename to reactos/dll/cpl/timedate/Ja.rc
diff --git a/reactos/lib/cpl/timedate/Nl.rc b/reactos/dll/cpl/timedate/Nl.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Nl.rc
rename to reactos/dll/cpl/timedate/Nl.rc
diff --git a/reactos/lib/cpl/timedate/Pl.rc b/reactos/dll/cpl/timedate/Pl.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Pl.rc
rename to reactos/dll/cpl/timedate/Pl.rc
diff --git a/reactos/lib/cpl/timedate/Ru.rc b/reactos/dll/cpl/timedate/Ru.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Ru.rc
rename to reactos/dll/cpl/timedate/Ru.rc
diff --git a/reactos/lib/cpl/timedate/Sv.rc b/reactos/dll/cpl/timedate/Sv.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/Sv.rc
rename to reactos/dll/cpl/timedate/Sv.rc
diff --git a/reactos/lib/cpl/timedate/resource.h b/reactos/dll/cpl/timedate/resource.h
similarity index 100%
rename from reactos/lib/cpl/timedate/resource.h
rename to reactos/dll/cpl/timedate/resource.h
diff --git a/reactos/lib/cpl/timedate/resources/applet.ico b/reactos/dll/cpl/timedate/resources/applet.ico
similarity index 100%
rename from reactos/lib/cpl/timedate/resources/applet.ico
rename to reactos/dll/cpl/timedate/resources/applet.ico
diff --git a/reactos/lib/cpl/timedate/timedate.c b/reactos/dll/cpl/timedate/timedate.c
similarity index 100%
rename from reactos/lib/cpl/timedate/timedate.c
rename to reactos/dll/cpl/timedate/timedate.c
diff --git a/reactos/lib/cpl/timedate/timedate.def b/reactos/dll/cpl/timedate/timedate.def
similarity index 100%
rename from reactos/lib/cpl/timedate/timedate.def
rename to reactos/dll/cpl/timedate/timedate.def
diff --git a/reactos/lib/cpl/timedate/timedate.h b/reactos/dll/cpl/timedate/timedate.h
similarity index 100%
rename from reactos/lib/cpl/timedate/timedate.h
rename to reactos/dll/cpl/timedate/timedate.h
diff --git a/reactos/lib/cpl/timedate/timedate.rc b/reactos/dll/cpl/timedate/timedate.rc
similarity index 100%
rename from reactos/lib/cpl/timedate/timedate.rc
rename to reactos/dll/cpl/timedate/timedate.rc
diff --git a/reactos/lib/cpl/timedate/timedate.xml b/reactos/dll/cpl/timedate/timedate.xml
similarity index 100%
rename from reactos/lib/cpl/timedate/timedate.xml
rename to reactos/dll/cpl/timedate/timedate.xml
diff --git a/reactos/dll/d3d8/d3d8.c b/reactos/dll/directx/d3d8/d3d8.c
similarity index 100%
rename from reactos/dll/d3d8/d3d8.c
rename to reactos/dll/directx/d3d8/d3d8.c
diff --git a/reactos/dll/d3d8/d3d8.def b/reactos/dll/directx/d3d8/d3d8.def
similarity index 100%
rename from reactos/dll/d3d8/d3d8.def
rename to reactos/dll/directx/d3d8/d3d8.def
diff --git a/reactos/dll/d3d8/d3d8.h b/reactos/dll/directx/d3d8/d3d8.h
similarity index 100%
rename from reactos/dll/d3d8/d3d8.h
rename to reactos/dll/directx/d3d8/d3d8.h
diff --git a/reactos/dll/d3d8/d3d8.rc b/reactos/dll/directx/d3d8/d3d8.rc
similarity index 100%
rename from reactos/dll/d3d8/d3d8.rc
rename to reactos/dll/directx/d3d8/d3d8.rc
diff --git a/reactos/dll/d3d8thk/d3d8thk.def b/reactos/dll/directx/d3d8thk/d3d8thk.def
similarity index 100%
rename from reactos/dll/d3d8thk/d3d8thk.def
rename to reactos/dll/directx/d3d8thk/d3d8thk.def
diff --git a/reactos/dll/d3d8thk/d3d8thk.h b/reactos/dll/directx/d3d8thk/d3d8thk.h
similarity index 100%
rename from reactos/dll/d3d8thk/d3d8thk.h
rename to reactos/dll/directx/d3d8thk/d3d8thk.h
diff --git a/reactos/dll/d3d8thk/d3d8thk.rc b/reactos/dll/directx/d3d8thk/d3d8thk.rc
similarity index 100%
rename from reactos/dll/d3d8thk/d3d8thk.rc
rename to reactos/dll/directx/d3d8thk/d3d8thk.rc
diff --git a/reactos/dll/d3d8thk/d3d8thk.xml b/reactos/dll/directx/d3d8thk/d3d8thk.xml
similarity index 100%
rename from reactos/dll/d3d8thk/d3d8thk.xml
rename to reactos/dll/directx/d3d8thk/d3d8thk.xml
diff --git a/reactos/dll/d3d9/d3d9.c b/reactos/dll/directx/d3d9/d3d9.c
similarity index 100%
rename from reactos/dll/d3d9/d3d9.c
rename to reactos/dll/directx/d3d9/d3d9.c
diff --git a/reactos/dll/d3d9/d3d9.def b/reactos/dll/directx/d3d9/d3d9.def
similarity index 100%
rename from reactos/dll/d3d9/d3d9.def
rename to reactos/dll/directx/d3d9/d3d9.def
diff --git a/reactos/dll/d3d9/d3d9.h b/reactos/dll/directx/d3d9/d3d9.h
similarity index 100%
rename from reactos/dll/d3d9/d3d9.h
rename to reactos/dll/directx/d3d9/d3d9.h
diff --git a/reactos/dll/d3d9/d3d9.rc b/reactos/dll/directx/d3d9/d3d9.rc
similarity index 100%
rename from reactos/dll/d3d9/d3d9.rc
rename to reactos/dll/directx/d3d9/d3d9.rc
diff --git a/reactos/dll/ddraw/ddraw.def b/reactos/dll/directx/ddraw/ddraw.def
similarity index 100%
rename from reactos/dll/ddraw/ddraw.def
rename to reactos/dll/directx/ddraw/ddraw.def
diff --git a/reactos/dll/ddraw/ddraw.rc b/reactos/dll/directx/ddraw/ddraw.rc
similarity index 100%
rename from reactos/dll/ddraw/ddraw.rc
rename to reactos/dll/directx/ddraw/ddraw.rc
diff --git a/reactos/dll/ddraw/ddraw.xml b/reactos/dll/directx/ddraw/ddraw.xml
similarity index 100%
rename from reactos/dll/ddraw/ddraw.xml
rename to reactos/dll/directx/ddraw/ddraw.xml
diff --git a/reactos/dll/ddraw/hal/ddraw_hal.c b/reactos/dll/directx/ddraw/hal/ddraw_hal.c
similarity index 100%
rename from reactos/dll/ddraw/hal/ddraw_hal.c
rename to reactos/dll/directx/ddraw/hal/ddraw_hal.c
diff --git a/reactos/dll/ddraw/hal/surface_hal.c b/reactos/dll/directx/ddraw/hal/surface_hal.c
similarity index 100%
rename from reactos/dll/ddraw/hal/surface_hal.c
rename to reactos/dll/directx/ddraw/hal/surface_hal.c
diff --git a/reactos/dll/ddraw/main.c b/reactos/dll/directx/ddraw/main.c
similarity index 100%
rename from reactos/dll/ddraw/main.c
rename to reactos/dll/directx/ddraw/main.c
diff --git a/reactos/dll/ddraw/main/clipper_main.c b/reactos/dll/directx/ddraw/main/clipper_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/clipper_main.c
rename to reactos/dll/directx/ddraw/main/clipper_main.c
diff --git a/reactos/dll/ddraw/main/color_main.c b/reactos/dll/directx/ddraw/main/color_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/color_main.c
rename to reactos/dll/directx/ddraw/main/color_main.c
diff --git a/reactos/dll/ddraw/main/ddraw_main.c b/reactos/dll/directx/ddraw/main/ddraw_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/ddraw_main.c
rename to reactos/dll/directx/ddraw/main/ddraw_main.c
diff --git a/reactos/dll/ddraw/main/gamma_main.c b/reactos/dll/directx/ddraw/main/gamma_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/gamma_main.c
rename to reactos/dll/directx/ddraw/main/gamma_main.c
diff --git a/reactos/dll/ddraw/main/kernel_main.c b/reactos/dll/directx/ddraw/main/kernel_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/kernel_main.c
rename to reactos/dll/directx/ddraw/main/kernel_main.c
diff --git a/reactos/dll/ddraw/main/palette_main.c b/reactos/dll/directx/ddraw/main/palette_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/palette_main.c
rename to reactos/dll/directx/ddraw/main/palette_main.c
diff --git a/reactos/dll/ddraw/main/surface_main.c b/reactos/dll/directx/ddraw/main/surface_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/surface_main.c
rename to reactos/dll/directx/ddraw/main/surface_main.c
diff --git a/reactos/dll/ddraw/main/videoport_main.c b/reactos/dll/directx/ddraw/main/videoport_main.c
similarity index 100%
rename from reactos/dll/ddraw/main/videoport_main.c
rename to reactos/dll/directx/ddraw/main/videoport_main.c
diff --git a/reactos/dll/ddraw/regsvr.c b/reactos/dll/directx/ddraw/regsvr.c
similarity index 100%
rename from reactos/dll/ddraw/regsvr.c
rename to reactos/dll/directx/ddraw/regsvr.c
diff --git a/reactos/dll/ddraw/rosdraw.h b/reactos/dll/directx/ddraw/rosdraw.h
similarity index 100%
rename from reactos/dll/ddraw/rosdraw.h
rename to reactos/dll/directx/ddraw/rosdraw.h
diff --git a/reactos/dll/ddraw/soft/ddraw_hel.c b/reactos/dll/directx/ddraw/soft/ddraw_hel.c
similarity index 100%
rename from reactos/dll/ddraw/soft/ddraw_hel.c
rename to reactos/dll/directx/ddraw/soft/ddraw_hel.c
diff --git a/reactos/dll/ddraw/soft/surface_hel.c b/reactos/dll/directx/ddraw/soft/surface_hel.c
similarity index 100%
rename from reactos/dll/ddraw/soft/surface_hel.c
rename to reactos/dll/directx/ddraw/soft/surface_hel.c
diff --git a/reactos/dll/ddraw/thunks/ddraw_thunk.c b/reactos/dll/directx/ddraw/thunks/ddraw_thunk.c
similarity index 100%
rename from reactos/dll/ddraw/thunks/ddraw_thunk.c
rename to reactos/dll/directx/ddraw/thunks/ddraw_thunk.c
diff --git a/reactos/dll/ddraw/thunks/surface_thunk.c b/reactos/dll/directx/ddraw/thunks/surface_thunk.c
similarity index 100%
rename from reactos/dll/ddraw/thunks/surface_thunk.c
rename to reactos/dll/directx/ddraw/thunks/surface_thunk.c
diff --git a/reactos/dll/ddraw/winedraw.h b/reactos/dll/directx/ddraw/winedraw.h
similarity index 100%
rename from reactos/dll/ddraw/winedraw.h
rename to reactos/dll/directx/ddraw/winedraw.h
diff --git a/reactos/dll/dinput/data_formats.c b/reactos/dll/directx/dinput/data_formats.c
similarity index 100%
rename from reactos/dll/dinput/data_formats.c
rename to reactos/dll/directx/dinput/data_formats.c
diff --git a/reactos/dll/dinput/device.c b/reactos/dll/directx/dinput/device.c
similarity index 100%
rename from reactos/dll/dinput/device.c
rename to reactos/dll/directx/dinput/device.c
diff --git a/reactos/dll/dinput/device_private.h b/reactos/dll/directx/dinput/device_private.h
similarity index 100%
rename from reactos/dll/dinput/device_private.h
rename to reactos/dll/directx/dinput/device_private.h
diff --git a/reactos/dll/dinput/dinput.spec b/reactos/dll/directx/dinput/dinput.spec
similarity index 100%
rename from reactos/dll/dinput/dinput.spec
rename to reactos/dll/directx/dinput/dinput.spec
diff --git a/reactos/dll/dinput/dinput.xml b/reactos/dll/directx/dinput/dinput.xml
similarity index 100%
rename from reactos/dll/dinput/dinput.xml
rename to reactos/dll/directx/dinput/dinput.xml
diff --git a/reactos/dll/dinput/dinput_main.c b/reactos/dll/directx/dinput/dinput_main.c
similarity index 100%
rename from reactos/dll/dinput/dinput_main.c
rename to reactos/dll/directx/dinput/dinput_main.c
diff --git a/reactos/dll/dinput/dinput_private.h b/reactos/dll/directx/dinput/dinput_private.h
similarity index 100%
rename from reactos/dll/dinput/dinput_private.h
rename to reactos/dll/directx/dinput/dinput_private.h
diff --git a/reactos/dll/dinput/effect_linuxinput.c b/reactos/dll/directx/dinput/effect_linuxinput.c
similarity index 100%
rename from reactos/dll/dinput/effect_linuxinput.c
rename to reactos/dll/directx/dinput/effect_linuxinput.c
diff --git a/reactos/dll/dinput/joystick_linux.c b/reactos/dll/directx/dinput/joystick_linux.c
similarity index 100%
rename from reactos/dll/dinput/joystick_linux.c
rename to reactos/dll/directx/dinput/joystick_linux.c
diff --git a/reactos/dll/dinput/joystick_linuxinput.c b/reactos/dll/directx/dinput/joystick_linuxinput.c
similarity index 100%
rename from reactos/dll/dinput/joystick_linuxinput.c
rename to reactos/dll/directx/dinput/joystick_linuxinput.c
diff --git a/reactos/dll/dinput/keyboard.c b/reactos/dll/directx/dinput/keyboard.c
similarity index 100%
rename from reactos/dll/dinput/keyboard.c
rename to reactos/dll/directx/dinput/keyboard.c
diff --git a/reactos/dll/dinput/mouse.c b/reactos/dll/directx/dinput/mouse.c
similarity index 100%
rename from reactos/dll/dinput/mouse.c
rename to reactos/dll/directx/dinput/mouse.c
diff --git a/reactos/dll/dinput/regsvr.c b/reactos/dll/directx/dinput/regsvr.c
similarity index 100%
rename from reactos/dll/dinput/regsvr.c
rename to reactos/dll/directx/dinput/regsvr.c
diff --git a/reactos/dll/dinput/version.rc b/reactos/dll/directx/dinput/version.rc
similarity index 100%
rename from reactos/dll/dinput/version.rc
rename to reactos/dll/directx/dinput/version.rc
diff --git a/reactos/dll/dinput8/dinput8.spec b/reactos/dll/directx/dinput8/dinput8.spec
similarity index 100%
rename from reactos/dll/dinput8/dinput8.spec
rename to reactos/dll/directx/dinput8/dinput8.spec
diff --git a/reactos/dll/dinput8/dinput8.xml b/reactos/dll/directx/dinput8/dinput8.xml
similarity index 100%
rename from reactos/dll/dinput8/dinput8.xml
rename to reactos/dll/directx/dinput8/dinput8.xml
diff --git a/reactos/dll/dinput8/dinput8_main.c b/reactos/dll/directx/dinput8/dinput8_main.c
similarity index 100%
rename from reactos/dll/dinput8/dinput8_main.c
rename to reactos/dll/directx/dinput8/dinput8_main.c
diff --git a/reactos/dll/dinput8/version.rc b/reactos/dll/directx/dinput8/version.rc
similarity index 100%
rename from reactos/dll/dinput8/version.rc
rename to reactos/dll/directx/dinput8/version.rc
diff --git a/reactos/dll/dplay/dplay.spec b/reactos/dll/directx/dplay/dplay.spec
similarity index 100%
rename from reactos/dll/dplay/dplay.spec
rename to reactos/dll/directx/dplay/dplay.spec
diff --git a/reactos/dll/dplay/dplay.xml b/reactos/dll/directx/dplay/dplay.xml
similarity index 100%
rename from reactos/dll/dplay/dplay.xml
rename to reactos/dll/directx/dplay/dplay.xml
diff --git a/reactos/dll/dplay/dplay_main.c b/reactos/dll/directx/dplay/dplay_main.c
similarity index 100%
rename from reactos/dll/dplay/dplay_main.c
rename to reactos/dll/directx/dplay/dplay_main.c
diff --git a/reactos/dll/dplay/version.rc b/reactos/dll/directx/dplay/version.rc
similarity index 100%
rename from reactos/dll/dplay/version.rc
rename to reactos/dll/directx/dplay/version.rc
diff --git a/reactos/dll/dplayx/dpclassfactory.c b/reactos/dll/directx/dplayx/dpclassfactory.c
similarity index 100%
rename from reactos/dll/dplayx/dpclassfactory.c
rename to reactos/dll/directx/dplayx/dpclassfactory.c
diff --git a/reactos/dll/dplayx/dpinit.h b/reactos/dll/directx/dplayx/dpinit.h
similarity index 100%
rename from reactos/dll/dplayx/dpinit.h
rename to reactos/dll/directx/dplayx/dpinit.h
diff --git a/reactos/dll/dplayx/dplay.c b/reactos/dll/directx/dplayx/dplay.c
similarity index 100%
rename from reactos/dll/dplayx/dplay.c
rename to reactos/dll/directx/dplayx/dplay.c
diff --git a/reactos/dll/dplayx/dplay_global.h b/reactos/dll/directx/dplayx/dplay_global.h
similarity index 100%
rename from reactos/dll/dplayx/dplay_global.h
rename to reactos/dll/directx/dplayx/dplay_global.h
diff --git a/reactos/dll/dplayx/dplaysp.c b/reactos/dll/directx/dplayx/dplaysp.c
similarity index 100%
rename from reactos/dll/dplayx/dplaysp.c
rename to reactos/dll/directx/dplayx/dplaysp.c
diff --git a/reactos/dll/dplayx/dplaysp.h b/reactos/dll/directx/dplayx/dplaysp.h
similarity index 100%
rename from reactos/dll/dplayx/dplaysp.h
rename to reactos/dll/directx/dplayx/dplaysp.h
diff --git a/reactos/dll/dplayx/dplayx.spec b/reactos/dll/directx/dplayx/dplayx.spec
similarity index 100%
rename from reactos/dll/dplayx/dplayx.spec
rename to reactos/dll/directx/dplayx/dplayx.spec
diff --git a/reactos/dll/dplayx/dplayx.xml b/reactos/dll/directx/dplayx/dplayx.xml
similarity index 100%
rename from reactos/dll/dplayx/dplayx.xml
rename to reactos/dll/directx/dplayx/dplayx.xml
diff --git a/reactos/dll/dplayx/dplayx_global.c b/reactos/dll/directx/dplayx/dplayx_global.c
similarity index 100%
rename from reactos/dll/dplayx/dplayx_global.c
rename to reactos/dll/directx/dplayx/dplayx_global.c
diff --git a/reactos/dll/dplayx/dplayx_global.h b/reactos/dll/directx/dplayx/dplayx_global.h
similarity index 100%
rename from reactos/dll/dplayx/dplayx_global.h
rename to reactos/dll/directx/dplayx/dplayx_global.h
diff --git a/reactos/dll/dplayx/dplayx_main.c b/reactos/dll/directx/dplayx/dplayx_main.c
similarity index 100%
rename from reactos/dll/dplayx/dplayx_main.c
rename to reactos/dll/directx/dplayx/dplayx_main.c
diff --git a/reactos/dll/dplayx/dplayx_messages.c b/reactos/dll/directx/dplayx/dplayx_messages.c
similarity index 100%
rename from reactos/dll/dplayx/dplayx_messages.c
rename to reactos/dll/directx/dplayx/dplayx_messages.c
diff --git a/reactos/dll/dplayx/dplayx_messages.h b/reactos/dll/directx/dplayx/dplayx_messages.h
similarity index 100%
rename from reactos/dll/dplayx/dplayx_messages.h
rename to reactos/dll/directx/dplayx/dplayx_messages.h
diff --git a/reactos/dll/dplayx/dplayx_queue.h b/reactos/dll/directx/dplayx/dplayx_queue.h
similarity index 100%
rename from reactos/dll/dplayx/dplayx_queue.h
rename to reactos/dll/directx/dplayx/dplayx_queue.h
diff --git a/reactos/dll/dplayx/dplobby.c b/reactos/dll/directx/dplayx/dplobby.c
similarity index 100%
rename from reactos/dll/dplayx/dplobby.c
rename to reactos/dll/directx/dplayx/dplobby.c
diff --git a/reactos/dll/dplayx/lobbysp.c b/reactos/dll/directx/dplayx/lobbysp.c
similarity index 100%
rename from reactos/dll/dplayx/lobbysp.c
rename to reactos/dll/directx/dplayx/lobbysp.c
diff --git a/reactos/dll/dplayx/lobbysp.h b/reactos/dll/directx/dplayx/lobbysp.h
similarity index 100%
rename from reactos/dll/dplayx/lobbysp.h
rename to reactos/dll/directx/dplayx/lobbysp.h
diff --git a/reactos/dll/dplayx/name_server.c b/reactos/dll/directx/dplayx/name_server.c
similarity index 100%
rename from reactos/dll/dplayx/name_server.c
rename to reactos/dll/directx/dplayx/name_server.c
diff --git a/reactos/dll/dplayx/name_server.h b/reactos/dll/directx/dplayx/name_server.h
similarity index 100%
rename from reactos/dll/dplayx/name_server.h
rename to reactos/dll/directx/dplayx/name_server.h
diff --git a/reactos/dll/dplayx/regsvr.c b/reactos/dll/directx/dplayx/regsvr.c
similarity index 100%
rename from reactos/dll/dplayx/regsvr.c
rename to reactos/dll/directx/dplayx/regsvr.c
diff --git a/reactos/dll/dplayx/version.rc b/reactos/dll/directx/dplayx/version.rc
similarity index 100%
rename from reactos/dll/dplayx/version.rc
rename to reactos/dll/directx/dplayx/version.rc
diff --git a/reactos/dll/dsound/buffer.c b/reactos/dll/directx/dsound/buffer.c
similarity index 100%
rename from reactos/dll/dsound/buffer.c
rename to reactos/dll/directx/dsound/buffer.c
diff --git a/reactos/dll/dsound/capture.c b/reactos/dll/directx/dsound/capture.c
similarity index 100%
rename from reactos/dll/dsound/capture.c
rename to reactos/dll/directx/dsound/capture.c
diff --git a/reactos/dll/dsound/dsound.c b/reactos/dll/directx/dsound/dsound.c
similarity index 100%
rename from reactos/dll/dsound/dsound.c
rename to reactos/dll/directx/dsound/dsound.c
diff --git a/reactos/dll/dsound/dsound.spec b/reactos/dll/directx/dsound/dsound.spec
similarity index 100%
rename from reactos/dll/dsound/dsound.spec
rename to reactos/dll/directx/dsound/dsound.spec
diff --git a/reactos/dll/dsound/dsound.xml b/reactos/dll/directx/dsound/dsound.xml
similarity index 100%
rename from reactos/dll/dsound/dsound.xml
rename to reactos/dll/directx/dsound/dsound.xml
diff --git a/reactos/dll/dsound/dsound_main.c b/reactos/dll/directx/dsound/dsound_main.c
similarity index 100%
rename from reactos/dll/dsound/dsound_main.c
rename to reactos/dll/directx/dsound/dsound_main.c
diff --git a/reactos/dll/dsound/dsound_private.h b/reactos/dll/directx/dsound/dsound_private.h
similarity index 100%
rename from reactos/dll/dsound/dsound_private.h
rename to reactos/dll/directx/dsound/dsound_private.h
diff --git a/reactos/dll/dsound/duplex.c b/reactos/dll/directx/dsound/duplex.c
similarity index 100%
rename from reactos/dll/dsound/duplex.c
rename to reactos/dll/directx/dsound/duplex.c
diff --git a/reactos/dll/dsound/dxroslayer/dxros_layer.h b/reactos/dll/directx/dsound/dxroslayer/dxros_layer.h
similarity index 100%
rename from reactos/dll/dsound/dxroslayer/dxros_layer.h
rename to reactos/dll/directx/dsound/dxroslayer/dxros_layer.h
diff --git a/reactos/dll/dsound/dxroslayer/dxrosdrv_querydsounddesc.c b/reactos/dll/directx/dsound/dxroslayer/dxrosdrv_querydsounddesc.c
similarity index 100%
rename from reactos/dll/dsound/dxroslayer/dxrosdrv_querydsounddesc.c
rename to reactos/dll/directx/dsound/dxroslayer/dxrosdrv_querydsounddesc.c
diff --git a/reactos/dll/dsound/dxroslayer/dxrosdrv_querydsoundiface.c b/reactos/dll/directx/dsound/dxroslayer/dxrosdrv_querydsoundiface.c
similarity index 100%
rename from reactos/dll/dsound/dxroslayer/dxrosdrv_querydsoundiface.c
rename to reactos/dll/directx/dsound/dxroslayer/dxrosdrv_querydsoundiface.c
diff --git a/reactos/dll/dsound/dxroslayer/dxroslayer.c b/reactos/dll/directx/dsound/dxroslayer/dxroslayer.c
similarity index 100%
rename from reactos/dll/dsound/dxroslayer/dxroslayer.c
rename to reactos/dll/directx/dsound/dxroslayer/dxroslayer.c
diff --git a/reactos/dll/dsound/dxroslayer/getguidfromstring.c b/reactos/dll/directx/dsound/dxroslayer/getguidfromstring.c
similarity index 100%
rename from reactos/dll/dsound/dxroslayer/getguidfromstring.c
rename to reactos/dll/directx/dsound/dxroslayer/getguidfromstring.c
diff --git a/reactos/dll/dsound/mixer.c b/reactos/dll/directx/dsound/mixer.c
similarity index 100%
rename from reactos/dll/dsound/mixer.c
rename to reactos/dll/directx/dsound/mixer.c
diff --git a/reactos/dll/dsound/primary.c b/reactos/dll/directx/dsound/primary.c
similarity index 100%
rename from reactos/dll/dsound/primary.c
rename to reactos/dll/directx/dsound/primary.c
diff --git a/reactos/dll/dsound/propset.c b/reactos/dll/directx/dsound/propset.c
similarity index 100%
rename from reactos/dll/dsound/propset.c
rename to reactos/dll/directx/dsound/propset.c
diff --git a/reactos/dll/dsound/regsvr.c b/reactos/dll/directx/dsound/regsvr.c
similarity index 100%
rename from reactos/dll/dsound/regsvr.c
rename to reactos/dll/directx/dsound/regsvr.c
diff --git a/reactos/dll/dsound/sound3d.c b/reactos/dll/directx/dsound/sound3d.c
similarity index 100%
rename from reactos/dll/dsound/sound3d.c
rename to reactos/dll/directx/dsound/sound3d.c
diff --git a/reactos/dll/dsound/tests/.cvsignore b/reactos/dll/directx/dsound/tests/.cvsignore
similarity index 100%
rename from reactos/dll/dsound/tests/.cvsignore
rename to reactos/dll/directx/dsound/tests/.cvsignore
diff --git a/reactos/dll/dsound/tests/Makefile.in b/reactos/dll/directx/dsound/tests/Makefile.in
similarity index 100%
rename from reactos/dll/dsound/tests/Makefile.in
rename to reactos/dll/directx/dsound/tests/Makefile.in
diff --git a/reactos/dll/dsound/tests/capture.c b/reactos/dll/directx/dsound/tests/capture.c
similarity index 100%
rename from reactos/dll/dsound/tests/capture.c
rename to reactos/dll/directx/dsound/tests/capture.c
diff --git a/reactos/dll/dsound/tests/ds3d.c b/reactos/dll/directx/dsound/tests/ds3d.c
similarity index 100%
rename from reactos/dll/dsound/tests/ds3d.c
rename to reactos/dll/directx/dsound/tests/ds3d.c
diff --git a/reactos/dll/dsound/tests/ds3d8.c b/reactos/dll/directx/dsound/tests/ds3d8.c
similarity index 100%
rename from reactos/dll/dsound/tests/ds3d8.c
rename to reactos/dll/directx/dsound/tests/ds3d8.c
diff --git a/reactos/dll/dsound/tests/dsound.c b/reactos/dll/directx/dsound/tests/dsound.c
similarity index 100%
rename from reactos/dll/dsound/tests/dsound.c
rename to reactos/dll/directx/dsound/tests/dsound.c
diff --git a/reactos/dll/dsound/tests/dsound8.c b/reactos/dll/directx/dsound/tests/dsound8.c
similarity index 100%
rename from reactos/dll/dsound/tests/dsound8.c
rename to reactos/dll/directx/dsound/tests/dsound8.c
diff --git a/reactos/dll/dsound/tests/dsound_test.h b/reactos/dll/directx/dsound/tests/dsound_test.h
similarity index 100%
rename from reactos/dll/dsound/tests/dsound_test.h
rename to reactos/dll/directx/dsound/tests/dsound_test.h
diff --git a/reactos/dll/dsound/tests/propset.c b/reactos/dll/directx/dsound/tests/propset.c
similarity index 100%
rename from reactos/dll/dsound/tests/propset.c
rename to reactos/dll/directx/dsound/tests/propset.c
diff --git a/reactos/dll/dsound/version.rc b/reactos/dll/directx/dsound/version.rc
similarity index 100%
rename from reactos/dll/dsound/version.rc
rename to reactos/dll/directx/dsound/version.rc
diff --git a/reactos/lib/keyboard/directory.xml b/reactos/dll/keyboard/directory.xml
similarity index 100%
rename from reactos/lib/keyboard/directory.xml
rename to reactos/dll/keyboard/directory.xml
diff --git a/reactos/lib/keyboard/kbdbe/kbdbe.c b/reactos/dll/keyboard/kbdbe/kbdbe.c
similarity index 100%
rename from reactos/lib/keyboard/kbdbe/kbdbe.c
rename to reactos/dll/keyboard/kbdbe/kbdbe.c
diff --git a/reactos/lib/keyboard/kbdbe/kbdbe.def b/reactos/dll/keyboard/kbdbe/kbdbe.def
similarity index 100%
rename from reactos/lib/keyboard/kbdbe/kbdbe.def
rename to reactos/dll/keyboard/kbdbe/kbdbe.def
diff --git a/reactos/lib/keyboard/kbdbe/kbdbe.rc b/reactos/dll/keyboard/kbdbe/kbdbe.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdbe/kbdbe.rc
rename to reactos/dll/keyboard/kbdbe/kbdbe.rc
diff --git a/reactos/lib/keyboard/kbdbe/kbdbe.xml b/reactos/dll/keyboard/kbdbe/kbdbe.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdbe/kbdbe.xml
rename to reactos/dll/keyboard/kbdbe/kbdbe.xml
diff --git a/reactos/lib/keyboard/kbdda/kbdda.c b/reactos/dll/keyboard/kbdda/kbdda.c
similarity index 100%
rename from reactos/lib/keyboard/kbdda/kbdda.c
rename to reactos/dll/keyboard/kbdda/kbdda.c
diff --git a/reactos/lib/keyboard/kbdda/kbdda.def b/reactos/dll/keyboard/kbdda/kbdda.def
similarity index 100%
rename from reactos/lib/keyboard/kbdda/kbdda.def
rename to reactos/dll/keyboard/kbdda/kbdda.def
diff --git a/reactos/lib/keyboard/kbdda/kbdda.rc b/reactos/dll/keyboard/kbdda/kbdda.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdda/kbdda.rc
rename to reactos/dll/keyboard/kbdda/kbdda.rc
diff --git a/reactos/lib/keyboard/kbdda/kbdda.xml b/reactos/dll/keyboard/kbdda/kbdda.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdda/kbdda.xml
rename to reactos/dll/keyboard/kbdda/kbdda.xml
diff --git a/reactos/lib/keyboard/kbddv/kbddv.c b/reactos/dll/keyboard/kbddv/kbddv.c
similarity index 100%
rename from reactos/lib/keyboard/kbddv/kbddv.c
rename to reactos/dll/keyboard/kbddv/kbddv.c
diff --git a/reactos/lib/keyboard/kbddv/kbddv.def b/reactos/dll/keyboard/kbddv/kbddv.def
similarity index 100%
rename from reactos/lib/keyboard/kbddv/kbddv.def
rename to reactos/dll/keyboard/kbddv/kbddv.def
diff --git a/reactos/lib/keyboard/kbddv/kbddv.rc b/reactos/dll/keyboard/kbddv/kbddv.rc
similarity index 100%
rename from reactos/lib/keyboard/kbddv/kbddv.rc
rename to reactos/dll/keyboard/kbddv/kbddv.rc
diff --git a/reactos/lib/keyboard/kbddv/kbddv.xml b/reactos/dll/keyboard/kbddv/kbddv.xml
similarity index 100%
rename from reactos/lib/keyboard/kbddv/kbddv.xml
rename to reactos/dll/keyboard/kbddv/kbddv.xml
diff --git a/reactos/lib/keyboard/kbdes/kbdes.c b/reactos/dll/keyboard/kbdes/kbdes.c
similarity index 100%
rename from reactos/lib/keyboard/kbdes/kbdes.c
rename to reactos/dll/keyboard/kbdes/kbdes.c
diff --git a/reactos/lib/keyboard/kbdes/kbdes.def b/reactos/dll/keyboard/kbdes/kbdes.def
similarity index 100%
rename from reactos/lib/keyboard/kbdes/kbdes.def
rename to reactos/dll/keyboard/kbdes/kbdes.def
diff --git a/reactos/lib/keyboard/kbdes/kbdes.rc b/reactos/dll/keyboard/kbdes/kbdes.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdes/kbdes.rc
rename to reactos/dll/keyboard/kbdes/kbdes.rc
diff --git a/reactos/lib/keyboard/kbdes/kbdes.xml b/reactos/dll/keyboard/kbdes/kbdes.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdes/kbdes.xml
rename to reactos/dll/keyboard/kbdes/kbdes.xml
diff --git a/reactos/lib/keyboard/kbdfr/kbdfr.c b/reactos/dll/keyboard/kbdfr/kbdfr.c
similarity index 100%
rename from reactos/lib/keyboard/kbdfr/kbdfr.c
rename to reactos/dll/keyboard/kbdfr/kbdfr.c
diff --git a/reactos/lib/keyboard/kbdfr/kbdfr.def b/reactos/dll/keyboard/kbdfr/kbdfr.def
similarity index 100%
rename from reactos/lib/keyboard/kbdfr/kbdfr.def
rename to reactos/dll/keyboard/kbdfr/kbdfr.def
diff --git a/reactos/lib/keyboard/kbdfr/kbdfr.rc b/reactos/dll/keyboard/kbdfr/kbdfr.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdfr/kbdfr.rc
rename to reactos/dll/keyboard/kbdfr/kbdfr.rc
diff --git a/reactos/lib/keyboard/kbdfr/kbdfr.xml b/reactos/dll/keyboard/kbdfr/kbdfr.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdfr/kbdfr.xml
rename to reactos/dll/keyboard/kbdfr/kbdfr.xml
diff --git a/reactos/lib/keyboard/kbdgr/kbdgr.c b/reactos/dll/keyboard/kbdgr/kbdgr.c
similarity index 100%
rename from reactos/lib/keyboard/kbdgr/kbdgr.c
rename to reactos/dll/keyboard/kbdgr/kbdgr.c
diff --git a/reactos/lib/keyboard/kbdgr/kbdgr.def b/reactos/dll/keyboard/kbdgr/kbdgr.def
similarity index 100%
rename from reactos/lib/keyboard/kbdgr/kbdgr.def
rename to reactos/dll/keyboard/kbdgr/kbdgr.def
diff --git a/reactos/lib/keyboard/kbdgr/kbdgr.rc b/reactos/dll/keyboard/kbdgr/kbdgr.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdgr/kbdgr.rc
rename to reactos/dll/keyboard/kbdgr/kbdgr.rc
diff --git a/reactos/lib/keyboard/kbdgr/kbdgr.xml b/reactos/dll/keyboard/kbdgr/kbdgr.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdgr/kbdgr.xml
rename to reactos/dll/keyboard/kbdgr/kbdgr.xml
diff --git a/reactos/lib/keyboard/kbdhe/kbdhe.c b/reactos/dll/keyboard/kbdhe/kbdhe.c
similarity index 100%
rename from reactos/lib/keyboard/kbdhe/kbdhe.c
rename to reactos/dll/keyboard/kbdhe/kbdhe.c
diff --git a/reactos/lib/keyboard/kbdhe/kbdhe.def b/reactos/dll/keyboard/kbdhe/kbdhe.def
similarity index 100%
rename from reactos/lib/keyboard/kbdhe/kbdhe.def
rename to reactos/dll/keyboard/kbdhe/kbdhe.def
diff --git a/reactos/lib/keyboard/kbdhe/kbdhe.rc b/reactos/dll/keyboard/kbdhe/kbdhe.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdhe/kbdhe.rc
rename to reactos/dll/keyboard/kbdhe/kbdhe.rc
diff --git a/reactos/lib/keyboard/kbdhe/kbdhe.xml b/reactos/dll/keyboard/kbdhe/kbdhe.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdhe/kbdhe.xml
rename to reactos/dll/keyboard/kbdhe/kbdhe.xml
diff --git a/reactos/lib/keyboard/kbdheb/kbdheb.c b/reactos/dll/keyboard/kbdheb/kbdheb.c
similarity index 100%
rename from reactos/lib/keyboard/kbdheb/kbdheb.c
rename to reactos/dll/keyboard/kbdheb/kbdheb.c
diff --git a/reactos/lib/keyboard/kbdheb/kbdheb.def b/reactos/dll/keyboard/kbdheb/kbdheb.def
similarity index 100%
rename from reactos/lib/keyboard/kbdheb/kbdheb.def
rename to reactos/dll/keyboard/kbdheb/kbdheb.def
diff --git a/reactos/lib/keyboard/kbdheb/kbdheb.rc b/reactos/dll/keyboard/kbdheb/kbdheb.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdheb/kbdheb.rc
rename to reactos/dll/keyboard/kbdheb/kbdheb.rc
diff --git a/reactos/lib/keyboard/kbdheb/kbdheb.xml b/reactos/dll/keyboard/kbdheb/kbdheb.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdheb/kbdheb.xml
rename to reactos/dll/keyboard/kbdheb/kbdheb.xml
diff --git a/reactos/lib/keyboard/kbdhu/kbdhu.c b/reactos/dll/keyboard/kbdhu/kbdhu.c
similarity index 100%
rename from reactos/lib/keyboard/kbdhu/kbdhu.c
rename to reactos/dll/keyboard/kbdhu/kbdhu.c
diff --git a/reactos/lib/keyboard/kbdhu/kbdhu.def b/reactos/dll/keyboard/kbdhu/kbdhu.def
similarity index 100%
rename from reactos/lib/keyboard/kbdhu/kbdhu.def
rename to reactos/dll/keyboard/kbdhu/kbdhu.def
diff --git a/reactos/lib/keyboard/kbdhu/kbdhu.rc b/reactos/dll/keyboard/kbdhu/kbdhu.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdhu/kbdhu.rc
rename to reactos/dll/keyboard/kbdhu/kbdhu.rc
diff --git a/reactos/lib/keyboard/kbdhu/kbdhu.xml b/reactos/dll/keyboard/kbdhu/kbdhu.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdhu/kbdhu.xml
rename to reactos/dll/keyboard/kbdhu/kbdhu.xml
diff --git a/reactos/lib/keyboard/kbdpo/kbdpo.c b/reactos/dll/keyboard/kbdpo/kbdpo.c
similarity index 100%
rename from reactos/lib/keyboard/kbdpo/kbdpo.c
rename to reactos/dll/keyboard/kbdpo/kbdpo.c
diff --git a/reactos/lib/keyboard/kbdpo/kbdpo.def b/reactos/dll/keyboard/kbdpo/kbdpo.def
similarity index 100%
rename from reactos/lib/keyboard/kbdpo/kbdpo.def
rename to reactos/dll/keyboard/kbdpo/kbdpo.def
diff --git a/reactos/lib/keyboard/kbdpo/kbdpo.rc b/reactos/dll/keyboard/kbdpo/kbdpo.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdpo/kbdpo.rc
rename to reactos/dll/keyboard/kbdpo/kbdpo.rc
diff --git a/reactos/lib/keyboard/kbdpo/kbdpo.xml b/reactos/dll/keyboard/kbdpo/kbdpo.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdpo/kbdpo.xml
rename to reactos/dll/keyboard/kbdpo/kbdpo.xml
diff --git a/reactos/lib/keyboard/kbdru/kbdru.c b/reactos/dll/keyboard/kbdru/kbdru.c
similarity index 100%
rename from reactos/lib/keyboard/kbdru/kbdru.c
rename to reactos/dll/keyboard/kbdru/kbdru.c
diff --git a/reactos/lib/keyboard/kbdru/kbdru.def b/reactos/dll/keyboard/kbdru/kbdru.def
similarity index 100%
rename from reactos/lib/keyboard/kbdru/kbdru.def
rename to reactos/dll/keyboard/kbdru/kbdru.def
diff --git a/reactos/lib/keyboard/kbdru/kbdru.rc b/reactos/dll/keyboard/kbdru/kbdru.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdru/kbdru.rc
rename to reactos/dll/keyboard/kbdru/kbdru.rc
diff --git a/reactos/lib/keyboard/kbdru/kbdru.xml b/reactos/dll/keyboard/kbdru/kbdru.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdru/kbdru.xml
rename to reactos/dll/keyboard/kbdru/kbdru.xml
diff --git a/reactos/lib/keyboard/kbdse/kbdse.c b/reactos/dll/keyboard/kbdse/kbdse.c
similarity index 100%
rename from reactos/lib/keyboard/kbdse/kbdse.c
rename to reactos/dll/keyboard/kbdse/kbdse.c
diff --git a/reactos/lib/keyboard/kbdse/kbdse.def b/reactos/dll/keyboard/kbdse/kbdse.def
similarity index 100%
rename from reactos/lib/keyboard/kbdse/kbdse.def
rename to reactos/dll/keyboard/kbdse/kbdse.def
diff --git a/reactos/lib/keyboard/kbdse/kbdse.rc b/reactos/dll/keyboard/kbdse/kbdse.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdse/kbdse.rc
rename to reactos/dll/keyboard/kbdse/kbdse.rc
diff --git a/reactos/lib/keyboard/kbdse/kbdse.xml b/reactos/dll/keyboard/kbdse/kbdse.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdse/kbdse.xml
rename to reactos/dll/keyboard/kbdse/kbdse.xml
diff --git a/reactos/lib/keyboard/kbdsg/kbdsg.c b/reactos/dll/keyboard/kbdsg/kbdsg.c
similarity index 100%
rename from reactos/lib/keyboard/kbdsg/kbdsg.c
rename to reactos/dll/keyboard/kbdsg/kbdsg.c
diff --git a/reactos/lib/keyboard/kbdsg/kbdsg.def b/reactos/dll/keyboard/kbdsg/kbdsg.def
similarity index 100%
rename from reactos/lib/keyboard/kbdsg/kbdsg.def
rename to reactos/dll/keyboard/kbdsg/kbdsg.def
diff --git a/reactos/lib/keyboard/kbdsg/kbdsg.rc b/reactos/dll/keyboard/kbdsg/kbdsg.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdsg/kbdsg.rc
rename to reactos/dll/keyboard/kbdsg/kbdsg.rc
diff --git a/reactos/lib/keyboard/kbdsg/kbdsg.xml b/reactos/dll/keyboard/kbdsg/kbdsg.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdsg/kbdsg.xml
rename to reactos/dll/keyboard/kbdsg/kbdsg.xml
diff --git a/reactos/lib/keyboard/kbdsk/kbdsk.c b/reactos/dll/keyboard/kbdsk/kbdsk.c
similarity index 100%
rename from reactos/lib/keyboard/kbdsk/kbdsk.c
rename to reactos/dll/keyboard/kbdsk/kbdsk.c
diff --git a/reactos/lib/keyboard/kbdsk/kbdsk.def b/reactos/dll/keyboard/kbdsk/kbdsk.def
similarity index 100%
rename from reactos/lib/keyboard/kbdsk/kbdsk.def
rename to reactos/dll/keyboard/kbdsk/kbdsk.def
diff --git a/reactos/lib/keyboard/kbdsk/kbdsk.rc b/reactos/dll/keyboard/kbdsk/kbdsk.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdsk/kbdsk.rc
rename to reactos/dll/keyboard/kbdsk/kbdsk.rc
diff --git a/reactos/lib/keyboard/kbdsk/kbdsk.xml b/reactos/dll/keyboard/kbdsk/kbdsk.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdsk/kbdsk.xml
rename to reactos/dll/keyboard/kbdsk/kbdsk.xml
diff --git a/reactos/lib/keyboard/kbduk/kbduk.c b/reactos/dll/keyboard/kbduk/kbduk.c
similarity index 100%
rename from reactos/lib/keyboard/kbduk/kbduk.c
rename to reactos/dll/keyboard/kbduk/kbduk.c
diff --git a/reactos/lib/keyboard/kbduk/kbduk.def b/reactos/dll/keyboard/kbduk/kbduk.def
similarity index 100%
rename from reactos/lib/keyboard/kbduk/kbduk.def
rename to reactos/dll/keyboard/kbduk/kbduk.def
diff --git a/reactos/lib/keyboard/kbduk/kbduk.rc b/reactos/dll/keyboard/kbduk/kbduk.rc
similarity index 100%
rename from reactos/lib/keyboard/kbduk/kbduk.rc
rename to reactos/dll/keyboard/kbduk/kbduk.rc
diff --git a/reactos/lib/keyboard/kbduk/kbduk.xml b/reactos/dll/keyboard/kbduk/kbduk.xml
similarity index 100%
rename from reactos/lib/keyboard/kbduk/kbduk.xml
rename to reactos/dll/keyboard/kbduk/kbduk.xml
diff --git a/reactos/lib/keyboard/kbdur/kbdur.c b/reactos/dll/keyboard/kbdur/kbdur.c
similarity index 100%
rename from reactos/lib/keyboard/kbdur/kbdur.c
rename to reactos/dll/keyboard/kbdur/kbdur.c
diff --git a/reactos/lib/keyboard/kbdur/kbdur.def b/reactos/dll/keyboard/kbdur/kbdur.def
similarity index 100%
rename from reactos/lib/keyboard/kbdur/kbdur.def
rename to reactos/dll/keyboard/kbdur/kbdur.def
diff --git a/reactos/lib/keyboard/kbdur/kbdur.rc b/reactos/dll/keyboard/kbdur/kbdur.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdur/kbdur.rc
rename to reactos/dll/keyboard/kbdur/kbdur.rc
diff --git a/reactos/lib/keyboard/kbdur/kbdur.xml b/reactos/dll/keyboard/kbdur/kbdur.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdur/kbdur.xml
rename to reactos/dll/keyboard/kbdur/kbdur.xml
diff --git a/reactos/lib/keyboard/kbdus/kbdus.c b/reactos/dll/keyboard/kbdus/kbdus.c
similarity index 100%
rename from reactos/lib/keyboard/kbdus/kbdus.c
rename to reactos/dll/keyboard/kbdus/kbdus.c
diff --git a/reactos/lib/keyboard/kbdus/kbdus.def b/reactos/dll/keyboard/kbdus/kbdus.def
similarity index 100%
rename from reactos/lib/keyboard/kbdus/kbdus.def
rename to reactos/dll/keyboard/kbdus/kbdus.def
diff --git a/reactos/lib/keyboard/kbdus/kbdus.rc b/reactos/dll/keyboard/kbdus/kbdus.rc
similarity index 100%
rename from reactos/lib/keyboard/kbdus/kbdus.rc
rename to reactos/dll/keyboard/kbdus/kbdus.rc
diff --git a/reactos/lib/keyboard/kbdus/kbdus.xml b/reactos/dll/keyboard/kbdus/kbdus.xml
similarity index 100%
rename from reactos/lib/keyboard/kbdus/kbdus.xml
rename to reactos/dll/keyboard/kbdus/kbdus.xml
diff --git a/reactos/dll/win32/.gitignore b/reactos/dll/win32/.gitignore
new file mode 100644
index 00000000000..e69de29bb2d