diff --git a/configure.in b/configure.in
index d876d2da3..0e65e95b9 100644
--- a/configure.in
+++ b/configure.in
@@ -267,6 +267,10 @@ src/modules/conf_transitions/Makefile
 src/modules/conf_transitions/module.desktop
 src/modules/conf_startup/Makefile
 src/modules/conf_startup/module.desktop
+src/modules/conf_intl/Makefile
+src/modules/conf_intl/module.desktop
+src/modules/conf_imc/Makefile
+src/modules/conf_imc/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index a97fb964f..6e1a6c3a0 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -99,9 +99,6 @@ e_widget_image.h \
 e_config_dialog.h \
 e_int_config_focus.h \
 e_int_config_desks.h \
-e_int_config_intl.h \
-e_int_config_imc.h \
-e_int_config_imc_import.h \
 e_configure.h \
 e_int_border_locks.h \
 e_thumb.h \
@@ -280,9 +277,6 @@ e_int_config_desklock.c \
 e_int_config_exebuf.c \
 e_int_config_apps.c \
 e_int_config_dialogs.c \
-e_int_config_intl.c \
-e_int_config_imc.c \
-e_int_config_imc_import.c \
 e_int_config_mime.c \
 e_int_config_mime_edit.c \
 e_int_config_screensaver.c \
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index 3ddc19341..9b046c212 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -463,10 +463,6 @@ e_configure_init(void)
    e_configure_registry_item_add("menus/menu_settings", 30, _("Menu Settings"), NULL, "enlightenment/menu_settings", e_int_config_menus);
    e_configure_registry_item_add("menus/client_list_menu", 40, _("Client List Menu"), NULL, "enlightenment/windows", e_int_config_clientlist);
    
-   e_configure_registry_category_add("language", 70, _("Language"), NULL, "enlightenment/intl");
-   e_configure_registry_item_add("language/language_settings", 10, _("Language Settings"), NULL, "enlightenment/intl", e_int_config_intl);
-   e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "enlightenment/imc", e_int_config_imc);
-   
    e_configure_registry_category_add("advanced", 80, _("Advanced"), NULL, "enlightenment/advanced");
    e_configure_registry_item_add("advanced/dialogs", 10, _("Dialogs"), NULL, "enlightenment/configuration", e_int_config_dialogs);
    e_configure_registry_item_add("advanced/performance", 20, _("Performance"), NULL, "enlightenment/performance", e_int_config_performance);   
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index 0ec17f6ba..c195e2ab6 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -100,9 +100,6 @@
 #include "e_int_config_exebuf.h"
 #include "e_int_config_apps.h"
 #include "e_int_config_dialogs.h"
-#include "e_int_config_intl.h"
-#include "e_int_config_imc.h"
-#include "e_int_config_imc_import.h"
 #include "e_int_config_mime.h"
 #include "e_int_config_mime_edit.h"
 #include "e_exebuf.h"
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index b067506cb..a09daf8af 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -18,4 +18,6 @@ conf_borders \
 conf_icon_theme \
 conf_mouse_cursor \
 conf_transitions \
-conf_startup
+conf_startup \
+conf_intl \
+conf_imc
diff --git a/src/modules/conf_fonts/e_mod_main.c b/src/modules/conf_fonts/e_mod_main.c
index f8a7fc9b3..6ef6cb6d4 100644
--- a/src/modules/conf_fonts/e_mod_main.c
+++ b/src/modules/conf_fonts/e_mod_main.c
@@ -25,7 +25,7 @@ static E_Module *conf_module = NULL;
 EAPI E_Module_Api e_modapi =
 {
    E_MODULE_API_VERSION,
-     "Configuration - Colors"
+   "Configuration - Fonts"
 };
 
 EAPI void *
