diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am
index 9be2846df9..79fcfdab74 100644
--- a/src/Makefile_Ecore_Imf.am
+++ b/src/Makefile_Ecore_Imf.am
@@ -73,13 +73,13 @@ lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
 # Ibus
 
 if BUILD_ECORE_IMF_IBUS
-ecoreimfibuspkgdir = $(libdir)/ecore/immodules
-ecoreimfibuspkg_LTLIBRARIES = modules/ecore/immodules/ibus/ibus.la
-modules_ecore_immodules_ibus_ibus_la_SOURCES = \
-modules/ecore/immodules/ibus/ibus_module.c \
-modules/ecore/immodules/ibus/ibus_imcontext.c \
-modules/ecore/immodules/ibus/ibus_imcontext.h
-modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
+ecoreimfibuspkgdir = $(libdir)/ecore_imf
+ecoreimfibuspkg_LTLIBRARIES = modules/ecore_imf/ibus/ibus.la
+modules_ecore_imf_ibus_ibus_la_SOURCES = \
+modules/ecore_imf/ibus/ibus_module.c \
+modules/ecore_imf/ibus/ibus_imcontext.c \
+modules/ecore_imf/ibus/ibus_imcontext.h
+modules_ecore_imf_ibus_ibus_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
@@ -93,7 +93,7 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \
 @ECORE_IMF_CFLAGS@ \
 @EFL_COV_CFLAGS@ \
 @IBUS_CFLAGS@
-modules_ecore_immodules_ibus_ibus_la_LIBADD = \
+modules_ecore_imf_ibus_ibus_la_LIBADD = \
 lib/ecore_evas/libecore_evas.la \
 lib/ecore_imf/libecore_imf.la \
 lib/ecore_x/libecore_x.la \
@@ -102,20 +102,20 @@ lib/eo/libeo.la \
 lib/eina/libeina.la \
 @IBUS_LIBS@ \
 @EFL_COV_LIBS@
-modules_ecore_immodules_ibus_ibus_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-modules_ecore_immodules_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static
+modules_ecore_imf_ibus_ibus_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_ibus_ibus_la_LIBTOOLFLAGS = --tag=disable-static
 endif
 
 # Scim
 
 if BUILD_ECORE_IMF_SCIM
-ecoreimfscimpkgdir = $(libdir)/ecore/immodules
-ecoreimfscimpkg_LTLIBRARIES = modules/ecore/immodules/scim/scim.la
-modules_ecore_immodules_scim_scim_la_SOURCES = \
-modules/ecore/immodules/scim/scim_module.cpp \
-modules/ecore/immodules/scim/scim_imcontext.cpp \
-modules/ecore/immodules/scim/scim_imcontext.h
-modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
+ecoreimfscimpkgdir = $(libdir)/ecore_imf
+ecoreimfscimpkg_LTLIBRARIES = modules/ecore_imf/scim/scim.la
+modules_ecore_imf_scim_scim_la_SOURCES = \
+modules/ecore_imf/scim/scim_module.cpp \
+modules/ecore_imf/scim/scim_imcontext.cpp \
+modules/ecore_imf/scim/scim_imcontext.h
+modules_ecore_imf_scim_scim_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
@@ -129,7 +129,7 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \
 @ECORE_IMF_CFLAGS@ \
 @EFL_COV_CFLAGS@ \
 @SCIM_CFLAGS@
-modules_ecore_immodules_scim_scim_la_LIBADD = \
+modules_ecore_imf_scim_scim_la_LIBADD = \
 lib/ecore_evas/libecore_evas.la \
 lib/ecore_imf/libecore_imf.la \
 lib/ecore_x/libecore_x.la \
@@ -138,18 +138,18 @@ lib/eo/libeo.la \
 lib/eina/libeina.la \
 @SCIM_LIBS@ \
 @EFL_COV_LIBS@
-modules_ecore_immodules_scim_scim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-modules_ecore_immodules_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static
+modules_ecore_imf_scim_scim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_scim_scim_la_LIBTOOLFLAGS = --tag=disable-static
 endif
 
 # Xim
 
 if BUILD_ECORE_IMF_XIM
-ecoreimfximpkgdir = $(libdir)/ecore/immodules
-ecoreimfximpkg_LTLIBRARIES = modules/ecore/immodules/xim/xim.la
-modules_ecore_immodules_xim_xim_la_SOURCES = \
-modules/ecore/immodules/xim/ecore_imf_xim.c
-modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
+ecoreimfximpkgdir = $(libdir)/ecore_imf
+ecoreimfximpkg_LTLIBRARIES = modules/ecore_imf/xim/xim.la
+modules_ecore_imf_xim_xim_la_SOURCES = \
+modules/ecore_imf/xim/ecore_imf_xim.c
+modules_ecore_imf_xim_xim_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/eina \
 -I$(top_builddir)/src/lib/eina \
 -I$(top_srcdir)/src/lib/eo \
