diff --git a/config/illume-home/e.src b/config/illume-home/e.src
index 22935f4e5..82f448a44 100644
--- a/config/illume-home/e.src
+++ b/config/illume-home/e.src
@@ -1186,12 +1186,6 @@ group "E_Config" struct {
             value "delayed" uchar: 1;
             value "priority" int: 0;
         }
-        group "E_Config_Module" struct {
-            value "name" string: "conf_engine";
-            value "enabled" uchar: 1;
-            value "delayed" uchar: 1;
-            value "priority" int: 0;
-        }
         group "E_Config_Module" struct {
             value "name" string: "conf_interaction";
             value "enabled" uchar: 1;
diff --git a/config/illume/e.src b/config/illume/e.src
index 74518871b..d73634083 100644
--- a/config/illume/e.src
+++ b/config/illume/e.src
@@ -127,14 +127,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_startup";
diff --git a/config/minimalist/e.src b/config/minimalist/e.src
index 216ec82f7..ae532f4d6 100644
--- a/config/minimalist/e.src
+++ b/config/minimalist/e.src
@@ -249,14 +249,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "conf_interaction";
diff --git a/config/netbook/e.src b/config/netbook/e.src
index 008ef974b..fb716ddce 100644
--- a/config/netbook/e.src
+++ b/config/netbook/e.src
@@ -281,14 +281,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      value "enabled" uchar: 1;
-      value "delayed" uchar: 1;
-      value "priority" int: 0;
-    }
-  }
   group "modules" list {
     group "E_Config_Module" struct {
       value "name" string: "fileman";
diff --git a/config/scaleable/e.src b/config/scaleable/e.src
index 00977ae92..1003c01ac 100644
--- a/config/scaleable/e.src
+++ b/config/scaleable/e.src
@@ -72,14 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      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/standard/e.src b/config/standard/e.src
index 6e351da94..eabe6b705 100644
--- a/config/standard/e.src
+++ b/config/standard/e.src
@@ -72,14 +72,6 @@ group "E_Config" struct {
       value "priority" int: 0;
     }
   }
-  group "modules" list {
-    group "E_Config_Module" struct {
-      value "name" string: "conf_engine";
-      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/configure.ac b/configure.ac
index 27e5fe7ef..6ad4b7b7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -689,7 +689,6 @@ AC_E_OPTIONAL_MODULE([conf_startup], true)
 AC_E_OPTIONAL_MODULE([conf_intl], true)
 AC_E_OPTIONAL_MODULE([conf_profiles], true)
 AC_E_OPTIONAL_MODULE([msgbus], true)
-AC_E_OPTIONAL_MODULE([conf_engine], true)
 AC_E_OPTIONAL_MODULE([conf_applications], true)
 AC_E_OPTIONAL_MODULE([conf_display], true)
 AC_E_OPTIONAL_MODULE([conf_shelves], true)
@@ -806,8 +805,6 @@ src/modules/conf_profiles/Makefile
 src/modules/conf_profiles/module.desktop
 src/modules/msgbus/Makefile
 src/modules/msgbus/module.desktop
-src/modules/conf_engine/Makefile
-src/modules/conf_engine/module.desktop
 src/modules/conf_applications/Makefile
 src/modules/conf_applications/module.desktop
 src/modules/conf_display/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8095a73cb..6a61b8a8d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -149,8 +149,6 @@ src/modules/conf_display/e_int_config_dpms.c
 src/modules/conf_display/e_mod_main.c
 src/modules/conf_edgebindings/e_int_config_edgebindings.c
 src/modules/conf_edgebindings/e_mod_main.c
-src/modules/conf_engine/e_int_config_engine.c
-src/modules/conf_engine/e_mod_main.c
 src/modules/conf_fonts/e_int_config_fonts.c
 src/modules/conf_fonts/e_mod_main.c
 src/modules/conf_icon_theme/e_int_config_icon_themes.c
@@ -174,6 +172,7 @@ src/modules/conf_mouse_cursor/e_int_config_cursor.c
 src/modules/conf_mouse_cursor/e_mod_main.c
 src/modules/conf_paths/e_int_config_paths.c
 src/modules/conf_paths/e_mod_main.c
+src/modules/conf_performance/e_int_config_engine.c
 src/modules/conf_performance/e_int_config_performance.c
 src/modules/conf_performance/e_mod_main.c
 src/modules/conf_profiles/e_int_config_profiles.c
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index ca332b27b..3bd09c1fc 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -110,10 +110,6 @@ if USE_MODULE_MSGBUS
 SUBDIRS += msgbus
 endif
 
-if USE_MODULE_CONF_ENGINE
-SUBDIRS += conf_engine
-endif
-
 if USE_MODULE_CONF_APPLICATIONS
 SUBDIRS += conf_applications
 endif
diff --git a/src/modules/conf_engine/.cvsignore b/src/modules/conf_engine/.cvsignore
deleted file mode 100644
index 06d064a84..000000000
--- a/src/modules/conf_engine/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-module.la
-module.desktop
diff --git a/src/modules/conf_engine/Makefile.am b/src/modules/conf_engine/Makefile.am
deleted file mode 100644
index e47684c33..000000000
--- a/src/modules/conf_engine/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_engine
-
-# 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_engine.c \
-                         e_int_config_engine.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_engine/e-module-conf_engine.edj b/src/modules/conf_engine/e-module-conf_engine.edj
deleted file mode 100644
index 1fef81b6b..000000000
Binary files a/src/modules/conf_engine/e-module-conf_engine.edj and /dev/null differ
diff --git a/src/modules/conf_engine/e_mod_main.c b/src/modules/conf_engine/e_mod_main.c
deleted file mode 100644
index 31a9c08ff..000000000
--- a/src/modules/conf_engine/e_mod_main.c
+++ /dev/null
@@ -1,43 +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 - Engine"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, 
-                                     "preferences-advanced");
-   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, 
-                                 "preferences-engine", e_int_config_engine);
-   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", "advanced/engine"))) 
-     e_object_del(E_OBJECT(cfd));
-   e_configure_registry_item_del("advanced/engine");
-   e_configure_registry_category_del("advanced");
-   conf_module = NULL;
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
diff --git a/src/modules/conf_engine/e_mod_main.h b/src/modules/conf_engine/e_mod_main.h
deleted file mode 100644
index 2d55b4780..000000000
--- a/src/modules/conf_engine/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_engine.h"
-
-#undef E_TYPEDEFS
-#include "e_int_config_engine.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_engine/module.desktop.in b/src/modules/conf_engine/module.desktop.in
deleted file mode 100644
index c9312693a..000000000
--- a/src/modules/conf_engine/module.desktop.in
+++ /dev/null
@@ -1,34 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Engine
-Name[ru]=Движок
-Name[cs]=Engine
-Name[de]=
-Name[eo]=Motoro
-Name[es]=Motor
-Name[fr]=Moteur
-Name[hu]=Meghajtó
-Name[it]=Motore
-Name[ja]=
-Name[pt]=Motor
-Name[pt_BR]=
-Name[tr]=Motor
-Name[zh_CN]=
-Name[zh_TW]=
-Icon=e-module-conf_engine
-Comment=Used to select the rendering engine.
-Comment[ru]=Используется для выбора движка для системы прорисовки.
-Comment[cs]=Použit pro volbu vykreslovacího enginu.
-Comment[de]=
-Comment[eo]=Elekti la bildigan motoron.
-Comment[es]=Usado para seleccionar el motor de renderizado.
-Comment[fr]=Permet de choisir le moteur de rendu.
-Comment[hu]=A megjelenítő motor (rendering engine) kiválasztása.
-Comment[it]=Usato per selezionere il motore di rendering.
-Comment[ja]=
-Comment[pt]=Permite-lhe selecionar o motor de renderização
-Comment[pt_BR]=
-Comment[tr]=Render motorunu seçmekte kullanılır.
-Comment[zh_CN]=
-Comment[zh_TW]=
-X-Enlightenment-ModuleType=settings
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
index b7dd928ec..d403d1f0a 100644
--- a/src/modules/conf_performance/Makefile.am
+++ b/src/modules/conf_performance/Makefile.am
@@ -21,7 +21,9 @@ pkg_LTLIBRARIES        = module.la
 module_la_SOURCES      = e_mod_main.c \
                          e_mod_main.h \
 			 e_int_config_performance.c \
-                         e_int_config_performance.h
+                         e_int_config_performance.h \
+                         e_int_config_engine.c \
+                         e_int_config_engine.h
 
 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
diff --git a/src/modules/conf_engine/e_int_config_engine.c b/src/modules/conf_performance/e_int_config_engine.c
similarity index 100%
rename from src/modules/conf_engine/e_int_config_engine.c
rename to src/modules/conf_performance/e_int_config_engine.c
diff --git a/src/modules/conf_engine/e_int_config_engine.h b/src/modules/conf_performance/e_int_config_engine.h
similarity index 100%
rename from src/modules/conf_engine/e_int_config_engine.h
rename to src/modules/conf_performance/e_int_config_engine.h
diff --git a/src/modules/conf_performance/e_mod_main.c b/src/modules/conf_performance/e_mod_main.c
index 0e6384801..b587ce117 100644
--- a/src/modules/conf_performance/e_mod_main.c
+++ b/src/modules/conf_performance/e_mod_main.c
@@ -16,6 +16,7 @@ e_modapi_init(E_Module *m)
 {
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "preferences-advanced");
    e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "preferences-system-performance", e_int_config_performance);   
+   e_configure_registry_item_add("advanced/engine", 50, _("Engine"), NULL, "preferences-engine", e_int_config_engine);
    conf_module = m;
    e_module_delayed_set(m, 1);
    return m;
@@ -25,7 +26,9 @@ EAPI int
 e_modapi_shutdown(E_Module *m __UNUSED__)
 {
    E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "advanced/engine"))) e_object_del(E_OBJECT(cfd));
    while ((cfd = e_config_dialog_get("E", "advanced/performance"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("advanced/engine");
    e_configure_registry_item_del("advanced/performance");
    e_configure_registry_category_del("advanced");
    conf_module = NULL;
diff --git a/src/modules/conf_performance/e_mod_main.h b/src/modules/conf_performance/e_mod_main.h
index f880be9f0..235e37db9 100644
--- a/src/modules/conf_performance/e_mod_main.h
+++ b/src/modules/conf_performance/e_mod_main.h
@@ -3,9 +3,11 @@
 
 #define E_TYPEDEFS 1
 #include "e_int_config_performance.h"
+#include "e_int_config_engine.h"
 
 #undef E_TYPEDEFS
 #include "e_int_config_performance.h"
+#include "e_int_config_engine.h"
 
 EAPI extern E_Module_Api e_modapi;