diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 0cbb76142..d9deaf087 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -89,14 +89,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_clientlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_colors";
@@ -257,22 +249,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_focus";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index 1e580ce07..807c81105 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -121,14 +121,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_clientlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_colors";
@@ -289,22 +281,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_focus";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_window_manipulation";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 89d237d56..7e124fd24 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -96,22 +96,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_focus";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_wallpaper";
@@ -272,14 +256,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_clientlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_borders";
diff --git a/config/standard/e.src b/config/standard/e.src
index 0361153e6..57b63f2d6 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -96,22 +96,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_focus";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_window_display";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_wallpaper";
@@ -272,14 +256,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_clientlist";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_borders";
diff --git a/configure.ac b/configure.ac
index c895fcf9b..9b0b7c2c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -696,12 +696,9 @@ AC_E_OPTIONAL_MODULE([conf_display], true)
 AC_E_OPTIONAL_MODULE([conf_shelves], true)
 AC_E_OPTIONAL_MODULE([conf_keybindings], true)
 AC_E_OPTIONAL_MODULE([conf_edgebindings], true)
-AC_E_OPTIONAL_MODULE([conf_window_display], true)
-AC_E_OPTIONAL_MODULE([conf_window_focus], true)
 AC_E_OPTIONAL_MODULE([conf_window_remembers], true)
 AC_E_OPTIONAL_MODULE([conf_window_manipulation], true)
 AC_E_OPTIONAL_MODULE([conf_menus], true)
-AC_E_OPTIONAL_MODULE([conf_clientlist], true)
 AC_E_OPTIONAL_MODULE([conf_dialogs], true)
 AC_E_OPTIONAL_MODULE([conf_performance], true)
 AC_E_OPTIONAL_MODULE([conf_winlist], true)
@@ -825,18 +822,12 @@ src/modules/conf_keybindings/Makefile
 src/modules/conf_keybindings/module.desktop
 src/modules/conf_edgebindings/Makefile
 src/modules/conf_edgebindings/module.desktop
-src/modules/conf_window_display/Makefile
-src/modules/conf_window_display/module.desktop
-src/modules/conf_window_focus/Makefile
-src/modules/conf_window_focus/module.desktop
 src/modules/conf_window_remembers/Makefile
 src/modules/conf_window_remembers/module.desktop
 src/modules/conf_window_manipulation/Makefile
 src/modules/conf_window_manipulation/module.desktop
 src/modules/conf_menus/Makefile
 src/modules/conf_menus/module.desktop
-src/modules/conf_clientlist/Makefile
-src/modules/conf_clientlist/module.desktop
 src/modules/conf_dialogs/Makefile
 src/modules/conf_dialogs/module.desktop
 src/modules/conf_performance/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 535458d17..c65bf6901 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -135,8 +135,6 @@ src/modules/conf_applications/e_int_config_apps.c
 src/modules/conf_applications/e_mod_main.c
 src/modules/conf_borders/e_int_config_borders.c
 src/modules/conf_borders/e_mod_main.c
-src/modules/conf_clientlist/e_int_config_clientlist.c
-src/modules/conf_clientlist/e_mod_main.c
 src/modules/conf_colors/e_int_config_color_classes.c
 src/modules/conf_colors/e_mod_main.c
 src/modules/conf_dialogs/e_int_config_dialogs.c
@@ -197,10 +195,9 @@ src/modules/conf_wallpaper/e_int_config_wallpaper.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
 src/modules/conf_wallpaper/e_int_config_wallpaper_web.c
 src/modules/conf_wallpaper/e_mod_main.c
-src/modules/conf_window_display/e_int_config_window_display.c
-src/modules/conf_window_display/e_mod_main.c
-src/modules/conf_window_focus/e_int_config_focus.c
-src/modules/conf_window_focus/e_mod_main.c
+src/modules/conf_window_manipulation/e_int_config_clientlist.c
+src/modules/conf_window_manipulation/e_int_config_window_display.c
+src/modules/conf_window_manipulation/e_int_config_focus.c
 src/modules/conf_window_manipulation/e_int_config_window_geometry.c
 src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
 src/modules/conf_window_manipulation/e_int_config_window_stacking.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index f610fae2c..9f977afda 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -138,14 +138,6 @@ if USE_MODULE_CONF_EDGEBINDINGS
 SUBDIRS += conf_edgebindings
 endif
 
-if USE_MODULE_CONF_WINDOW_DISPLAY
-SUBDIRS += conf_window_display
-endif
-
-if USE_MODULE_CONF_WINDOW_FOCUS
-SUBDIRS += conf_window_focus
-endif
-
 if USE_MODULE_CONF_WINDOW_REMEMBERS
 SUBDIRS += conf_window_remembers
 endif
