diff --git a/3rdparty/X11/CHANGES b/3rdparty-extra/X11/CHANGES
similarity index 100%
rename from 3rdparty/X11/CHANGES
rename to 3rdparty-extra/X11/CHANGES
diff --git a/3rdparty/X11/COPYING b/3rdparty-extra/X11/COPYING
similarity index 100%
rename from 3rdparty/X11/COPYING
rename to 3rdparty-extra/X11/COPYING
diff --git a/3rdparty/X11/README b/3rdparty-extra/X11/README
similarity index 100%
rename from 3rdparty/X11/README
rename to 3rdparty-extra/X11/README
diff --git a/3rdparty/X11/TODO b/3rdparty-extra/X11/TODO
similarity index 100%
rename from 3rdparty/X11/TODO
rename to 3rdparty-extra/X11/TODO
diff --git a/3rdparty/X11/X.d b/3rdparty-extra/X11/X.d
similarity index 100%
rename from 3rdparty/X11/X.d
rename to 3rdparty-extra/X11/X.d
diff --git a/3rdparty/X11/Xlib.d b/3rdparty-extra/X11/Xlib.d
similarity index 100%
rename from 3rdparty/X11/Xlib.d
rename to 3rdparty-extra/X11/Xlib.d
diff --git a/3rdparty/X11/example.d b/3rdparty-extra/X11/example.d
similarity index 100%
rename from 3rdparty/X11/example.d
rename to 3rdparty-extra/X11/example.d
diff --git a/3rdparty/X11/keysymdef.d b/3rdparty-extra/X11/keysymdef.d
similarity index 100%
rename from 3rdparty/X11/keysymdef.d
rename to 3rdparty-extra/X11/keysymdef.d
diff --git a/3rdparty/X11/xcb/README b/3rdparty-extra/X11/xcb/README
similarity index 100%
rename from 3rdparty/X11/xcb/README
rename to 3rdparty-extra/X11/xcb/README
diff --git a/3rdparty/X11/xcb/bigreq.d b/3rdparty-extra/X11/xcb/bigreq.d
similarity index 100%
rename from 3rdparty/X11/xcb/bigreq.d
rename to 3rdparty-extra/X11/xcb/bigreq.d
diff --git a/3rdparty/X11/xcb/composite.d b/3rdparty-extra/X11/xcb/composite.d
similarity index 100%
rename from 3rdparty/X11/xcb/composite.d
rename to 3rdparty-extra/X11/xcb/composite.d
diff --git a/3rdparty/X11/xcb/damage.d b/3rdparty-extra/X11/xcb/damage.d
similarity index 100%
rename from 3rdparty/X11/xcb/damage.d
rename to 3rdparty-extra/X11/xcb/damage.d
diff --git a/3rdparty/X11/xcb/dpms.d b/3rdparty-extra/X11/xcb/dpms.d
similarity index 100%
rename from 3rdparty/X11/xcb/dpms.d
rename to 3rdparty-extra/X11/xcb/dpms.d
diff --git a/3rdparty/X11/xcb/example.d b/3rdparty-extra/X11/xcb/example.d
similarity index 100%
rename from 3rdparty/X11/xcb/example.d
rename to 3rdparty-extra/X11/xcb/example.d
diff --git a/3rdparty/X11/xcb/glx.d b/3rdparty-extra/X11/xcb/glx.d
similarity index 100%
rename from 3rdparty/X11/xcb/glx.d
rename to 3rdparty-extra/X11/xcb/glx.d
diff --git a/3rdparty/X11/xcb/image.d b/3rdparty-extra/X11/xcb/image.d
similarity index 100%
rename from 3rdparty/X11/xcb/image.d
rename to 3rdparty-extra/X11/xcb/image.d
diff --git a/3rdparty/X11/xcb/randr.d b/3rdparty-extra/X11/xcb/randr.d
similarity index 100%
rename from 3rdparty/X11/xcb/randr.d
rename to 3rdparty-extra/X11/xcb/randr.d
diff --git a/3rdparty/X11/xcb/record.d b/3rdparty-extra/X11/xcb/record.d
similarity index 100%
rename from 3rdparty/X11/xcb/record.d
rename to 3rdparty-extra/X11/xcb/record.d
diff --git a/3rdparty/X11/xcb/render.d b/3rdparty-extra/X11/xcb/render.d
similarity index 100%
rename from 3rdparty/X11/xcb/render.d
rename to 3rdparty-extra/X11/xcb/render.d
diff --git a/3rdparty/X11/xcb/res.d b/3rdparty-extra/X11/xcb/res.d
similarity index 100%
rename from 3rdparty/X11/xcb/res.d
rename to 3rdparty-extra/X11/xcb/res.d
diff --git a/3rdparty/X11/xcb/screensaver.d b/3rdparty-extra/X11/xcb/screensaver.d
similarity index 100%
rename from 3rdparty/X11/xcb/screensaver.d
rename to 3rdparty-extra/X11/xcb/screensaver.d
diff --git a/3rdparty/X11/xcb/shape.d b/3rdparty-extra/X11/xcb/shape.d
similarity index 100%
rename from 3rdparty/X11/xcb/shape.d
rename to 3rdparty-extra/X11/xcb/shape.d
diff --git a/3rdparty/X11/xcb/shm.d b/3rdparty-extra/X11/xcb/shm.d
similarity index 100%
rename from 3rdparty/X11/xcb/shm.d
rename to 3rdparty-extra/X11/xcb/shm.d
diff --git a/3rdparty/X11/xcb/sync.d b/3rdparty-extra/X11/xcb/sync.d
similarity index 100%
rename from 3rdparty/X11/xcb/sync.d
rename to 3rdparty-extra/X11/xcb/sync.d
diff --git a/3rdparty/X11/xcb/xc_misc.d b/3rdparty-extra/X11/xcb/xc_misc.d
similarity index 100%
rename from 3rdparty/X11/xcb/xc_misc.d
rename to 3rdparty-extra/X11/xcb/xc_misc.d
diff --git a/3rdparty/X11/xcb/xcb.d b/3rdparty-extra/X11/xcb/xcb.d
similarity index 100%
rename from 3rdparty/X11/xcb/xcb.d
rename to 3rdparty-extra/X11/xcb/xcb.d
diff --git a/3rdparty/X11/xcb/xcbbuild.sh b/3rdparty-extra/X11/xcb/xcbbuild.sh
similarity index 100%
rename from 3rdparty/X11/xcb/xcbbuild.sh
rename to 3rdparty-extra/X11/xcb/xcbbuild.sh
diff --git a/3rdparty/X11/xcb/xevie.d b/3rdparty-extra/X11/xcb/xevie.d
similarity index 100%
rename from 3rdparty/X11/xcb/xevie.d
rename to 3rdparty-extra/X11/xcb/xevie.d
diff --git a/3rdparty/X11/xcb/xf86dri.d b/3rdparty-extra/X11/xcb/xf86dri.d
similarity index 100%
rename from 3rdparty/X11/xcb/xf86dri.d
rename to 3rdparty-extra/X11/xcb/xf86dri.d
diff --git a/3rdparty/X11/xcb/xfixes.d b/3rdparty-extra/X11/xcb/xfixes.d
similarity index 100%
rename from 3rdparty/X11/xcb/xfixes.d
rename to 3rdparty-extra/X11/xcb/xfixes.d
diff --git a/3rdparty/X11/xcb/xinerama.d b/3rdparty-extra/X11/xcb/xinerama.d
similarity index 100%
rename from 3rdparty/X11/xcb/xinerama.d
rename to 3rdparty-extra/X11/xcb/xinerama.d
diff --git a/3rdparty/X11/xcb/xprint.d b/3rdparty-extra/X11/xcb/xprint.d
similarity index 100%
rename from 3rdparty/X11/xcb/xprint.d
rename to 3rdparty-extra/X11/xcb/xprint.d
diff --git a/3rdparty/X11/xcb/xproto.d b/3rdparty-extra/X11/xcb/xproto.d
similarity index 100%
rename from 3rdparty/X11/xcb/xproto.d
rename to 3rdparty-extra/X11/xcb/xproto.d
diff --git a/3rdparty/X11/xcb/xslt/bigreq.xml b/3rdparty-extra/X11/xcb/xslt/bigreq.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/bigreq.xml
rename to 3rdparty-extra/X11/xcb/xslt/bigreq.xml
diff --git a/3rdparty/X11/xcb/xslt/composite.xml b/3rdparty-extra/X11/xcb/xslt/composite.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/composite.xml
rename to 3rdparty-extra/X11/xcb/xslt/composite.xml
diff --git a/3rdparty/X11/xcb/xslt/d-client.xsl b/3rdparty-extra/X11/xcb/xslt/d-client.xsl
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/d-client.xsl
rename to 3rdparty-extra/X11/xcb/xslt/d-client.xsl
diff --git a/3rdparty/X11/xcb/xslt/damage.xml b/3rdparty-extra/X11/xcb/xslt/damage.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/damage.xml
rename to 3rdparty-extra/X11/xcb/xslt/damage.xml
diff --git a/3rdparty/X11/xcb/xslt/dpms.xml b/3rdparty-extra/X11/xcb/xslt/dpms.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/dpms.xml
rename to 3rdparty-extra/X11/xcb/xslt/dpms.xml
diff --git a/3rdparty/X11/xcb/xslt/glx.xml b/3rdparty-extra/X11/xcb/xslt/glx.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/glx.xml
rename to 3rdparty-extra/X11/xcb/xslt/glx.xml
diff --git a/3rdparty/X11/xcb/xslt/randr.xml b/3rdparty-extra/X11/xcb/xslt/randr.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/randr.xml
rename to 3rdparty-extra/X11/xcb/xslt/randr.xml
diff --git a/3rdparty/X11/xcb/xslt/record.xml b/3rdparty-extra/X11/xcb/xslt/record.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/record.xml
rename to 3rdparty-extra/X11/xcb/xslt/record.xml
diff --git a/3rdparty/X11/xcb/xslt/render.xml b/3rdparty-extra/X11/xcb/xslt/render.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/render.xml
rename to 3rdparty-extra/X11/xcb/xslt/render.xml
diff --git a/3rdparty/X11/xcb/xslt/res.xml b/3rdparty-extra/X11/xcb/xslt/res.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/res.xml
rename to 3rdparty-extra/X11/xcb/xslt/res.xml
diff --git a/3rdparty/X11/xcb/xslt/screensaver.xml b/3rdparty-extra/X11/xcb/xslt/screensaver.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/screensaver.xml
rename to 3rdparty-extra/X11/xcb/xslt/screensaver.xml
diff --git a/3rdparty/X11/xcb/xslt/shape.xml b/3rdparty-extra/X11/xcb/xslt/shape.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/shape.xml
rename to 3rdparty-extra/X11/xcb/xslt/shape.xml
diff --git a/3rdparty/X11/xcb/xslt/shm.xml b/3rdparty-extra/X11/xcb/xslt/shm.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/shm.xml
rename to 3rdparty-extra/X11/xcb/xslt/shm.xml
diff --git a/3rdparty/X11/xcb/xslt/sync.xml b/3rdparty-extra/X11/xcb/xslt/sync.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/sync.xml
rename to 3rdparty-extra/X11/xcb/xslt/sync.xml
diff --git a/3rdparty/X11/xcb/xslt/xc_misc.xml b/3rdparty-extra/X11/xcb/xslt/xc_misc.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xc_misc.xml
rename to 3rdparty-extra/X11/xcb/xslt/xc_misc.xml
diff --git a/3rdparty/X11/xcb/xslt/xcb.xsd b/3rdparty-extra/X11/xcb/xslt/xcb.xsd
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xcb.xsd
rename to 3rdparty-extra/X11/xcb/xslt/xcb.xsd
diff --git a/3rdparty/X11/xcb/xslt/xevie.xml b/3rdparty-extra/X11/xcb/xslt/xevie.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xevie.xml
rename to 3rdparty-extra/X11/xcb/xslt/xevie.xml
diff --git a/3rdparty/X11/xcb/xslt/xf86dri.xml b/3rdparty-extra/X11/xcb/xslt/xf86dri.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xf86dri.xml
rename to 3rdparty-extra/X11/xcb/xslt/xf86dri.xml
diff --git a/3rdparty/X11/xcb/xslt/xfixes.xml b/3rdparty-extra/X11/xcb/xslt/xfixes.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xfixes.xml
rename to 3rdparty-extra/X11/xcb/xslt/xfixes.xml
diff --git a/3rdparty/X11/xcb/xslt/xinerama.xml b/3rdparty-extra/X11/xcb/xslt/xinerama.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xinerama.xml
rename to 3rdparty-extra/X11/xcb/xslt/xinerama.xml
diff --git a/3rdparty/X11/xcb/xslt/xprint.xml b/3rdparty-extra/X11/xcb/xslt/xprint.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xprint.xml
rename to 3rdparty-extra/X11/xcb/xslt/xprint.xml
diff --git a/3rdparty/X11/xcb/xslt/xproto.xml b/3rdparty-extra/X11/xcb/xslt/xproto.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xproto.xml
rename to 3rdparty-extra/X11/xcb/xslt/xproto.xml
diff --git a/3rdparty/X11/xcb/xslt/xtest.xml b/3rdparty-extra/X11/xcb/xslt/xtest.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xtest.xml
rename to 3rdparty-extra/X11/xcb/xslt/xtest.xml
diff --git a/3rdparty/X11/xcb/xslt/xv.xml b/3rdparty-extra/X11/xcb/xslt/xv.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xv.xml
rename to 3rdparty-extra/X11/xcb/xslt/xv.xml
diff --git a/3rdparty/X11/xcb/xslt/xvmc.xml b/3rdparty-extra/X11/xcb/xslt/xvmc.xml
similarity index 100%
rename from 3rdparty/X11/xcb/xslt/xvmc.xml
rename to 3rdparty-extra/X11/xcb/xslt/xvmc.xml
diff --git a/3rdparty/X11/xcb/xtest.d b/3rdparty-extra/X11/xcb/xtest.d
similarity index 100%
rename from 3rdparty/X11/xcb/xtest.d
rename to 3rdparty-extra/X11/xcb/xtest.d
diff --git a/3rdparty/X11/xcb/xv.d b/3rdparty-extra/X11/xcb/xv.d
similarity index 100%
rename from 3rdparty/X11/xcb/xv.d
rename to 3rdparty-extra/X11/xcb/xv.d
diff --git a/3rdparty/X11/xcb/xvmc.d b/3rdparty-extra/X11/xcb/xvmc.d
similarity index 100%
rename from 3rdparty/X11/xcb/xvmc.d
rename to 3rdparty-extra/X11/xcb/xvmc.d