diff --git a/packages/x11/Xorg/install b/packages/x11/Xorg/install
deleted file mode 100755
index 0f4ea3c1c2..0000000000
--- a/packages/x11/Xorg/install
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-. config/options
-
-PKG_DIR=`find $PACKAGES -type d -name $1`
-
-#Fonts
-  $SCRIPTS/install encodings
-  $SCRIPTS/install font-xfree86-type1
-  $SCRIPTS/install font-bitstream-type1
-  $SCRIPTS/install font-misc-misc
-
-#Server
-  $SCRIPTS/install xorg-server
-  $SCRIPTS/install xkeyboard-config
-  $SCRIPTS/install xkbcomp
-
-#Drivers
-  $SCRIPTS/install xf86-input-evdev
-  $SCRIPTS/install xf86-input-synaptics
-
-[ "$XORG_DRIVERS" = all ] && XORG_DRIVERS="`find $ROOT/$PACKAGES/ -name "xf86-video-*" | sed s/.*xf86-video-//`"
-for drv in $XORG_DRIVERS; do
-  $SCRIPTS/install xf86-video-$drv
-done
-
-#Tools
-  $SCRIPTS/install xinit
-  $SCRIPTS/install openbox
-
-#  [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm
-
-exit 0
diff --git a/packages/x11/Xorg/conf.d/xorg b/packages/x11/xserver/xorg-server/conf.d/xorg
similarity index 100%
rename from packages/x11/Xorg/conf.d/xorg
rename to packages/x11/xserver/xorg-server/conf.d/xorg
diff --git a/packages/x11/Xorg/init.d/65_xorg b/packages/x11/xserver/xorg-server/init.d/65_xorg
similarity index 100%
rename from packages/x11/Xorg/init.d/65_xorg
rename to packages/x11/xserver/xorg-server/init.d/65_xorg
diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 99fec01c6b..96d31688e8 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -58,3 +58,30 @@ cp $PKG_BUILD/config/xorg-server.conf $INSTALL/etc/dbus-1/system.d
 
 mkdir -p $INSTALL/usr/share/hal/fdi/policy/10osvendor/
 cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi
+
+
+#Fonts
+  $SCRIPTS/install encodings
+  $SCRIPTS/install font-xfree86-type1
+  $SCRIPTS/install font-bitstream-type1
+  $SCRIPTS/install font-misc-misc
+
+#Server
+#  $SCRIPTS/install xorg-server
+  $SCRIPTS/install xkeyboard-config
+  $SCRIPTS/install xkbcomp
+
+#Drivers
+  $SCRIPTS/install xf86-input-evdev
+  $SCRIPTS/install xf86-input-synaptics
+
+[ "$XORG_DRIVERS" = all ] && XORG_DRIVERS="`find $ROOT/$PACKAGES/ -name "xf86-video-*" | sed s/.*xf86-video-//`"
+for drv in $XORG_DRIVERS; do
+  $SCRIPTS/install xf86-video-$drv
+done
+
+#Tools
+  $SCRIPTS/install xinit
+  $SCRIPTS/install openbox
+
+#  [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm