xorg-server: Rename package to xorg-x11-server.

diff --git a/pkgs/core/xorg-server/10-quirks.conf b/pkgs/core/xorg-x11-server/10-quirks.conf
similarity index 100%
rename from pkgs/core/xorg-server/10-quirks.conf
rename to pkgs/core/xorg-x11-server/10-quirks.conf

diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.4.99-pic-libxf86config.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.4.99-pic-libxf86config.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.4.99-ssh-isnt-local.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.5.0-bg-none-root.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.5.0-bg-none-root.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.5.0-projector-fb-size.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.5.0-projector-fb-size.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.5.1-mode-debug.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.5.1-mode-debug.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-displayfd.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.0-displayfd.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.0-displayfd.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.0-less-acpi-brokenness.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.1-nouveau.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.1-nouveau.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.1-nouveau.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.99-default-modes.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.99-default-modes.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.99-randr-error-debugging.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.99-randr-error-debugging.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.6.99-right-of.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.6.99-right-of.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.7.0-randr-gamma-restore.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.7.0-randr-gamma-restore.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.7.1-gamma-kdm-fix.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.7.1-gamma-kdm-fix.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.7.1-multilib.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.7.1-multilib.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.8-disable-vboxvideo.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.8-disable-vboxvideo.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.8-no-connected-outputs.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.8-no-connected-outputs.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.8-randr-initial.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.8-randr-initial.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.8-udev-warning.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.8-udev-warning.patch

diff --git a/pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch b/pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
similarity index 100%
rename from pkgs/core/xorg-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch
rename to pkgs/core/xorg-x11-server/patches/xserver-1.8.2-XTEST-PointerKeys-fixes.patch

diff --git a/pkgs/core/xorg-server/xorg-server.nm b/pkgs/core/xorg-x11-server/xorg-x11-server.nm
similarity index 100%
rename from pkgs/core/xorg-server/xorg-server.nm
rename to pkgs/core/xorg-x11-server/xorg-x11-server.nm

diff --git a/pkgs/core/xorg-server/xorg.conf b/pkgs/core/xorg-x11-server/xorg.conf
similarity index 100%
rename from pkgs/core/xorg-server/xorg.conf
rename to pkgs/core/xorg-x11-server/xorg.conf