diff --git a/src/modules/conf_imc/Makefile.am b/src/modules/conf_imc/Makefile.am
new file mode 100644
index 000000000..58b1c6348
--- /dev/null
+++ b/src/modules/conf_imc/Makefile.am
@@ -0,0 +1,33 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_imc
+
+# 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_srcdir)/src/lib \
+                         -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_imc_import.c \
+			 e_int_config_imc_import.h \
+			 e_int_config_imc.c \
+			 e_int_config_imc.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_imc/e-module-conf_imc.edj b/src/modules/conf_imc/e-module-conf_imc.edj
new file mode 100644
index 000000000..6e13ad2b5
Binary files /dev/null and b/src/modules/conf_imc/e-module-conf_imc.edj differ
diff --git a/src/bin/e_int_config_imc.c b/src/modules/conf_imc/e_int_config_imc.c
similarity index 100%
rename from src/bin/e_int_config_imc.c
rename to src/modules/conf_imc/e_int_config_imc.c
diff --git a/src/bin/e_int_config_imc.h b/src/modules/conf_imc/e_int_config_imc.h
similarity index 100%
rename from src/bin/e_int_config_imc.h
rename to src/modules/conf_imc/e_int_config_imc.h
diff --git a/src/bin/e_int_config_imc_import.c b/src/modules/conf_imc/e_int_config_imc_import.c
similarity index 100%
rename from src/bin/e_int_config_imc_import.c
rename to src/modules/conf_imc/e_int_config_imc_import.c
diff --git a/src/bin/e_int_config_imc_import.h b/src/modules/conf_imc/e_int_config_imc_import.h
similarity index 100%
rename from src/bin/e_int_config_imc_import.h
rename to src/modules/conf_imc/e_int_config_imc_import.h
diff --git a/src/modules/conf_imc/e_mod_main.c b/src/modules/conf_imc/e_mod_main.c
new file mode 100644
index 000000000..2225a3c88
--- /dev/null
+++ b/src/modules/conf_imc/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#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,
+   "Configuration - Input Methods"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("language", 70, _("Language"), NULL, "enlightenment/intl");
+   e_configure_registry_item_add("language/input_method_settings", 20, _("Input Method Settings"), NULL, "enlightenment/imc", e_int_config_imc);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_imc_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("language/input_method_settings");
+   e_configure_registry_category_del("language");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Input Methods"),
+			_("Configuration dialog for input methods."));
+   return 1;
+}
diff --git a/src/modules/conf_imc/e_mod_main.h b/src/modules/conf_imc/e_mod_main.h
new file mode 100644
index 000000000..a9dba4416
--- /dev/null
+++ b/src/modules/conf_imc/e_mod_main.h
@@ -0,0 +1,19 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_imc.h"
+#undef E_TYPEDEFS
+#include "e_int_config_imc.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);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_imc/module.desktop.in b/src/modules/conf_imc/module.desktop.in
new file mode 100644
index 000000000..13c8b7bc4
--- /dev/null
+++ b/src/modules/conf_imc/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Input Methods
+Icon=e-module-conf_imc
diff --git a/src/modules/conf_intl/Makefile.am b/src/modules/conf_intl/Makefile.am
new file mode 100644
index 000000000..cfba84e22
--- /dev/null
+++ b/src/modules/conf_intl/Makefile.am
@@ -0,0 +1,31 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_intl
+
+# 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_srcdir)/src/lib \
+                         -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_intl.c \
+			 e_int_config_intl.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_intl/e-module-conf_intl.edj b/src/modules/conf_intl/e-module-conf_intl.edj
new file mode 100644
index 000000000..4e5eec110
Binary files /dev/null and b/src/modules/conf_intl/e-module-conf_intl.edj differ
diff --git a/src/bin/e_int_config_intl.c b/src/modules/conf_intl/e_int_config_intl.c
similarity index 100%
rename from src/bin/e_int_config_intl.c
rename to src/modules/conf_intl/e_int_config_intl.c
diff --git a/src/bin/e_int_config_intl.h b/src/modules/conf_intl/e_int_config_intl.h
similarity index 100%
rename from src/bin/e_int_config_intl.h
rename to src/modules/conf_intl/e_int_config_intl.h
diff --git a/src/modules/conf_intl/e_mod_main.c b/src/modules/conf_intl/e_mod_main.c
new file mode 100644
index 000000000..c3a0c04a8
--- /dev/null
+++ b/src/modules/conf_intl/e_mod_main.c
@@ -0,0 +1,64 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#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,
+   "Configuration - Language"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("language", 70, _("Language"), NULL, "enlightenment/intl");
+   e_configure_registry_item_add("language/language_settings", 10, _("Language Settings"), NULL, "enlightenment/intl", e_int_config_intl);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   E_Config_Dialog *cfd;
+   while ((cfd = e_config_dialog_get("E", "_config_intl_dialog"))) e_object_del(E_OBJECT(cfd));
+   e_configure_registry_item_del("language/language_settings");
+   e_configure_registry_category_del("language");
+   conf_module = NULL;
+   return 1;
+}
+
+EAPI int
+e_modapi_save(E_Module *m)
+{
+   return 1;
+}
+
+EAPI int
+e_modapi_about(E_Module *m)
+{
+   e_module_dialog_show(m,
+			_("Enlightenment Configuration Module - Language"),
+			_("Configuration dialog for language and locale."));
+   return 1;
+}
diff --git a/src/modules/conf_intl/e_mod_main.h b/src/modules/conf_intl/e_mod_main.h
new file mode 100644
index 000000000..aa55e42c2
--- /dev/null
+++ b/src/modules/conf_intl/e_mod_main.h
@@ -0,0 +1,19 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
+#ifndef E_MOD_MAIN_H
+#define E_MOD_MAIN_H
+
+#define E_TYPEDEFS 1
+#include "e_int_config_intl.h"
+#undef E_TYPEDEFS
+#include "e_int_config_intl.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);
+EAPI int   e_modapi_about    (E_Module *m);
+
+#endif
diff --git a/src/modules/conf_intl/module.desktop.in b/src/modules/conf_intl/module.desktop.in
new file mode 100644
index 000000000..fdea31acd
--- /dev/null
+++ b/src/modules/conf_intl/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Language
+Icon=e-module-conf_intl