diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am
index 701afa7cf..697d175da 100644
--- a/src/modules/everything/Makefile.am
+++ b/src/modules/everything/Makefile.am
@@ -53,4 +53,3 @@ pkgconfig_DATA = everything.pc
 
 uninstall-local:
 	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/everything_plugins/core/
diff --git a/src/modules/everything/actions/Makefile.am b/src/modules/everything/actions/Makefile.am
index 7a7ee6b48..17eb3d759 100644
--- a/src/modules/everything/actions/Makefile.am
+++ b/src/modules/everything/actions/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES               = -I.. \
                          -I$(top_srcdir)/src/modules \
                          @e_cflags@
 
-plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+plugindir              = $(libdir)/enlightenment/modules/$(MODULE)/plugins/core/$(MODULE_ARCH)
 
 evry_plug_border_actdir = $(plugindir)
 evry_plug_border_act_LTLIBRARIES = evry_plug_border_act.la
diff --git a/src/modules/everything/e_mod_main.c b/src/modules/everything/e_mod_main.c
index 4dbcb648d..7e7811547 100644
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@@ -79,7 +79,7 @@ e_modapi_init(E_Module *m)
    _config_init();
    evry_history_init();
       
-   snprintf(dir, sizeof(dir), "%s/enlightenment/everything_plugins",
+   snprintf(dir, sizeof(dir), "%s/enlightenment/modules/everything/plugins",
 	    e_prefix_lib_get());
    files = ecore_file_ls(dir);
 
@@ -93,7 +93,7 @@ e_modapi_init(E_Module *m)
 	free(file);
      }
 
-   snprintf(dir, sizeof(dir), "%s/.e/e/everything_plugins",
+   snprintf(dir, sizeof(dir), "%s/.e/e/modules/everything/plugins",
 	    e_user_homedir_get());
    files = ecore_file_ls(dir);
 
diff --git a/src/modules/everything/everything.pc.in b/src/modules/everything/everything.pc.in
index 7b358b4f9..e11261008 100644
--- a/src/modules/everything/everything.pc.in
+++ b/src/modules/everything/everything.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
-plugindir=@libdir@/enlightenment/everything_plugins
+plugindir=@libdir@/enlightenment/modules/everything/plugins
 
 Name: e17-everything
 Description: Everything Module for E17
diff --git a/src/modules/everything/sources/Makefile.am b/src/modules/everything/sources/Makefile.am
index 92ff777bc..f9d2bfb85 100644
--- a/src/modules/everything/sources/Makefile.am
+++ b/src/modules/everything/sources/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES               = -I.. \
                          -I$(top_srcdir)/src/modules \
                          @e_cflags@
 
-
-plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
+plugindir              = $(libdir)/enlightenment/modules/$(MODULE)/plugins/core/$(MODULE_ARCH)
 
 evry_plug_appsdir = $(plugindir)
 evry_plug_apps_LTLIBRARIES = evry_plug_apps.la
diff --git a/src/modules/everything/views/Makefile.am b/src/modules/everything/views/Makefile.am
index 7b9df44c5..a6a736330 100644
--- a/src/modules/everything/views/Makefile.am
+++ b/src/modules/everything/views/Makefile.am
@@ -10,8 +10,7 @@ INCLUDES               = -I.. \
                          -I$(top_srcdir)/src/modules \
                          @e_cflags@
 
-plugindir              = $(libdir)/enlightenment/everything_plugins/core/$(MODULE_ARCH)
-
+plugindir              = $(libdir)/enlightenment/modules/$(MODULE)/plugins/core/$(MODULE_ARCH)
 
 evry_plug_previewdir = $(plugindir)
 evry_plug_preview_LTLIBRARIES = evry_plug_preview.la