@@ -160,13 +160,13 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_imf \
 @ECORE_IMF_CFLAGS@ \
 @EFL_COV_CFLAGS@
-modules_ecore_immodules_xim_xim_la_LIBADD = \
+modules_ecore_imf_xim_xim_la_LIBADD = \
 lib/ecore_imf/libecore_imf.la \
 lib/ecore_x/libecore_x.la \
 lib/ecore/libecore.la \
 lib/eo/libeo.la \
 lib/eina/libeina.la \
 @EFL_COV_LIBS@
-modules_ecore_immodules_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-modules_ecore_immodules_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static
+modules_ecore_imf_xim_xim_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_ecore_imf_xim_xim_la_LIBTOOLFLAGS = --tag=disable-static
 endif
diff --git a/src/lib/ecore_imf/ecore_imf_module.c b/src/lib/ecore_imf/ecore_imf_module.c
index bf8cf6b731..9df95a7130 100644
--- a/src/lib/ecore_imf/ecore_imf_module.c
+++ b/src/lib/ecore_imf/ecore_imf_module.c
@@ -40,7 +40,7 @@ ecore_imf_module_init(void)
    if (getenv("EFL_RUN_IN_TREE"))
      {
         struct stat st;
-        snprintf(buf, sizeof(buf), "%s/src/modules/ecore/immodules",
+        snprintf(buf, sizeof(buf), "%s/src/modules/ecore_imf",
                  PACKAGE_BUILD_DIR);
         if (stat(buf, &st) == 0)
           {
@@ -60,7 +60,7 @@ ecore_imf_module_init(void)
              for (itr = built_modules; *itr != NULL; itr++)
                {
                   snprintf(buf, sizeof(buf),
-                           "%s/src/modules/ecore/immodules/%s/.libs",
+                           "%s/src/modules/ecore_imf/%s/.libs",
                            PACKAGE_BUILD_DIR, *itr);
                   module_list = eina_module_list_get(module_list, buf,
                                                      EINA_FALSE, NULL, NULL);
@@ -72,10 +72,10 @@ ecore_imf_module_init(void)
           }
      }
 
-   snprintf(buf, sizeof(buf), "%s/ecore/immodules", eina_prefix_lib_get(pfx));
+   snprintf(buf, sizeof(buf), "%s/ecore_imf", eina_prefix_lib_get(pfx));
 
    module_list = eina_module_list_get(NULL, buf, 0, NULL, NULL);
-   homedir = eina_module_environment_path_get("HOME", "/.ecore/immodules");
+   homedir = eina_module_environment_path_get("HOME", "/.ecore_imf");
    if (homedir)
      {
         module_list = eina_module_list_get(module_list, homedir, 0, NULL, NULL);
diff --git a/src/modules/ecore/immodules/ibus/ibus_imcontext.c b/src/modules/ecore_imf/ibus/ibus_imcontext.c
similarity index 100%
rename from src/modules/ecore/immodules/ibus/ibus_imcontext.c
rename to src/modules/ecore_imf/ibus/ibus_imcontext.c
diff --git a/src/modules/ecore/immodules/ibus/ibus_imcontext.h b/src/modules/ecore_imf/ibus/ibus_imcontext.h
similarity index 100%
rename from src/modules/ecore/immodules/ibus/ibus_imcontext.h
rename to src/modules/ecore_imf/ibus/ibus_imcontext.h
diff --git a/src/modules/ecore/immodules/ibus/ibus_module.c b/src/modules/ecore_imf/ibus/ibus_module.c
similarity index 100%
rename from src/modules/ecore/immodules/ibus/ibus_module.c
rename to src/modules/ecore_imf/ibus/ibus_module.c
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.cpp b/src/modules/ecore_imf/scim/scim_imcontext.cpp
similarity index 100%
rename from src/modules/ecore/immodules/scim/scim_imcontext.cpp
rename to src/modules/ecore_imf/scim/scim_imcontext.cpp
diff --git a/src/modules/ecore/immodules/scim/scim_imcontext.h b/src/modules/ecore_imf/scim/scim_imcontext.h
similarity index 100%
rename from src/modules/ecore/immodules/scim/scim_imcontext.h
rename to src/modules/ecore_imf/scim/scim_imcontext.h
diff --git a/src/modules/ecore/immodules/scim/scim_module.cpp b/src/modules/ecore_imf/scim/scim_module.cpp
similarity index 100%
rename from src/modules/ecore/immodules/scim/scim_module.cpp
rename to src/modules/ecore_imf/scim/scim_module.cpp
diff --git a/src/modules/ecore/immodules/xim/ecore_imf_xim.c b/src/modules/ecore_imf/xim/ecore_imf_xim.c
similarity index 100%
rename from src/modules/ecore/immodules/xim/ecore_imf_xim.c
rename to src/modules/ecore_imf/xim/ecore_imf_xim.c