diff --git a/reactos/lib/glu32/glu32.def b/reactos/dll/glu32/glu32.def
similarity index 100%
rename from reactos/lib/glu32/glu32.def
rename to reactos/dll/glu32/glu32.def
diff --git a/reactos/lib/glu32/glu32.xml b/reactos/dll/glu32/glu32.xml
similarity index 100%
rename from reactos/lib/glu32/glu32.xml
rename to reactos/dll/glu32/glu32.xml
diff --git a/reactos/lib/glu32/include/gluos.h b/reactos/dll/glu32/include/gluos.h
similarity index 100%
rename from reactos/lib/glu32/include/gluos.h
rename to reactos/dll/glu32/include/gluos.h
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierEval.cc b/reactos/dll/glu32/libnurbs/interface/bezierEval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierEval.cc
rename to reactos/dll/glu32/libnurbs/interface/bezierEval.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierEval.h b/reactos/dll/glu32/libnurbs/interface/bezierEval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierEval.h
rename to reactos/dll/glu32/libnurbs/interface/bezierEval.h
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierPatch.cc b/reactos/dll/glu32/libnurbs/interface/bezierPatch.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierPatch.cc
rename to reactos/dll/glu32/libnurbs/interface/bezierPatch.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierPatch.h b/reactos/dll/glu32/libnurbs/interface/bezierPatch.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierPatch.h
rename to reactos/dll/glu32/libnurbs/interface/bezierPatch.h
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierPatchMesh.cc b/reactos/dll/glu32/libnurbs/interface/bezierPatchMesh.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierPatchMesh.cc
rename to reactos/dll/glu32/libnurbs/interface/bezierPatchMesh.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/bezierPatchMesh.h b/reactos/dll/glu32/libnurbs/interface/bezierPatchMesh.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/bezierPatchMesh.h
rename to reactos/dll/glu32/libnurbs/interface/bezierPatchMesh.h
diff --git a/reactos/lib/glu32/libnurbs/interface/glcurveval.cc b/reactos/dll/glu32/libnurbs/interface/glcurveval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glcurveval.cc
rename to reactos/dll/glu32/libnurbs/interface/glcurveval.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/glcurveval.h b/reactos/dll/glu32/libnurbs/interface/glcurveval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glcurveval.h
rename to reactos/dll/glu32/libnurbs/interface/glcurveval.h
diff --git a/reactos/lib/glu32/libnurbs/interface/glimports.h b/reactos/dll/glu32/libnurbs/interface/glimports.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glimports.h
rename to reactos/dll/glu32/libnurbs/interface/glimports.h
diff --git a/reactos/lib/glu32/libnurbs/interface/glinterface.cc b/reactos/dll/glu32/libnurbs/interface/glinterface.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glinterface.cc
rename to reactos/dll/glu32/libnurbs/interface/glinterface.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/glrenderer.cc b/reactos/dll/glu32/libnurbs/interface/glrenderer.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glrenderer.cc
rename to reactos/dll/glu32/libnurbs/interface/glrenderer.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/glrenderer.h b/reactos/dll/glu32/libnurbs/interface/glrenderer.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glrenderer.h
rename to reactos/dll/glu32/libnurbs/interface/glrenderer.h
diff --git a/reactos/lib/glu32/libnurbs/interface/glsurfeval.cc b/reactos/dll/glu32/libnurbs/interface/glsurfeval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glsurfeval.cc
rename to reactos/dll/glu32/libnurbs/interface/glsurfeval.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/glsurfeval.h b/reactos/dll/glu32/libnurbs/interface/glsurfeval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/glsurfeval.h
rename to reactos/dll/glu32/libnurbs/interface/glsurfeval.h
diff --git a/reactos/lib/glu32/libnurbs/interface/incurveeval.cc b/reactos/dll/glu32/libnurbs/interface/incurveeval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/incurveeval.cc
rename to reactos/dll/glu32/libnurbs/interface/incurveeval.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/insurfeval.cc b/reactos/dll/glu32/libnurbs/interface/insurfeval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/insurfeval.cc
rename to reactos/dll/glu32/libnurbs/interface/insurfeval.cc
diff --git a/reactos/lib/glu32/libnurbs/interface/mystdio.h b/reactos/dll/glu32/libnurbs/interface/mystdio.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/mystdio.h
rename to reactos/dll/glu32/libnurbs/interface/mystdio.h
diff --git a/reactos/lib/glu32/libnurbs/interface/mystdlib.h b/reactos/dll/glu32/libnurbs/interface/mystdlib.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/interface/mystdlib.h
rename to reactos/dll/glu32/libnurbs/interface/mystdlib.h
diff --git a/reactos/lib/glu32/libnurbs/internals/arc.cc b/reactos/dll/glu32/libnurbs/internals/arc.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arc.cc
rename to reactos/dll/glu32/libnurbs/internals/arc.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/arc.h b/reactos/dll/glu32/libnurbs/internals/arc.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arc.h
rename to reactos/dll/glu32/libnurbs/internals/arc.h
diff --git a/reactos/lib/glu32/libnurbs/internals/arcsorter.cc b/reactos/dll/glu32/libnurbs/internals/arcsorter.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arcsorter.cc
rename to reactos/dll/glu32/libnurbs/internals/arcsorter.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/arcsorter.h b/reactos/dll/glu32/libnurbs/internals/arcsorter.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arcsorter.h
rename to reactos/dll/glu32/libnurbs/internals/arcsorter.h
diff --git a/reactos/lib/glu32/libnurbs/internals/arctess.cc b/reactos/dll/glu32/libnurbs/internals/arctess.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arctess.cc
rename to reactos/dll/glu32/libnurbs/internals/arctess.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/arctess.h b/reactos/dll/glu32/libnurbs/internals/arctess.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/arctess.h
rename to reactos/dll/glu32/libnurbs/internals/arctess.h
diff --git a/reactos/lib/glu32/libnurbs/internals/backend.cc b/reactos/dll/glu32/libnurbs/internals/backend.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/backend.cc
rename to reactos/dll/glu32/libnurbs/internals/backend.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/backend.h b/reactos/dll/glu32/libnurbs/internals/backend.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/backend.h
rename to reactos/dll/glu32/libnurbs/internals/backend.h
diff --git a/reactos/lib/glu32/libnurbs/internals/basiccrveval.cc b/reactos/dll/glu32/libnurbs/internals/basiccrveval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/basiccrveval.cc
rename to reactos/dll/glu32/libnurbs/internals/basiccrveval.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/basiccrveval.h b/reactos/dll/glu32/libnurbs/internals/basiccrveval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/basiccrveval.h
rename to reactos/dll/glu32/libnurbs/internals/basiccrveval.h
diff --git a/reactos/lib/glu32/libnurbs/internals/basicsurfeval.cc b/reactos/dll/glu32/libnurbs/internals/basicsurfeval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/basicsurfeval.cc
rename to reactos/dll/glu32/libnurbs/internals/basicsurfeval.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/basicsurfeval.h b/reactos/dll/glu32/libnurbs/internals/basicsurfeval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/basicsurfeval.h
rename to reactos/dll/glu32/libnurbs/internals/basicsurfeval.h
diff --git a/reactos/lib/glu32/libnurbs/internals/bezierarc.h b/reactos/dll/glu32/libnurbs/internals/bezierarc.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/bezierarc.h
rename to reactos/dll/glu32/libnurbs/internals/bezierarc.h
diff --git a/reactos/lib/glu32/libnurbs/internals/bin.cc b/reactos/dll/glu32/libnurbs/internals/bin.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/bin.cc
rename to reactos/dll/glu32/libnurbs/internals/bin.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/bin.h b/reactos/dll/glu32/libnurbs/internals/bin.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/bin.h
rename to reactos/dll/glu32/libnurbs/internals/bin.h
diff --git a/reactos/lib/glu32/libnurbs/internals/bufpool.cc b/reactos/dll/glu32/libnurbs/internals/bufpool.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/bufpool.cc
rename to reactos/dll/glu32/libnurbs/internals/bufpool.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/bufpool.h b/reactos/dll/glu32/libnurbs/internals/bufpool.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/bufpool.h
rename to reactos/dll/glu32/libnurbs/internals/bufpool.h
diff --git a/reactos/lib/glu32/libnurbs/internals/cachingeval.cc b/reactos/dll/glu32/libnurbs/internals/cachingeval.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/cachingeval.cc
rename to reactos/dll/glu32/libnurbs/internals/cachingeval.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/cachingeval.h b/reactos/dll/glu32/libnurbs/internals/cachingeval.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/cachingeval.h
rename to reactos/dll/glu32/libnurbs/internals/cachingeval.h
diff --git a/reactos/lib/glu32/libnurbs/internals/ccw.cc b/reactos/dll/glu32/libnurbs/internals/ccw.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/ccw.cc
rename to reactos/dll/glu32/libnurbs/internals/ccw.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/coveandtiler.cc b/reactos/dll/glu32/libnurbs/internals/coveandtiler.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/coveandtiler.cc
rename to reactos/dll/glu32/libnurbs/internals/coveandtiler.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/coveandtiler.h b/reactos/dll/glu32/libnurbs/internals/coveandtiler.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/coveandtiler.h
rename to reactos/dll/glu32/libnurbs/internals/coveandtiler.h
diff --git a/reactos/lib/glu32/libnurbs/internals/curve.cc b/reactos/dll/glu32/libnurbs/internals/curve.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/curve.cc
rename to reactos/dll/glu32/libnurbs/internals/curve.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/curve.h b/reactos/dll/glu32/libnurbs/internals/curve.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/curve.h
rename to reactos/dll/glu32/libnurbs/internals/curve.h
diff --git a/reactos/lib/glu32/libnurbs/internals/curvelist.cc b/reactos/dll/glu32/libnurbs/internals/curvelist.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/curvelist.cc
rename to reactos/dll/glu32/libnurbs/internals/curvelist.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/curvelist.h b/reactos/dll/glu32/libnurbs/internals/curvelist.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/curvelist.h
rename to reactos/dll/glu32/libnurbs/internals/curvelist.h
diff --git a/reactos/lib/glu32/libnurbs/internals/curvesub.cc b/reactos/dll/glu32/libnurbs/internals/curvesub.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/curvesub.cc
rename to reactos/dll/glu32/libnurbs/internals/curvesub.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/dataTransform.cc b/reactos/dll/glu32/libnurbs/internals/dataTransform.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/dataTransform.cc
rename to reactos/dll/glu32/libnurbs/internals/dataTransform.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/dataTransform.h b/reactos/dll/glu32/libnurbs/internals/dataTransform.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/dataTransform.h
rename to reactos/dll/glu32/libnurbs/internals/dataTransform.h
diff --git a/reactos/lib/glu32/libnurbs/internals/defines.h b/reactos/dll/glu32/libnurbs/internals/defines.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/defines.h
rename to reactos/dll/glu32/libnurbs/internals/defines.h
diff --git a/reactos/lib/glu32/libnurbs/internals/displaylist.cc b/reactos/dll/glu32/libnurbs/internals/displaylist.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/displaylist.cc
rename to reactos/dll/glu32/libnurbs/internals/displaylist.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/displaylist.h b/reactos/dll/glu32/libnurbs/internals/displaylist.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/displaylist.h
rename to reactos/dll/glu32/libnurbs/internals/displaylist.h
diff --git a/reactos/lib/glu32/libnurbs/internals/displaymode.h b/reactos/dll/glu32/libnurbs/internals/displaymode.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/displaymode.h
rename to reactos/dll/glu32/libnurbs/internals/displaymode.h
diff --git a/reactos/lib/glu32/libnurbs/internals/flist.cc b/reactos/dll/glu32/libnurbs/internals/flist.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/flist.cc
rename to reactos/dll/glu32/libnurbs/internals/flist.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/flist.h b/reactos/dll/glu32/libnurbs/internals/flist.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/flist.h
rename to reactos/dll/glu32/libnurbs/internals/flist.h
diff --git a/reactos/lib/glu32/libnurbs/internals/flistsorter.cc b/reactos/dll/glu32/libnurbs/internals/flistsorter.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/flistsorter.cc
rename to reactos/dll/glu32/libnurbs/internals/flistsorter.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/flistsorter.h b/reactos/dll/glu32/libnurbs/internals/flistsorter.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/flistsorter.h
rename to reactos/dll/glu32/libnurbs/internals/flistsorter.h
diff --git a/reactos/lib/glu32/libnurbs/internals/gridline.h b/reactos/dll/glu32/libnurbs/internals/gridline.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/gridline.h
rename to reactos/dll/glu32/libnurbs/internals/gridline.h
diff --git a/reactos/lib/glu32/libnurbs/internals/gridtrimvertex.h b/reactos/dll/glu32/libnurbs/internals/gridtrimvertex.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/gridtrimvertex.h
rename to reactos/dll/glu32/libnurbs/internals/gridtrimvertex.h
diff --git a/reactos/lib/glu32/libnurbs/internals/gridvertex.h b/reactos/dll/glu32/libnurbs/internals/gridvertex.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/gridvertex.h
rename to reactos/dll/glu32/libnurbs/internals/gridvertex.h
diff --git a/reactos/lib/glu32/libnurbs/internals/hull.cc b/reactos/dll/glu32/libnurbs/internals/hull.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/hull.cc
rename to reactos/dll/glu32/libnurbs/internals/hull.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/hull.h b/reactos/dll/glu32/libnurbs/internals/hull.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/hull.h
rename to reactos/dll/glu32/libnurbs/internals/hull.h
diff --git a/reactos/lib/glu32/libnurbs/internals/intersect.cc b/reactos/dll/glu32/libnurbs/internals/intersect.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/intersect.cc
rename to reactos/dll/glu32/libnurbs/internals/intersect.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/jarcloc.h b/reactos/dll/glu32/libnurbs/internals/jarcloc.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/jarcloc.h
rename to reactos/dll/glu32/libnurbs/internals/jarcloc.h
diff --git a/reactos/lib/glu32/libnurbs/internals/knotvector.cc b/reactos/dll/glu32/libnurbs/internals/knotvector.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/knotvector.cc
rename to reactos/dll/glu32/libnurbs/internals/knotvector.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/knotvector.h b/reactos/dll/glu32/libnurbs/internals/knotvector.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/knotvector.h
rename to reactos/dll/glu32/libnurbs/internals/knotvector.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mapdesc.cc b/reactos/dll/glu32/libnurbs/internals/mapdesc.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mapdesc.cc
rename to reactos/dll/glu32/libnurbs/internals/mapdesc.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/mapdesc.h b/reactos/dll/glu32/libnurbs/internals/mapdesc.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mapdesc.h
rename to reactos/dll/glu32/libnurbs/internals/mapdesc.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mapdescv.cc b/reactos/dll/glu32/libnurbs/internals/mapdescv.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mapdescv.cc
rename to reactos/dll/glu32/libnurbs/internals/mapdescv.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/maplist.cc b/reactos/dll/glu32/libnurbs/internals/maplist.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/maplist.cc
rename to reactos/dll/glu32/libnurbs/internals/maplist.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/maplist.h b/reactos/dll/glu32/libnurbs/internals/maplist.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/maplist.h
rename to reactos/dll/glu32/libnurbs/internals/maplist.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mesher.cc b/reactos/dll/glu32/libnurbs/internals/mesher.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mesher.cc
rename to reactos/dll/glu32/libnurbs/internals/mesher.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/mesher.h b/reactos/dll/glu32/libnurbs/internals/mesher.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mesher.h
rename to reactos/dll/glu32/libnurbs/internals/mesher.h
diff --git a/reactos/lib/glu32/libnurbs/internals/monoTriangulationBackend.cc b/reactos/dll/glu32/libnurbs/internals/monoTriangulationBackend.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/monoTriangulationBackend.cc
rename to reactos/dll/glu32/libnurbs/internals/monoTriangulationBackend.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/monotonizer.cc b/reactos/dll/glu32/libnurbs/internals/monotonizer.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/monotonizer.cc
rename to reactos/dll/glu32/libnurbs/internals/monotonizer.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/monotonizer.h b/reactos/dll/glu32/libnurbs/internals/monotonizer.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/monotonizer.h
rename to reactos/dll/glu32/libnurbs/internals/monotonizer.h
diff --git a/reactos/lib/glu32/libnurbs/internals/myassert.h b/reactos/dll/glu32/libnurbs/internals/myassert.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/myassert.h
rename to reactos/dll/glu32/libnurbs/internals/myassert.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mycode.cc b/reactos/dll/glu32/libnurbs/internals/mycode.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mycode.cc
rename to reactos/dll/glu32/libnurbs/internals/mycode.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/mymath.h b/reactos/dll/glu32/libnurbs/internals/mymath.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mymath.h
rename to reactos/dll/glu32/libnurbs/internals/mymath.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mysetjmp.h b/reactos/dll/glu32/libnurbs/internals/mysetjmp.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mysetjmp.h
rename to reactos/dll/glu32/libnurbs/internals/mysetjmp.h
diff --git a/reactos/lib/glu32/libnurbs/internals/mystring.h b/reactos/dll/glu32/libnurbs/internals/mystring.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/mystring.h
rename to reactos/dll/glu32/libnurbs/internals/mystring.h
diff --git a/reactos/lib/glu32/libnurbs/internals/nurbsconsts.h b/reactos/dll/glu32/libnurbs/internals/nurbsconsts.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/nurbsconsts.h
rename to reactos/dll/glu32/libnurbs/internals/nurbsconsts.h
diff --git a/reactos/lib/glu32/libnurbs/internals/nurbsinterfac.cc b/reactos/dll/glu32/libnurbs/internals/nurbsinterfac.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/nurbsinterfac.cc
rename to reactos/dll/glu32/libnurbs/internals/nurbsinterfac.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/nurbstess.cc b/reactos/dll/glu32/libnurbs/internals/nurbstess.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/nurbstess.cc
rename to reactos/dll/glu32/libnurbs/internals/nurbstess.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/nurbstess.h b/reactos/dll/glu32/libnurbs/internals/nurbstess.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/nurbstess.h
rename to reactos/dll/glu32/libnurbs/internals/nurbstess.h
diff --git a/reactos/lib/glu32/libnurbs/internals/patch.cc b/reactos/dll/glu32/libnurbs/internals/patch.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/patch.cc
rename to reactos/dll/glu32/libnurbs/internals/patch.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/patch.h b/reactos/dll/glu32/libnurbs/internals/patch.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/patch.h
rename to reactos/dll/glu32/libnurbs/internals/patch.h
diff --git a/reactos/lib/glu32/libnurbs/internals/patchlist.cc b/reactos/dll/glu32/libnurbs/internals/patchlist.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/patchlist.cc
rename to reactos/dll/glu32/libnurbs/internals/patchlist.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/patchlist.h b/reactos/dll/glu32/libnurbs/internals/patchlist.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/patchlist.h
rename to reactos/dll/glu32/libnurbs/internals/patchlist.h
diff --git a/reactos/lib/glu32/libnurbs/internals/pwlarc.h b/reactos/dll/glu32/libnurbs/internals/pwlarc.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/pwlarc.h
rename to reactos/dll/glu32/libnurbs/internals/pwlarc.h
diff --git a/reactos/lib/glu32/libnurbs/internals/quilt.cc b/reactos/dll/glu32/libnurbs/internals/quilt.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/quilt.cc
rename to reactos/dll/glu32/libnurbs/internals/quilt.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/quilt.h b/reactos/dll/glu32/libnurbs/internals/quilt.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/quilt.h
rename to reactos/dll/glu32/libnurbs/internals/quilt.h
diff --git a/reactos/lib/glu32/libnurbs/internals/reader.cc b/reactos/dll/glu32/libnurbs/internals/reader.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/reader.cc
rename to reactos/dll/glu32/libnurbs/internals/reader.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/reader.h b/reactos/dll/glu32/libnurbs/internals/reader.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/reader.h
rename to reactos/dll/glu32/libnurbs/internals/reader.h
diff --git a/reactos/lib/glu32/libnurbs/internals/renderhints.cc b/reactos/dll/glu32/libnurbs/internals/renderhints.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/renderhints.cc
rename to reactos/dll/glu32/libnurbs/internals/renderhints.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/renderhints.h b/reactos/dll/glu32/libnurbs/internals/renderhints.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/renderhints.h
rename to reactos/dll/glu32/libnurbs/internals/renderhints.h
diff --git a/reactos/lib/glu32/libnurbs/internals/simplemath.h b/reactos/dll/glu32/libnurbs/internals/simplemath.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/simplemath.h
rename to reactos/dll/glu32/libnurbs/internals/simplemath.h
diff --git a/reactos/lib/glu32/libnurbs/internals/slicer.cc b/reactos/dll/glu32/libnurbs/internals/slicer.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/slicer.cc
rename to reactos/dll/glu32/libnurbs/internals/slicer.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/slicer.h b/reactos/dll/glu32/libnurbs/internals/slicer.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/slicer.h
rename to reactos/dll/glu32/libnurbs/internals/slicer.h
diff --git a/reactos/lib/glu32/libnurbs/internals/sorter.cc b/reactos/dll/glu32/libnurbs/internals/sorter.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/sorter.cc
rename to reactos/dll/glu32/libnurbs/internals/sorter.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/sorter.h b/reactos/dll/glu32/libnurbs/internals/sorter.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/sorter.h
rename to reactos/dll/glu32/libnurbs/internals/sorter.h
diff --git a/reactos/lib/glu32/libnurbs/internals/splitarcs.cc b/reactos/dll/glu32/libnurbs/internals/splitarcs.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/splitarcs.cc
rename to reactos/dll/glu32/libnurbs/internals/splitarcs.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/subdivider.cc b/reactos/dll/glu32/libnurbs/internals/subdivider.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/subdivider.cc
rename to reactos/dll/glu32/libnurbs/internals/subdivider.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/subdivider.h b/reactos/dll/glu32/libnurbs/internals/subdivider.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/subdivider.h
rename to reactos/dll/glu32/libnurbs/internals/subdivider.h
diff --git a/reactos/lib/glu32/libnurbs/internals/tobezier.cc b/reactos/dll/glu32/libnurbs/internals/tobezier.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/tobezier.cc
rename to reactos/dll/glu32/libnurbs/internals/tobezier.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/trimline.cc b/reactos/dll/glu32/libnurbs/internals/trimline.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimline.cc
rename to reactos/dll/glu32/libnurbs/internals/trimline.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/trimline.h b/reactos/dll/glu32/libnurbs/internals/trimline.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimline.h
rename to reactos/dll/glu32/libnurbs/internals/trimline.h
diff --git a/reactos/lib/glu32/libnurbs/internals/trimregion.cc b/reactos/dll/glu32/libnurbs/internals/trimregion.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimregion.cc
rename to reactos/dll/glu32/libnurbs/internals/trimregion.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/trimregion.h b/reactos/dll/glu32/libnurbs/internals/trimregion.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimregion.h
rename to reactos/dll/glu32/libnurbs/internals/trimregion.h
diff --git a/reactos/lib/glu32/libnurbs/internals/trimvertex.h b/reactos/dll/glu32/libnurbs/internals/trimvertex.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimvertex.h
rename to reactos/dll/glu32/libnurbs/internals/trimvertex.h
diff --git a/reactos/lib/glu32/libnurbs/internals/trimvertpool.cc b/reactos/dll/glu32/libnurbs/internals/trimvertpool.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimvertpool.cc
rename to reactos/dll/glu32/libnurbs/internals/trimvertpool.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/trimvertpool.h b/reactos/dll/glu32/libnurbs/internals/trimvertpool.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/trimvertpool.h
rename to reactos/dll/glu32/libnurbs/internals/trimvertpool.h
diff --git a/reactos/lib/glu32/libnurbs/internals/types.h b/reactos/dll/glu32/libnurbs/internals/types.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/types.h
rename to reactos/dll/glu32/libnurbs/internals/types.h
diff --git a/reactos/lib/glu32/libnurbs/internals/uarray.cc b/reactos/dll/glu32/libnurbs/internals/uarray.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/uarray.cc
rename to reactos/dll/glu32/libnurbs/internals/uarray.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/uarray.h b/reactos/dll/glu32/libnurbs/internals/uarray.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/uarray.h
rename to reactos/dll/glu32/libnurbs/internals/uarray.h
diff --git a/reactos/lib/glu32/libnurbs/internals/varray.cc b/reactos/dll/glu32/libnurbs/internals/varray.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/varray.cc
rename to reactos/dll/glu32/libnurbs/internals/varray.cc
diff --git a/reactos/lib/glu32/libnurbs/internals/varray.h b/reactos/dll/glu32/libnurbs/internals/varray.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/internals/varray.h
rename to reactos/dll/glu32/libnurbs/internals/varray.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/definitions.h b/reactos/dll/glu32/libnurbs/nurbtess/definitions.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/definitions.h
rename to reactos/dll/glu32/libnurbs/nurbtess/definitions.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/directedLine.cc b/reactos/dll/glu32/libnurbs/nurbtess/directedLine.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/directedLine.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/directedLine.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/directedLine.h b/reactos/dll/glu32/libnurbs/nurbtess/directedLine.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/directedLine.h
rename to reactos/dll/glu32/libnurbs/nurbtess/directedLine.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/glimports.h b/reactos/dll/glu32/libnurbs/nurbtess/glimports.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/glimports.h
rename to reactos/dll/glu32/libnurbs/nurbtess/glimports.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/gridWrap.cc b/reactos/dll/glu32/libnurbs/nurbtess/gridWrap.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/gridWrap.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/gridWrap.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/gridWrap.h b/reactos/dll/glu32/libnurbs/nurbtess/gridWrap.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/gridWrap.h
rename to reactos/dll/glu32/libnurbs/nurbtess/gridWrap.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoChain.cc b/reactos/dll/glu32/libnurbs/nurbtess/monoChain.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoChain.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/monoChain.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoChain.h b/reactos/dll/glu32/libnurbs/nurbtess/monoChain.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoChain.h
rename to reactos/dll/glu32/libnurbs/nurbtess/monoChain.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoPolyPart.cc b/reactos/dll/glu32/libnurbs/nurbtess/monoPolyPart.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoPolyPart.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/monoPolyPart.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoPolyPart.h b/reactos/dll/glu32/libnurbs/nurbtess/monoPolyPart.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoPolyPart.h
rename to reactos/dll/glu32/libnurbs/nurbtess/monoPolyPart.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc b/reactos/dll/glu32/libnurbs/nurbtess/monoTriangulation.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/monoTriangulation.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.h b/reactos/dll/glu32/libnurbs/nurbtess/monoTriangulation.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/monoTriangulation.h
rename to reactos/dll/glu32/libnurbs/nurbtess/monoTriangulation.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/mystdio.h b/reactos/dll/glu32/libnurbs/nurbtess/mystdio.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/mystdio.h
rename to reactos/dll/glu32/libnurbs/nurbtess/mystdio.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/mystdlib.h b/reactos/dll/glu32/libnurbs/nurbtess/mystdlib.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/mystdlib.h
rename to reactos/dll/glu32/libnurbs/nurbtess/mystdlib.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/partitionX.cc b/reactos/dll/glu32/libnurbs/nurbtess/partitionX.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/partitionX.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/partitionX.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/partitionX.h b/reactos/dll/glu32/libnurbs/nurbtess/partitionX.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/partitionX.h
rename to reactos/dll/glu32/libnurbs/nurbtess/partitionX.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/partitionY.cc b/reactos/dll/glu32/libnurbs/nurbtess/partitionY.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/partitionY.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/partitionY.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/partitionY.h b/reactos/dll/glu32/libnurbs/nurbtess/partitionY.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/partitionY.h
rename to reactos/dll/glu32/libnurbs/nurbtess/partitionY.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/polyDBG.cc b/reactos/dll/glu32/libnurbs/nurbtess/polyDBG.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/polyDBG.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/polyDBG.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/polyDBG.h b/reactos/dll/glu32/libnurbs/nurbtess/polyDBG.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/polyDBG.h
rename to reactos/dll/glu32/libnurbs/nurbtess/polyDBG.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/polyUtil.cc b/reactos/dll/glu32/libnurbs/nurbtess/polyUtil.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/polyUtil.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/polyUtil.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/polyUtil.h b/reactos/dll/glu32/libnurbs/nurbtess/polyUtil.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/polyUtil.h
rename to reactos/dll/glu32/libnurbs/nurbtess/polyUtil.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/primitiveStream.cc b/reactos/dll/glu32/libnurbs/nurbtess/primitiveStream.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/primitiveStream.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/primitiveStream.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/primitiveStream.h b/reactos/dll/glu32/libnurbs/nurbtess/primitiveStream.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/primitiveStream.h
rename to reactos/dll/glu32/libnurbs/nurbtess/primitiveStream.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/quicksort.cc b/reactos/dll/glu32/libnurbs/nurbtess/quicksort.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/quicksort.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/quicksort.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/quicksort.h b/reactos/dll/glu32/libnurbs/nurbtess/quicksort.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/quicksort.h
rename to reactos/dll/glu32/libnurbs/nurbtess/quicksort.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/rectBlock.cc b/reactos/dll/glu32/libnurbs/nurbtess/rectBlock.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/rectBlock.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/rectBlock.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/rectBlock.h b/reactos/dll/glu32/libnurbs/nurbtess/rectBlock.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/rectBlock.h
rename to reactos/dll/glu32/libnurbs/nurbtess/rectBlock.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampleComp.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleComp.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleComp.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleComp.h b/reactos/dll/glu32/libnurbs/nurbtess/sampleComp.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleComp.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleComp.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompBot.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompBot.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompBot.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompBot.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompBot.h b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompBot.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompBot.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompBot.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompRight.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompRight.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.h b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompRight.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompRight.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompRight.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompTop.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompTop.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompTop.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompTop.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleCompTop.h b/reactos/dll/glu32/libnurbs/nurbtess/sampleCompTop.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleCompTop.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleCompTop.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampleMonoPoly.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleMonoPoly.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.h b/reactos/dll/glu32/libnurbs/nurbtess/sampleMonoPoly.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampleMonoPoly.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampleMonoPoly.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampledLine.cc b/reactos/dll/glu32/libnurbs/nurbtess/sampledLine.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampledLine.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/sampledLine.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/sampledLine.h b/reactos/dll/glu32/libnurbs/nurbtess/sampledLine.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/sampledLine.h
rename to reactos/dll/glu32/libnurbs/nurbtess/sampledLine.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/searchTree.cc b/reactos/dll/glu32/libnurbs/nurbtess/searchTree.cc
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/searchTree.cc
rename to reactos/dll/glu32/libnurbs/nurbtess/searchTree.cc
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/searchTree.h b/reactos/dll/glu32/libnurbs/nurbtess/searchTree.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/searchTree.h
rename to reactos/dll/glu32/libnurbs/nurbtess/searchTree.h
diff --git a/reactos/lib/glu32/libnurbs/nurbtess/zlassert.h b/reactos/dll/glu32/libnurbs/nurbtess/zlassert.h
similarity index 100%
rename from reactos/lib/glu32/libnurbs/nurbtess/zlassert.h
rename to reactos/dll/glu32/libnurbs/nurbtess/zlassert.h
diff --git a/reactos/lib/glu32/libtess/README b/reactos/dll/glu32/libtess/README
similarity index 100%
rename from reactos/lib/glu32/libtess/README
rename to reactos/dll/glu32/libtess/README
diff --git a/reactos/lib/glu32/libtess/alg-outline b/reactos/dll/glu32/libtess/alg-outline
similarity index 100%
rename from reactos/lib/glu32/libtess/alg-outline
rename to reactos/dll/glu32/libtess/alg-outline
diff --git a/reactos/lib/glu32/libtess/dict-list.h b/reactos/dll/glu32/libtess/dict-list.h
similarity index 100%
rename from reactos/lib/glu32/libtess/dict-list.h
rename to reactos/dll/glu32/libtess/dict-list.h
diff --git a/reactos/lib/glu32/libtess/dict.c b/reactos/dll/glu32/libtess/dict.c
similarity index 100%
rename from reactos/lib/glu32/libtess/dict.c
rename to reactos/dll/glu32/libtess/dict.c
diff --git a/reactos/lib/glu32/libtess/dict.h b/reactos/dll/glu32/libtess/dict.h
similarity index 100%
rename from reactos/lib/glu32/libtess/dict.h
rename to reactos/dll/glu32/libtess/dict.h
diff --git a/reactos/lib/glu32/libtess/geom.c b/reactos/dll/glu32/libtess/geom.c
similarity index 100%
rename from reactos/lib/glu32/libtess/geom.c
rename to reactos/dll/glu32/libtess/geom.c
diff --git a/reactos/lib/glu32/libtess/geom.h b/reactos/dll/glu32/libtess/geom.h
similarity index 100%
rename from reactos/lib/glu32/libtess/geom.h
rename to reactos/dll/glu32/libtess/geom.h
diff --git a/reactos/lib/glu32/libtess/memalloc.c b/reactos/dll/glu32/libtess/memalloc.c
similarity index 100%
rename from reactos/lib/glu32/libtess/memalloc.c
rename to reactos/dll/glu32/libtess/memalloc.c
diff --git a/reactos/lib/glu32/libtess/memalloc.h b/reactos/dll/glu32/libtess/memalloc.h
similarity index 100%
rename from reactos/lib/glu32/libtess/memalloc.h
rename to reactos/dll/glu32/libtess/memalloc.h
diff --git a/reactos/lib/glu32/libtess/mesh.c b/reactos/dll/glu32/libtess/mesh.c
similarity index 100%
rename from reactos/lib/glu32/libtess/mesh.c
rename to reactos/dll/glu32/libtess/mesh.c
diff --git a/reactos/lib/glu32/libtess/mesh.h b/reactos/dll/glu32/libtess/mesh.h
similarity index 100%
rename from reactos/lib/glu32/libtess/mesh.h
rename to reactos/dll/glu32/libtess/mesh.h
diff --git a/reactos/lib/glu32/libtess/normal.c b/reactos/dll/glu32/libtess/normal.c
similarity index 100%
rename from reactos/lib/glu32/libtess/normal.c
rename to reactos/dll/glu32/libtess/normal.c
diff --git a/reactos/lib/glu32/libtess/normal.h b/reactos/dll/glu32/libtess/normal.h
similarity index 100%
rename from reactos/lib/glu32/libtess/normal.h
rename to reactos/dll/glu32/libtess/normal.h
diff --git a/reactos/lib/glu32/libtess/priorityq-heap.c b/reactos/dll/glu32/libtess/priorityq-heap.c
similarity index 100%
rename from reactos/lib/glu32/libtess/priorityq-heap.c
rename to reactos/dll/glu32/libtess/priorityq-heap.c
diff --git a/reactos/lib/glu32/libtess/priorityq-heap.h b/reactos/dll/glu32/libtess/priorityq-heap.h
similarity index 100%
rename from reactos/lib/glu32/libtess/priorityq-heap.h
rename to reactos/dll/glu32/libtess/priorityq-heap.h
diff --git a/reactos/lib/glu32/libtess/priorityq-sort.h b/reactos/dll/glu32/libtess/priorityq-sort.h
similarity index 100%
rename from reactos/lib/glu32/libtess/priorityq-sort.h
rename to reactos/dll/glu32/libtess/priorityq-sort.h
diff --git a/reactos/lib/glu32/libtess/priorityq.c b/reactos/dll/glu32/libtess/priorityq.c
similarity index 100%
rename from reactos/lib/glu32/libtess/priorityq.c
rename to reactos/dll/glu32/libtess/priorityq.c
diff --git a/reactos/lib/glu32/libtess/priorityq.h b/reactos/dll/glu32/libtess/priorityq.h
similarity index 100%
rename from reactos/lib/glu32/libtess/priorityq.h
rename to reactos/dll/glu32/libtess/priorityq.h
diff --git a/reactos/lib/glu32/libtess/render.c b/reactos/dll/glu32/libtess/render.c
similarity index 100%
rename from reactos/lib/glu32/libtess/render.c
rename to reactos/dll/glu32/libtess/render.c
diff --git a/reactos/lib/glu32/libtess/render.h b/reactos/dll/glu32/libtess/render.h
similarity index 100%
rename from reactos/lib/glu32/libtess/render.h
rename to reactos/dll/glu32/libtess/render.h
diff --git a/reactos/lib/glu32/libtess/sweep.c b/reactos/dll/glu32/libtess/sweep.c
similarity index 100%
rename from reactos/lib/glu32/libtess/sweep.c
rename to reactos/dll/glu32/libtess/sweep.c
diff --git a/reactos/lib/glu32/libtess/sweep.h b/reactos/dll/glu32/libtess/sweep.h
similarity index 100%
rename from reactos/lib/glu32/libtess/sweep.h
rename to reactos/dll/glu32/libtess/sweep.h
diff --git a/reactos/lib/glu32/libtess/tess.c b/reactos/dll/glu32/libtess/tess.c
similarity index 100%
rename from reactos/lib/glu32/libtess/tess.c
rename to reactos/dll/glu32/libtess/tess.c
diff --git a/reactos/lib/glu32/libtess/tess.h b/reactos/dll/glu32/libtess/tess.h
similarity index 100%
rename from reactos/lib/glu32/libtess/tess.h
rename to reactos/dll/glu32/libtess/tess.h
diff --git a/reactos/lib/glu32/libtess/tessmono.c b/reactos/dll/glu32/libtess/tessmono.c
similarity index 100%
rename from reactos/lib/glu32/libtess/tessmono.c
rename to reactos/dll/glu32/libtess/tessmono.c
diff --git a/reactos/lib/glu32/libtess/tessmono.h b/reactos/dll/glu32/libtess/tessmono.h
similarity index 100%
rename from reactos/lib/glu32/libtess/tessmono.h
rename to reactos/dll/glu32/libtess/tessmono.h
diff --git a/reactos/lib/glu32/libutil/error.c b/reactos/dll/glu32/libutil/error.c
similarity index 100%
rename from reactos/lib/glu32/libutil/error.c
rename to reactos/dll/glu32/libutil/error.c
diff --git a/reactos/lib/glu32/libutil/glue.c b/reactos/dll/glu32/libutil/glue.c
similarity index 100%
rename from reactos/lib/glu32/libutil/glue.c
rename to reactos/dll/glu32/libutil/glue.c
diff --git a/reactos/lib/glu32/libutil/gluint.h b/reactos/dll/glu32/libutil/gluint.h
similarity index 100%
rename from reactos/lib/glu32/libutil/gluint.h
rename to reactos/dll/glu32/libutil/gluint.h
diff --git a/reactos/lib/glu32/libutil/mipmap.c b/reactos/dll/glu32/libutil/mipmap.c
similarity index 100%
rename from reactos/lib/glu32/libutil/mipmap.c
rename to reactos/dll/glu32/libutil/mipmap.c
diff --git a/reactos/lib/glu32/libutil/project.c b/reactos/dll/glu32/libutil/project.c
similarity index 100%
rename from reactos/lib/glu32/libutil/project.c
rename to reactos/dll/glu32/libutil/project.c
diff --git a/reactos/lib/glu32/libutil/quad.c b/reactos/dll/glu32/libutil/quad.c
similarity index 100%
rename from reactos/lib/glu32/libutil/quad.c
rename to reactos/dll/glu32/libutil/quad.c
diff --git a/reactos/lib/glu32/libutil/registry.c b/reactos/dll/glu32/libutil/registry.c
similarity index 100%
rename from reactos/lib/glu32/libutil/registry.c
rename to reactos/dll/glu32/libutil/registry.c
diff --git a/reactos/lib/hid/hid.c b/reactos/dll/hid/hid.c
similarity index 100%
rename from reactos/lib/hid/hid.c
rename to reactos/dll/hid/hid.c
diff --git a/reactos/lib/hid/hid.def b/reactos/dll/hid/hid.def
similarity index 100%
rename from reactos/lib/hid/hid.def
rename to reactos/dll/hid/hid.def
diff --git a/reactos/lib/hid/hid.rc b/reactos/dll/hid/hid.rc
similarity index 100%
rename from reactos/lib/hid/hid.rc
rename to reactos/dll/hid/hid.rc
diff --git a/reactos/lib/hid/hid.xml b/reactos/dll/hid/hid.xml
similarity index 100%
rename from reactos/lib/hid/hid.xml
rename to reactos/dll/hid/hid.xml
diff --git a/reactos/lib/hid/precomp.h b/reactos/dll/hid/precomp.h
similarity index 100%
rename from reactos/lib/hid/precomp.h
rename to reactos/dll/hid/precomp.h
diff --git a/reactos/lib/hid/stubs.c b/reactos/dll/hid/stubs.c
similarity index 100%
rename from reactos/lib/hid/stubs.c
rename to reactos/dll/hid/stubs.c
diff --git a/reactos/lib/icmp/Makefile.in b/reactos/dll/icmp/Makefile.in
similarity index 100%
rename from reactos/lib/icmp/Makefile.in
rename to reactos/dll/icmp/Makefile.in
diff --git a/reactos/lib/icmp/icmp.dsp b/reactos/dll/icmp/icmp.dsp
similarity index 100%
rename from reactos/lib/icmp/icmp.dsp
rename to reactos/dll/icmp/icmp.dsp
diff --git a/reactos/lib/icmp/icmp.rc b/reactos/dll/icmp/icmp.rc
similarity index 100%
rename from reactos/lib/icmp/icmp.rc
rename to reactos/dll/icmp/icmp.rc
diff --git a/reactos/lib/icmp/icmp.spec b/reactos/dll/icmp/icmp.spec
similarity index 100%
rename from reactos/lib/icmp/icmp.spec
rename to reactos/dll/icmp/icmp.spec
diff --git a/reactos/lib/icmp/icmp.xml b/reactos/dll/icmp/icmp.xml
similarity index 100%
rename from reactos/lib/icmp/icmp.xml
rename to reactos/dll/icmp/icmp.xml
diff --git a/reactos/lib/icmp/icmp_main.c b/reactos/dll/icmp/icmp_main.c
similarity index 100%
rename from reactos/lib/icmp/icmp_main.c
rename to reactos/dll/icmp/icmp_main.c
diff --git a/reactos/lib/icmp/ip.h b/reactos/dll/icmp/ip.h
similarity index 100%
rename from reactos/lib/icmp/ip.h
rename to reactos/dll/icmp/ip.h
diff --git a/reactos/lib/icmp/ip_icmp.h b/reactos/dll/icmp/ip_icmp.h
similarity index 100%
rename from reactos/lib/icmp/ip_icmp.h
rename to reactos/dll/icmp/ip_icmp.h
diff --git a/reactos/lib/imagehlp/access.c b/reactos/dll/imagehlp/access.c
similarity index 100%
rename from reactos/lib/imagehlp/access.c
rename to reactos/dll/imagehlp/access.c
diff --git a/reactos/lib/imagehlp/imagehlp.def b/reactos/dll/imagehlp/imagehlp.def
similarity index 100%
rename from reactos/lib/imagehlp/imagehlp.def
rename to reactos/dll/imagehlp/imagehlp.def
diff --git a/reactos/lib/imagehlp/imagehlp.rc b/reactos/dll/imagehlp/imagehlp.rc
similarity index 100%
rename from reactos/lib/imagehlp/imagehlp.rc
rename to reactos/dll/imagehlp/imagehlp.rc
diff --git a/reactos/lib/imagehlp/imagehlp.xml b/reactos/dll/imagehlp/imagehlp.xml
similarity index 100%
rename from reactos/lib/imagehlp/imagehlp.xml
rename to reactos/dll/imagehlp/imagehlp.xml
diff --git a/reactos/lib/imagehlp/imagehlp_main.c b/reactos/dll/imagehlp/imagehlp_main.c
similarity index 100%
rename from reactos/lib/imagehlp/imagehlp_main.c
rename to reactos/dll/imagehlp/imagehlp_main.c
diff --git a/reactos/lib/imagehlp/integrity.c b/reactos/dll/imagehlp/integrity.c
similarity index 100%
rename from reactos/lib/imagehlp/integrity.c
rename to reactos/dll/imagehlp/integrity.c
diff --git a/reactos/lib/imagehlp/modify.c b/reactos/dll/imagehlp/modify.c
similarity index 100%
rename from reactos/lib/imagehlp/modify.c
rename to reactos/dll/imagehlp/modify.c
diff --git a/reactos/lib/imagehlp/precomp.h b/reactos/dll/imagehlp/precomp.h
similarity index 100%
rename from reactos/lib/imagehlp/precomp.h
rename to reactos/dll/imagehlp/precomp.h
diff --git a/reactos/lib/imm32/imm.c b/reactos/dll/imm32/imm.c
similarity index 100%
rename from reactos/lib/imm32/imm.c
rename to reactos/dll/imm32/imm.c
diff --git a/reactos/lib/imm32/imm32.spec b/reactos/dll/imm32/imm32.spec
similarity index 100%
rename from reactos/lib/imm32/imm32.spec
rename to reactos/dll/imm32/imm32.spec
diff --git a/reactos/lib/imm32/imm32.xml b/reactos/dll/imm32/imm32.xml
similarity index 100%
rename from reactos/lib/imm32/imm32.xml
rename to reactos/dll/imm32/imm32.xml
diff --git a/reactos/lib/fmifs/chkdsk.c b/reactos/fmifs/chkdsk.c
similarity index 100%
rename from reactos/lib/fmifs/chkdsk.c
rename to reactos/fmifs/chkdsk.c
diff --git a/reactos/lib/fmifs/compress.c b/reactos/fmifs/compress.c
similarity index 100%
rename from reactos/lib/fmifs/compress.c
rename to reactos/fmifs/compress.c
diff --git a/reactos/lib/fmifs/diskcopy.c b/reactos/fmifs/diskcopy.c
similarity index 100%
rename from reactos/lib/fmifs/diskcopy.c
rename to reactos/fmifs/diskcopy.c
diff --git a/reactos/lib/fmifs/extend.c b/reactos/fmifs/extend.c
similarity index 100%
rename from reactos/lib/fmifs/extend.c
rename to reactos/fmifs/extend.c
diff --git a/reactos/lib/fmifs/fmifs.def b/reactos/fmifs/fmifs.def
similarity index 100%
rename from reactos/lib/fmifs/fmifs.def
rename to reactos/fmifs/fmifs.def
diff --git a/reactos/lib/fmifs/fmifs.rc b/reactos/fmifs/fmifs.rc
similarity index 100%
rename from reactos/lib/fmifs/fmifs.rc
rename to reactos/fmifs/fmifs.rc
diff --git a/reactos/lib/fmifs/fmifs.xml b/reactos/fmifs/fmifs.xml
similarity index 100%
rename from reactos/lib/fmifs/fmifs.xml
rename to reactos/fmifs/fmifs.xml
diff --git a/reactos/lib/fmifs/format.c b/reactos/fmifs/format.c
similarity index 100%
rename from reactos/lib/fmifs/format.c
rename to reactos/fmifs/format.c
diff --git a/reactos/lib/fmifs/init.c b/reactos/fmifs/init.c
similarity index 100%
rename from reactos/lib/fmifs/init.c
rename to reactos/fmifs/init.c
diff --git a/reactos/lib/fmifs/label.c b/reactos/fmifs/label.c
similarity index 100%
rename from reactos/lib/fmifs/label.c
rename to reactos/fmifs/label.c
diff --git a/reactos/lib/fmifs/media.c b/reactos/fmifs/media.c
similarity index 100%
rename from reactos/lib/fmifs/media.c
rename to reactos/fmifs/media.c
diff --git a/reactos/lib/fmifs/precomp.h b/reactos/fmifs/precomp.h
similarity index 100%
rename from reactos/lib/fmifs/precomp.h
rename to reactos/fmifs/precomp.h
diff --git a/reactos/lib/gdi32/gdi32.def b/reactos/gdi32/gdi32.def
similarity index 100%
rename from reactos/lib/gdi32/gdi32.def
rename to reactos/gdi32/gdi32.def
diff --git a/reactos/lib/gdi32/gdi32.rc b/reactos/gdi32/gdi32.rc
similarity index 100%
rename from reactos/lib/gdi32/gdi32.rc
rename to reactos/gdi32/gdi32.rc
diff --git a/reactos/lib/gdi32/gdi32.xml b/reactos/gdi32/gdi32.xml
similarity index 100%
rename from reactos/lib/gdi32/gdi32.xml
rename to reactos/gdi32/gdi32.xml
diff --git a/reactos/lib/gdi32/gdi32_specs b/reactos/gdi32/gdi32_specs
similarity index 100%
rename from reactos/lib/gdi32/gdi32_specs
rename to reactos/gdi32/gdi32_specs
diff --git a/reactos/lib/gdi32/include/gdi32p.h b/reactos/gdi32/include/gdi32p.h
similarity index 100%
rename from reactos/lib/gdi32/include/gdi32p.h
rename to reactos/gdi32/include/gdi32p.h
diff --git a/reactos/lib/gdi32/include/precomp.h b/reactos/gdi32/include/precomp.h
similarity index 100%
rename from reactos/lib/gdi32/include/precomp.h
rename to reactos/gdi32/include/precomp.h
diff --git a/reactos/lib/gdi32/main/dllmain.c b/reactos/gdi32/main/dllmain.c
similarity index 100%
rename from reactos/lib/gdi32/main/dllmain.c
rename to reactos/gdi32/main/dllmain.c
diff --git a/reactos/lib/gdi32/misc/gdientry.c b/reactos/gdi32/misc/gdientry.c
similarity index 100%
rename from reactos/lib/gdi32/misc/gdientry.c
rename to reactos/gdi32/misc/gdientry.c
diff --git a/reactos/lib/gdi32/misc/heap.c b/reactos/gdi32/misc/heap.c
similarity index 100%
rename from reactos/lib/gdi32/misc/heap.c
rename to reactos/gdi32/misc/heap.c
diff --git a/reactos/lib/gdi32/misc/misc.c b/reactos/gdi32/misc/misc.c
similarity index 100%
rename from reactos/lib/gdi32/misc/misc.c
rename to reactos/gdi32/misc/misc.c
diff --git a/reactos/lib/gdi32/misc/stubs.c b/reactos/gdi32/misc/stubs.c
similarity index 100%
rename from reactos/lib/gdi32/misc/stubs.c
rename to reactos/gdi32/misc/stubs.c
diff --git a/reactos/lib/gdi32/misc/stubsa.c b/reactos/gdi32/misc/stubsa.c
similarity index 100%
rename from reactos/lib/gdi32/misc/stubsa.c
rename to reactos/gdi32/misc/stubsa.c
diff --git a/reactos/lib/gdi32/misc/stubsw.c b/reactos/gdi32/misc/stubsw.c
similarity index 100%
rename from reactos/lib/gdi32/misc/stubsw.c
rename to reactos/gdi32/misc/stubsw.c
diff --git a/reactos/lib/gdi32/misc/wingl.c b/reactos/gdi32/misc/wingl.c
similarity index 100%
rename from reactos/lib/gdi32/misc/wingl.c
rename to reactos/gdi32/misc/wingl.c
diff --git a/reactos/lib/gdi32/objects/bitmap.c b/reactos/gdi32/objects/bitmap.c
similarity index 100%
rename from reactos/lib/gdi32/objects/bitmap.c
rename to reactos/gdi32/objects/bitmap.c
diff --git a/reactos/lib/gdi32/objects/brush.c b/reactos/gdi32/objects/brush.c
similarity index 100%
rename from reactos/lib/gdi32/objects/brush.c
rename to reactos/gdi32/objects/brush.c
diff --git a/reactos/lib/gdi32/objects/dc.c b/reactos/gdi32/objects/dc.c
similarity index 100%
rename from reactos/lib/gdi32/objects/dc.c
rename to reactos/gdi32/objects/dc.c
diff --git a/reactos/lib/gdi32/objects/font.c b/reactos/gdi32/objects/font.c
similarity index 100%
rename from reactos/lib/gdi32/objects/font.c
rename to reactos/gdi32/objects/font.c
diff --git a/reactos/lib/gdi32/objects/linedda.c b/reactos/gdi32/objects/linedda.c
similarity index 100%
rename from reactos/lib/gdi32/objects/linedda.c
rename to reactos/gdi32/objects/linedda.c
diff --git a/reactos/lib/gdi32/objects/metafile.c b/reactos/gdi32/objects/metafile.c
similarity index 100%
rename from reactos/lib/gdi32/objects/metafile.c
rename to reactos/gdi32/objects/metafile.c
diff --git a/reactos/lib/gdi32/objects/path.c b/reactos/gdi32/objects/path.c
similarity index 100%
rename from reactos/lib/gdi32/objects/path.c
rename to reactos/gdi32/objects/path.c
diff --git a/reactos/lib/gdi32/objects/region.c b/reactos/gdi32/objects/region.c
similarity index 100%
rename from reactos/lib/gdi32/objects/region.c
rename to reactos/gdi32/objects/region.c
diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/gdi32/objects/text.c
similarity index 100%
rename from reactos/lib/gdi32/objects/text.c
rename to reactos/gdi32/objects/text.c
diff --git a/reactos/lib/gdi32/objects/utils.c b/reactos/gdi32/objects/utils.c
similarity index 100%
rename from reactos/lib/gdi32/objects/utils.c
rename to reactos/gdi32/objects/utils.c
diff --git a/reactos/lib/gdiplus/gdiplus.def b/reactos/gdiplus/gdiplus.def
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus.def
rename to reactos/gdiplus/gdiplus.def
diff --git a/reactos/lib/gdiplus/gdiplus.rc b/reactos/gdiplus/gdiplus.rc
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus.rc
rename to reactos/gdiplus/gdiplus.rc
diff --git a/reactos/lib/gdiplus/gdiplus.xml b/reactos/gdiplus/gdiplus.xml
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus.xml
rename to reactos/gdiplus/gdiplus.xml
diff --git a/reactos/lib/gdiplus/gdiplus/arrow.c b/reactos/gdiplus/gdiplus/arrow.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/arrow.c
rename to reactos/gdiplus/gdiplus/arrow.c
diff --git a/reactos/lib/gdiplus/gdiplus/bitmap.c b/reactos/gdiplus/gdiplus/bitmap.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/bitmap.c
rename to reactos/gdiplus/gdiplus/bitmap.c
diff --git a/reactos/lib/gdiplus/gdiplus/brush.c b/reactos/gdiplus/gdiplus/brush.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/brush.c
rename to reactos/gdiplus/gdiplus/brush.c
diff --git a/reactos/lib/gdiplus/gdiplus/clip.c b/reactos/gdiplus/gdiplus/clip.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/clip.c
rename to reactos/gdiplus/gdiplus/clip.c
diff --git a/reactos/lib/gdiplus/gdiplus/codec.c b/reactos/gdiplus/gdiplus/codec.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/codec.c
rename to reactos/gdiplus/gdiplus/codec.c
diff --git a/reactos/lib/gdiplus/gdiplus/container.c b/reactos/gdiplus/gdiplus/container.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/container.c
rename to reactos/gdiplus/gdiplus/container.c
diff --git a/reactos/lib/gdiplus/gdiplus/dllmain.c b/reactos/gdiplus/gdiplus/dllmain.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/dllmain.c
rename to reactos/gdiplus/gdiplus/dllmain.c
diff --git a/reactos/lib/gdiplus/gdiplus/draw.c b/reactos/gdiplus/gdiplus/draw.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/draw.c
rename to reactos/gdiplus/gdiplus/draw.c
diff --git a/reactos/lib/gdiplus/gdiplus/effect.c b/reactos/gdiplus/gdiplus/effect.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/effect.c
rename to reactos/gdiplus/gdiplus/effect.c
diff --git a/reactos/lib/gdiplus/gdiplus/fill.c b/reactos/gdiplus/gdiplus/fill.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/fill.c
rename to reactos/gdiplus/gdiplus/fill.c
diff --git a/reactos/lib/gdiplus/gdiplus/font.c b/reactos/gdiplus/gdiplus/font.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/font.c
rename to reactos/gdiplus/gdiplus/font.c
diff --git a/reactos/lib/gdiplus/gdiplus/graphics.c b/reactos/gdiplus/gdiplus/graphics.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/graphics.c
rename to reactos/gdiplus/gdiplus/graphics.c
diff --git a/reactos/lib/gdiplus/gdiplus/image.c b/reactos/gdiplus/gdiplus/image.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/image.c
rename to reactos/gdiplus/gdiplus/image.c
diff --git a/reactos/lib/gdiplus/gdiplus/linecap.c b/reactos/gdiplus/gdiplus/linecap.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/linecap.c
rename to reactos/gdiplus/gdiplus/linecap.c
diff --git a/reactos/lib/gdiplus/gdiplus/linegradient.c b/reactos/gdiplus/gdiplus/linegradient.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/linegradient.c
rename to reactos/gdiplus/gdiplus/linegradient.c
diff --git a/reactos/lib/gdiplus/gdiplus/matrix.c b/reactos/gdiplus/gdiplus/matrix.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/matrix.c
rename to reactos/gdiplus/gdiplus/matrix.c
diff --git a/reactos/lib/gdiplus/gdiplus/memory.c b/reactos/gdiplus/gdiplus/memory.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/memory.c
rename to reactos/gdiplus/gdiplus/memory.c
diff --git a/reactos/lib/gdiplus/gdiplus/metafile.c b/reactos/gdiplus/gdiplus/metafile.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/metafile.c
rename to reactos/gdiplus/gdiplus/metafile.c
diff --git a/reactos/lib/gdiplus/gdiplus/palette.c b/reactos/gdiplus/gdiplus/palette.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/palette.c
rename to reactos/gdiplus/gdiplus/palette.c
diff --git a/reactos/lib/gdiplus/gdiplus/path.c b/reactos/gdiplus/gdiplus/path.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/path.c
rename to reactos/gdiplus/gdiplus/path.c
diff --git a/reactos/lib/gdiplus/gdiplus/pathgradient.c b/reactos/gdiplus/gdiplus/pathgradient.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/pathgradient.c
rename to reactos/gdiplus/gdiplus/pathgradient.c
diff --git a/reactos/lib/gdiplus/gdiplus/pathiterator.c b/reactos/gdiplus/gdiplus/pathiterator.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/pathiterator.c
rename to reactos/gdiplus/gdiplus/pathiterator.c
diff --git a/reactos/lib/gdiplus/gdiplus/pen.c b/reactos/gdiplus/gdiplus/pen.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/pen.c
rename to reactos/gdiplus/gdiplus/pen.c
diff --git a/reactos/lib/gdiplus/gdiplus/region.c b/reactos/gdiplus/gdiplus/region.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/region.c
rename to reactos/gdiplus/gdiplus/region.c
diff --git a/reactos/lib/gdiplus/gdiplus/string.c b/reactos/gdiplus/gdiplus/string.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/string.c
rename to reactos/gdiplus/gdiplus/string.c
diff --git a/reactos/lib/gdiplus/gdiplus/texture.c b/reactos/gdiplus/gdiplus/texture.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/texture.c
rename to reactos/gdiplus/gdiplus/texture.c
diff --git a/reactos/lib/gdiplus/gdiplus/transform.c b/reactos/gdiplus/gdiplus/transform.c
similarity index 100%
rename from reactos/lib/gdiplus/gdiplus/transform.c
rename to reactos/gdiplus/gdiplus/transform.c
diff --git a/reactos/lib/gdiplus/include/debug.h b/reactos/gdiplus/include/debug.h
similarity index 100%
rename from reactos/lib/gdiplus/include/debug.h
rename to reactos/gdiplus/include/debug.h
diff --git a/reactos/lib/gdiplus/include/gdiplusprivate.h b/reactos/gdiplus/include/gdiplusprivate.h
similarity index 100%
rename from reactos/lib/gdiplus/include/gdiplusprivate.h
rename to reactos/gdiplus/include/gdiplusprivate.h
diff --git a/reactos/lib/gdiplus/tests/setup.c b/reactos/gdiplus/tests/setup.c
similarity index 100%
rename from reactos/lib/gdiplus/tests/setup.c
rename to reactos/gdiplus/tests/setup.c
diff --git a/reactos/lib/gdiplus/tests/stubs.tst b/reactos/gdiplus/tests/stubs.tst
similarity index 100%
rename from reactos/lib/gdiplus/tests/stubs.tst
rename to reactos/gdiplus/tests/stubs.tst
diff --git a/reactos/lib/gdiplus/tests/tests/test-1.c b/reactos/gdiplus/tests/tests/test-1.c
similarity index 100%
rename from reactos/lib/gdiplus/tests/tests/test-1.c
rename to reactos/gdiplus/tests/tests/test-1.c