@@ -158,10 +150,6 @@ if USE_MODULE_CONF_MENUS
 SUBDIRS += conf_menus
 endif
 
-if USE_MODULE_CONF_CLIENTLIST
-SUBDIRS += conf_clientlist
-endif
-
 if USE_MODULE_CONF_DIALOGS
 SUBDIRS += conf_dialogs
 endif
diff --git a/src/modules/conf_clientlist/.cvsignore b/src/modules/conf_clientlist/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_clientlist/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_clientlist/Makefile.am b/src/modules/conf_clientlist/Makefile.am
deleted file mode 100644
index a5b092b8b..000000000
--- a/src/modules/conf_clientlist/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_clientlist
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_clientlist.c \
-                         e_int_config_clientlist.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_clientlist/e-module-conf_clientlist.edj b/src/modules/conf_clientlist/e-module-conf_clientlist.edj
deleted file mode 100644
index 25fba8aac..000000000
Binary files a/src/modules/conf_clientlist/e-module-conf_clientlist.edj and /dev/null differ
diff --git a/src/modules/conf_clientlist/e_mod_main.c b/src/modules/conf_clientlist/e_mod_main.c
deleted file mode 100644
index a07b98b5f..000000000
--- a/src/modules/conf_clientlist/e_mod_main.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Client List Menu"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("menus", 60, _("Menus"), NULL, 
-                                     "preferences-menus");
-   e_configure_registry_item_add("menus/client_list_menu", 40, 
-                                 _("Client List Menu"), NULL, 
-                                 "preferences-winlist", 
-                                 e_int_config_clientlist);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-
-   while ((cfd = e_config_dialog_get("E", "menus/client_list_menu"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("menus/client_list_menu");
-   e_configure_registry_category_del("menus");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_clientlist/e_mod_main.h b/src/modules/conf_clientlist/e_mod_main.h
deleted file mode 100644
index 08ed92482..000000000
--- a/src/modules/conf_clientlist/e_mod_main.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_clientlist.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_clientlist.h"
-
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_clientlist/module.desktop.in b/src/modules/conf_clientlist/module.desktop.in
deleted file mode 100644
index e4b44badf..000000000
--- a/src/modules/conf_clientlist/module.desktop.in
+++ /dev/null
@@ -1,36 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Client List Menu
-Name[ru]=Меню списка клиентов
-Name[cs]=Klientské menu
-Name[de]=
-Name[el]=Μενού λίστας client
-Name[eo]=Menuo de klienta listo
-Name[es]=Menú de lista de clientes
-Name[fr]=Menu de la liste des fenêtres
-Name[hu]=Ablaklista
-Name[it]=Menù lista client
-Name[ja]=
-Name[pt]=Menu da lista de clientes
-Name[pt_BR]=
-Name[tr]=İstemci Listesi Menüsü
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_clientlist
-Comment=Allows customization of the client list menu.
-Comment[ru]=Позволяет настройку списка клиентов.
-Comment[cs]=Umožňuje nastavení klientského menu.
-Comment[de]=
-Comment[el]=Επιτρέπει την παραμετροποίηση της client λίστας μενού.
-Comment[eo]=Adapti la menuon de klienta listo..
-Comment[es]=Permite la personalización del menú de lista de clientes.
-Comment[fr]=Personnalisation du menu de la liste des fenêtres.
-Comment[hu]=Itt az ablaklista beállításokat végezheted el.
-Comment[it]=Consente la personalizzazione del menù con la lista dei client.
-Comment[ja]=
-Comment[pt]=Permite-lhe a personalização do menu da lista de clientes
-Comment[pt_BR]=
-Comment[tr]=İstemci listesi menüsünün özelleştirilmesine izin verir.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_display/.cvsignore b/src/modules/conf_window_display/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_window_display/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_window_display/Makefile.am b/src/modules/conf_window_display/Makefile.am
deleted file mode 100644
index e124d4705..000000000
--- a/src/modules/conf_window_display/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_window_display
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_window_display.c \
-                         e_int_config_window_display.h
-			 
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_window_display/e-module-conf_window_display.edj b/src/modules/conf_window_display/e-module-conf_window_display.edj
deleted file mode 100644
index c3d87e852..000000000
Binary files a/src/modules/conf_window_display/e-module-conf_window_display.edj and /dev/null differ
diff --git a/src/modules/conf_window_display/e_mod_main.c b/src/modules/conf_window_display/e_mod_main.c
deleted file mode 100644
index 533292f49..000000000
--- a/src/modules/conf_window_display/e_mod_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Window Display"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("windows/window_display");
-   e_configure_registry_category_del("windows");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_window_display/e_mod_main.h b/src/modules/conf_window_display/e_mod_main.h
deleted file mode 100644
index 2b2bc0727..000000000
--- a/src/modules/conf_window_display/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_window_display.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_window_display.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_window_display/module.desktop.in b/src/modules/conf_window_display/module.desktop.in
deleted file mode 100644
index 9539fae62..000000000
--- a/src/modules/conf_window_display/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Window Display
-Name[ru]=Показ окна
-Name[cs]=Zobrazení okna
-Name[de]=
-Name[eo]=Vidigo de fenestroj
-Name[es]=Visualización de ventanas
-Name[fr]=Affichage des fenêtres
-Name[hu]=Ablak megjelenés
-Name[it]=Visualizzazione finestre
-Name[ja]=
-Name[pt]=Exibição da janela
-Name[pt_BR]=
-Name[tr]=Pencere Görünümü
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_window_display
-Comment=Configures default window properties such as default geometries, border icons, placement styles, etc.
-Comment[ru]=Конфигурация стандартных настроек окна, типа геометрия, иконка окна, стили расположения и т.д.
-Comment[cs]=Nastavení vlastností okna jako výchozí geometrie, ikony rámu aj.
-Comment[de]=
-Comment[eo]=Agordi la defaŭltjan ecojn de fenestroj kiel geometrio, stilo de pozicio, randaj piktogramoj, ktp.
-Comment[es]=Configura las propiedades predefinidas de las ventanas, como su geometría, los íconos del borde, el diseño, ubicación, etc.
-Comment[fr]=Paramétrage des propriétés par défaut d'une fenêtre comme la géométrie, la bordure, le positionnement, etc.
-Comment[hu]=Az alapértelmezett ablakbeállításokat tudod elvégezni a modul segítségével, úgy mint, elhelyezkedés, stílus, stb.
-Comment[it]=Configura le proprietà predefinite delle finestre come geometrie, icona del bordo, stile di posizionamento, ecc.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar diversas propriedades da janela, como a geometria, estilos...
-Comment[pt_BR]=
-Comment[tr]=Öntanımlı boyut, simge, yerleşim biçimleri vs. gibi pencere özelliklerini yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_focus/.cvsignore b/src/modules/conf_window_focus/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_window_focus/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_window_focus/Makefile.am b/src/modules/conf_window_focus/Makefile.am
deleted file mode 100644
index e093bf655..000000000
--- a/src/modules/conf_window_focus/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_window_focus
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 e_int_config_focus.c \
-                         e_int_config_focus.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf_window_focus/e-module-conf_window_focus.edj b/src/modules/conf_window_focus/e-module-conf_window_focus.edj
deleted file mode 100644
index 350d864be..000000000
Binary files a/src/modules/conf_window_focus/e-module-conf_window_focus.edj and /dev/null differ
diff --git a/src/modules/conf_window_focus/e_mod_main.c b/src/modules/conf_window_focus/e_mod_main.c
deleted file mode 100644
index db047ae92..000000000
--- a/src/modules/conf_window_focus/e_mod_main.c
+++ /dev/null
@@ -1,39 +0,0 @@
-#include "e.h"
-#include "e_mod_main.h"
-
-/* actual module specifics */
-static E_Module *conf_module = NULL;
-
-/* module setup */
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-     "Settings - Window Focus"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
-   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus);
-   conf_module = m;
-   e_module_delayed_set(m, 1);
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   E_Config_Dialog *cfd;
-   while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("windows/window_focus");
-   e_configure_registry_category_del("windows");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_window_focus/e_mod_main.h b/src/modules/conf_window_focus/e_mod_main.h
deleted file mode 100644
index 11af4f299..000000000
--- a/src/modules/conf_window_focus/e_mod_main.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-#define E_TYPEDEFS 1
-#include "e_int_config_focus.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_focus.h"
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
diff --git a/src/modules/conf_window_focus/module.desktop.in b/src/modules/conf_window_focus/module.desktop.in
deleted file mode 100644
index 64d64b4c2..000000000
--- a/src/modules/conf_window_focus/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Window Focus
-Name[ru]=Фокусировка окна
-Name[cs]=Aktivace okna
-Name[de]=
-Name[eo]=Fokuso de fenestroj
-Name[es]=Foco de la ventana
-Name[fr]=Focalisation des fenêtres
-Name[hu]=Ablak fókusz
-Name[it]=Fuoco delle finestre
-Name[ja]=
-Name[pt]=Foco da janela
-Name[pt_BR]=
-Name[tr]=Pencere Odaklanması
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_window_focus
-Comment=Configure window focus behavior.
-Comment[ru]=Настройка поведения фокусировки окна.
-Comment[cs]=Volby aktivace okna.
-Comment[de]=
-Comment[eo]=Agordi la konduton de enfokusiĝo de la fenestroj.
-Comment[es]=Configura el comportamiento del foco de las ventanas.
-Comment[fr]=Paramétrage de la focalisation des fenêtres.
-Comment[hu]=Az ablak fókusz beállítása.
-Comment[it]=Configura il comportamento del fuoco delle finestre.
-Comment[ja]=
-Comment[pt]=Permite-lhe configurar o comportamento do foco da janela
-Comment[pt_BR]=
-Comment[tr]=Pencere odaklanma davranışını yapılandırır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_window_manipulation/Makefile.am b/src/modules/conf_window_manipulation/Makefile.am
index ee9a6f693..2ff1bf5dd 100644
--- a/src/modules/conf_window_manipulation/Makefile.am
+++ b/src/modules/conf_window_manipulation/Makefile.am
@@ -23,7 +23,13 @@ module_la_SOURCES      = e_mod_main.c \
                          e_int_config_window_manip.h \
 			 e_int_config_window_geometry.c \
 			 e_int_config_window_maxpolicy.c \
-			 e_int_config_window_stacking.c
+			 e_int_config_window_stacking.c \
+                         e_int_config_window_display.c \
+                         e_int_config_window_display.h \
+                         e_int_config_focus.c \
+                         e_int_config_focus.h \
+                         e_int_config_clientlist.c \
+                         e_int_config_clientlist.h
 			 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.c b/src/modules/conf_window_manipulation/e_int_config_clientlist.c
similarity index 98%
rename from src/modules/conf_clientlist/e_int_config_clientlist.c
rename to src/modules/conf_window_manipulation/e_int_config_clientlist.c
index 2bfe3e6a6..99e9f54f5 100644
--- a/src/modules/conf_clientlist/e_int_config_clientlist.c
+++ b/src/modules/conf_window_manipulation/e_int_config_clientlist.c
@@ -24,7 +24,7 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "menus/client_list_menu")) 
+   if (e_config_dialog_find("E", "windows/client_list_menu")) 
      return NULL;
 
    v = E_NEW(E_Config_Dialog_View, 1);
