diff --git a/Xorg/app/enlightenment/Config.in b/Xorg/wm/enlightenment/Config.in
similarity index 100%
rename from Xorg/app/enlightenment/Config.in
rename to Xorg/wm/enlightenment/Config.in
diff --git a/Xorg/app/enlightenment/Makefile b/Xorg/wm/enlightenment/Makefile
similarity index 97%
rename from Xorg/app/enlightenment/Makefile
rename to Xorg/wm/enlightenment/Makefile
index ee3d60365..00b26cdae 100644
--- a/Xorg/app/enlightenment/Makefile
+++ b/Xorg/wm/enlightenment/Makefile
@@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/enlightenment
   SECTION:=xorg-wm
   CATEGORY:=Xorg
+  SUBMENU:=window manager
   TITLE:=Enlightenment e17 window manager
   URL:=http://enlightenment.org
   DEPENDS:=+libintl +libpthread +eet +evas +ecore +edje +efreet +edbus +dbus-utils +dejavu-fonts-ttf
@@ -74,7 +75,7 @@ define Package/enlightenment/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
 	echo "#!/bin/sh" > $(1)/usr/bin/WM
-	echo -n "test -d ~/.e || /usr/bin/enlightenment_start -profile " >> $(1)/usr/bin/WM
+	echo -n "/usr/bin/enlightenment_start -profile " >> $(1)/usr/bin/WM
 	$(if $(CONFIG_E17_ILLUME),echo "illume" >> $(1)/usr/bin/WM)
 	$(if $(CONFIG_E17_MINIMALIST),echo "minimalist" >> $(1)/usr/bin/WM)
 	$(if $(CONFIG_E17_NETBOOK),echo "netbook" >> $(1)/usr/bin/WM)
diff --git a/Xorg/app/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile
similarity index 98%
rename from Xorg/app/fluxbox/Makefile
rename to Xorg/wm/fluxbox/Makefile
index b85cefc76..ba799ce1e 100644
--- a/Xorg/app/fluxbox/Makefile
+++ b/Xorg/wm/fluxbox/Makefile
@@ -27,6 +27,7 @@ CONFIGURE_ARGS+=--disable-xmb
 define Package/fluxbox/Default
   SECTION:=xorg-wm
   CATEGORY:=Xorg
+  SUBMENU:=window manager
 endef
 
 define Package/fluxbox
diff --git a/Xorg/app/fluxbox/files/init b/Xorg/wm/fluxbox/files/init
similarity index 100%
rename from Xorg/app/fluxbox/files/init
rename to Xorg/wm/fluxbox/files/init
diff --git a/Xorg/app/fluxbox/files/menu b/Xorg/wm/fluxbox/files/menu
similarity index 100%
rename from Xorg/app/fluxbox/files/menu
rename to Xorg/wm/fluxbox/files/menu
diff --git a/Xorg/app/fluxbox/patches/100-fbrun-compile.patch b/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch
similarity index 100%
rename from Xorg/app/fluxbox/patches/100-fbrun-compile.patch
rename to Xorg/wm/fluxbox/patches/100-fbrun-compile.patch
diff --git a/Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch b/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch
similarity index 100%
rename from Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch
rename to Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch
diff --git a/Xorg/app/matchbox/Makefile b/Xorg/wm/matchbox/Makefile
similarity index 97%
rename from Xorg/app/matchbox/Makefile
rename to Xorg/wm/matchbox/Makefile
index d40046d81..1149517e5 100644
--- a/Xorg/app/matchbox/Makefile
+++ b/Xorg/wm/matchbox/Makefile
@@ -28,6 +28,7 @@ define Package/matchbox
   TITLE:=matchbox window manager
   SECTION:=xorg-wm
   CATEGORY:=Xorg
+  SUBMENU:=window manager
   DEPENDS:=+libX11 +zlib +libfreetype +fontconfig +libmatchbox
 endef