@@ -34,7 +34,7 @@ e_int_config_clientlist(E_Container *con, const char *params __UNUSED__)
    v->basic.create_widgets = _basic_create;
 
    cfd = e_config_dialog_new(con, _("Client List Settings"), "E", 
-			     "menus/client_list_menu",
+			     "windows/client_list_menu",
 			     "preferences-winlist", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_clientlist/e_int_config_clientlist.h b/src/modules/conf_window_manipulation/e_int_config_clientlist.h
similarity index 100%
rename from src/modules/conf_clientlist/e_int_config_clientlist.h
rename to src/modules/conf_window_manipulation/e_int_config_clientlist.h
diff --git a/src/modules/conf_window_focus/e_int_config_focus.c b/src/modules/conf_window_manipulation/e_int_config_focus.c
similarity index 100%
rename from src/modules/conf_window_focus/e_int_config_focus.c
rename to src/modules/conf_window_manipulation/e_int_config_focus.c
diff --git a/src/modules/conf_window_focus/e_int_config_focus.h b/src/modules/conf_window_manipulation/e_int_config_focus.h
similarity index 100%
rename from src/modules/conf_window_focus/e_int_config_focus.h
rename to src/modules/conf_window_manipulation/e_int_config_focus.h
diff --git a/src/modules/conf_window_display/e_int_config_window_display.c b/src/modules/conf_window_manipulation/e_int_config_window_display.c
similarity index 100%
rename from src/modules/conf_window_display/e_int_config_window_display.c
rename to src/modules/conf_window_manipulation/e_int_config_window_display.c
diff --git a/src/modules/conf_window_display/e_int_config_window_display.h b/src/modules/conf_window_manipulation/e_int_config_window_display.h
similarity index 100%
rename from src/modules/conf_window_display/e_int_config_window_display.h
rename to src/modules/conf_window_manipulation/e_int_config_window_display.h
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
index 01a39098a..dc57672a6 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_maxpolicy.c
@@ -26,7 +26,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_maxpolicy_dialog")) 
+   if (e_config_dialog_find("E", "windows/window_maxpolicy_dialog")) 
      return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
@@ -42,7 +42,7 @@ e_int_config_window_maxpolicy(E_Container *con, const char *params __UNUSED__)
 
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con, _("Window Maximize Policy"),
-			     "E", "_config_window_maxpolicy_dialog",
+			     "E", "windows/window_maxpolicy_dialog",
 			     "preferences-window-manipulation", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
index 73c248a86..28e60f723 100644
--- a/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
+++ b/src/modules/conf_window_manipulation/e_int_config_window_stacking.c
@@ -31,7 +31,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
    E_Config_Dialog *cfd;
    E_Config_Dialog_View *v;
 
-   if (e_config_dialog_find("E", "_config_window_stacking_dialog")) 
+   if (e_config_dialog_find("E", "windows/window_stacking_dialog")) 
      return NULL;
    v = E_NEW(E_Config_Dialog_View, 1);
 
@@ -47,7 +47,7 @@ e_int_config_window_stacking(E_Container *con, const char *params __UNUSED__)
 
    /* create config diaolg for NULL object/data */
    cfd = e_config_dialog_new(con, _("Window Stacking"),
-			     "E", "_config_window_stacking_dialog",
+			     "E", "windows/window_stacking_dialog",
 			     "preferences-window-stacking", 0, v, NULL);
    return cfd;
 }
diff --git a/src/modules/conf_window_manipulation/e_mod_main.c b/src/modules/conf_window_manipulation/e_mod_main.c
index 362512341..83b3e5350 100644
--- a/src/modules/conf_window_manipulation/e_mod_main.c
+++ b/src/modules/conf_window_manipulation/e_mod_main.c
@@ -15,9 +15,12 @@ EAPI void *
 e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("windows", 50, _("Windows"), NULL, "preferences-system-windows");
+   e_configure_registry_item_add("windows/window_display", 10, _("Window Display"), NULL, "preferences-system-windows", e_int_config_window_display);
+   e_configure_registry_item_add("windows/window_focus", 20, _("Window Focus"), NULL, "preferences-focus", e_int_config_focus);
    e_configure_registry_item_add("windows/window_geometry", 30, _("Window Geometry"), NULL, "preferences-window-geometry", e_int_config_window_geometry);
-   e_configure_registry_item_add("windows/window_stacking", 30, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking);
-   e_configure_registry_item_add("windows/window_maxpolicy", 30, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
+   e_configure_registry_item_add("windows/window_stacking", 40, _("Window Stacking"), NULL, "preferences-window-stacking", e_int_config_window_stacking);
+   e_configure_registry_item_add("windows/window_maxpolicy", 50, _("Window Maximize Policy"), NULL, "preferences-window-maximize", e_int_config_window_maxpolicy);
+   e_configure_registry_item_add("windows/client_list_menu", 60, _("Client List Menu"), NULL, "preferences-winlist", e_int_config_clientlist);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -27,12 +30,18 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "windows/client_list_menu"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_stacking_dialog"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "windows/window_geometry"))) e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "_config_window_stacking_dialog"))) e_object_del(E_OBJECT(cfd));
-   while ((cfd = e_config_dialog_get("E", "_config_window_maxpolicy_dialog"))) e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("windows/window_geometry");
-   e_configure_registry_item_del("windows/window_stacking");
+   while ((cfd = e_config_dialog_get("E", "windows/window_focus"))) e_object_del(E_OBJECT(cfd));
+   while ((cfd = e_config_dialog_get("E", "windows/window_display"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("windows/client_list_menu");
    e_configure_registry_item_del("windows/window_maxpolicy");
+   e_configure_registry_item_del("windows/window_stacking");
+   e_configure_registry_item_del("windows/window_geometry");
+   e_configure_registry_item_del("windows/window_focus");
+   e_configure_registry_item_del("windows/window_display");
    e_configure_registry_category_del("windows");
    conf_module = NULL;
    return 1;
diff --git a/src/modules/conf_window_manipulation/e_mod_main.h b/src/modules/conf_window_manipulation/e_mod_main.h
index b8f80031b..1c06e354e 100644
--- a/src/modules/conf_window_manipulation/e_mod_main.h
+++ b/src/modules/conf_window_manipulation/e_mod_main.h
@@ -3,9 +3,15 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_window_manip.h"
+#include "e_int_config_window_display.h"
+#include "e_int_config_focus.h"
+#include "e_int_config_clientlist.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_window_manip.h"
+#include "e_int_config_window_display.h"
+#include "e_int_config_focus.h"
+#include "e_int_config_clientlist.h"
 
 EAPI extern E_Module_Api e_modapi;