diff --git a/configure.in b/configure.in
index 112295939..dd89333c8 100644
--- a/configure.in
+++ b/configure.in
@@ -250,6 +250,8 @@ src/modules/start/Makefile
 src/modules/start/module.desktop
 src/modules/layout/Makefile
 src/modules/layout/module.desktop
+src/modules/conf_wallpaper/Makefile
+src/modules/conf_wallpaper/module.desktop
 src/preload/Makefile
 data/Makefile
 data/fonts/Makefile
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ab974e2b5..53f1a4ede 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -170,9 +170,6 @@ e_widget_spectrum.h \
 e_widget_cslider.h \
 e_widget_csel.h \
 e_widget_color_well.h \
-e_int_config_wallpaper.h \
-e_int_config_wallpaper_import.h \
-e_int_config_wallpaper_gradient.h \
 e_color_dialog.h  \
 e_sys.h \
 e_obj_dialog.h \
@@ -336,9 +333,6 @@ e_widget_spectrum.c \
 e_widget_cslider.c \
 e_widget_csel.c \
 e_widget_color_well.c \
-e_int_config_wallpaper.c \
-e_int_config_wallpaper_import.c \
-e_int_config_wallpaper_gradient.c \
 e_color_dialog.c \
 e_sys.c \
 e_int_config_transitions.c \
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 6122e7ced..20b776e72 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -754,6 +754,7 @@ e_config_init(void)
 	CFG_MODULE("cpufreq", 1);
 	CFG_MODULE("temperature", 1);
 	CFG_MODULE("pager", 1);
+	CFG_MODULE("conf_wallpaper", 1);
      }
 #if 0
      {
diff --git a/src/bin/e_configure.c b/src/bin/e_configure.c
index f1aacdc16..90187208d 100644
--- a/src/bin/e_configure.c
+++ b/src/bin/e_configure.c
@@ -422,7 +422,7 @@ e_configure_init(void)
 {
    /* FIXME: hardcoded - need to move these into modules - except modules config */
    e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
-   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
+//   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
    e_configure_registry_item_add("appearance/theme", 20, _("Theme"), NULL, "enlightenment/themes", e_int_config_theme);
    e_configure_registry_item_add("appearance/colors", 30, _("Colors"), NULL, "enlightenment/colors", e_int_config_color_classes);
    e_configure_registry_item_add("appearance/fonts", 40, _("Fonts"), NULL, "enlightenment/fonts", e_int_config_fonts);
@@ -486,7 +486,7 @@ e_configure_init(void)
     */
    e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
    e_configure_registry_item_add("internal/borders_border", -1, _("Border"), NULL, "enlightenment/windows", e_int_config_borders_border);
-   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
+//   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
    e_configure_registry_item_add("internal/desk", -1, _("Desk"), NULL, "enlightenment/windows", e_int_config_desk);
    e_configure_registry_item_add("internal/ibar_other", -1, _("IBar Other"), NULL, "enlightenment/windows", e_int_config_apps_ibar_other);
 }
diff --git a/src/bin/e_includes.h b/src/bin/e_includes.h
index dd9f0edd5..f05897f13 100644
--- a/src/bin/e_includes.h
+++ b/src/bin/e_includes.h
@@ -139,9 +139,6 @@
 #include "e_widget_framelist.h"
 #include "e_widget_fsel.h"
 #include "e_fm_mime.h"
-#include "e_int_config_wallpaper.h"
-#include "e_int_config_wallpaper_import.h"
-#include "e_int_config_wallpaper_gradient.h"
 #include "e_color.h"
 #include "e_spectrum.h"
 #include "e_widget_spectrum.h"
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index c9d12014c..2f8ae2240 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -9,4 +9,5 @@ temperature \
 cpufreq \
 ibox \
 start \
-layout
+layout \
+conf_wallpaper
diff --git a/src/modules/conf_wallpaper/.cvsignore b/src/modules/conf_wallpaper/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/conf_wallpaper/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop
diff --git a/src/modules/conf_wallpaper/Makefile.am b/src/modules/conf_wallpaper/Makefile.am
new file mode 100644
index 000000000..844e680fb
--- /dev/null
+++ b/src/modules/conf_wallpaper/Makefile.am
@@ -0,0 +1,35 @@
+MAINTAINERCLEANFILES = Makefile.in
+MODULE = conf_wallpaper
+
+# 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_wallpaper.c \
+			 e_int_config_wallpaper_gradient.c \
+			 e_int_config_wallpaper_gradient.h \
+			 e_int_config_wallpaper.h \
+			 e_int_config_wallpaper_import.c \
+			 e_int_config_wallpaper_import.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_wallpaper/e-module-conf_wallpaper.edj b/src/modules/conf_wallpaper/e-module-conf_wallpaper.edj
new file mode 100644
index 000000000..a59e24c61
Binary files /dev/null and b/src/modules/conf_wallpaper/e-module-conf_wallpaper.edj differ
diff --git a/src/bin/e_int_config_wallpaper.c b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
similarity index 99%
rename from src/bin/e_int_config_wallpaper.c
rename to src/modules/conf_wallpaper/e_int_config_wallpaper.c
index 1d5329a31..35c3a9f7c 100644
--- a/src/bin/e_int_config_wallpaper.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper.c
@@ -1,8 +1,8 @@
 /*
- * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
- */
-
+  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+  */
 #include "e.h"
+#include "e_mod_main.h"
 
 static void        *_create_data             (E_Config_Dialog *cfd);
 static void         _free_data               (E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
diff --git a/src/bin/e_int_config_wallpaper.h b/src/modules/conf_wallpaper/e_int_config_wallpaper.h
similarity index 100%
rename from src/bin/e_int_config_wallpaper.h
rename to src/modules/conf_wallpaper/e_int_config_wallpaper.h
diff --git a/src/bin/e_int_config_wallpaper_gradient.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
similarity index 99%
rename from src/bin/e_int_config_wallpaper_gradient.c
rename to src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
index 7378e5c39..5eb12027a 100644
--- a/src/bin/e_int_config_wallpaper_gradient.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.c
@@ -2,6 +2,7 @@
  * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
  */
 #include "e.h"
+#include "e_mod_main.h"
 
 #define GRAD_H 0
 #define GRAD_V 1
diff --git a/src/bin/e_int_config_wallpaper_gradient.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h
similarity index 100%
rename from src/bin/e_int_config_wallpaper_gradient.h
rename to src/modules/conf_wallpaper/e_int_config_wallpaper_gradient.h
diff --git a/src/bin/e_int_config_wallpaper_import.c b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
similarity index 99%
rename from src/bin/e_int_config_wallpaper_import.c
rename to src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
index 61301b436..c01359734 100644
--- a/src/bin/e_int_config_wallpaper_import.c
+++ b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.c
@@ -1,4 +1,8 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=>5n-3f0^-2{2
+ */
 #include "e.h"
+#include "e_mod_main.h"
 
 #define IMPORT_STRETCH 0
 #define IMPORT_TILE 1
diff --git a/src/bin/e_int_config_wallpaper_import.h b/src/modules/conf_wallpaper/e_int_config_wallpaper_import.h
similarity index 100%
rename from src/bin/e_int_config_wallpaper_import.h
rename to src/modules/conf_wallpaper/e_int_config_wallpaper_import.h
diff --git a/src/modules/conf_wallpaper/e_mod_main.c b/src/modules/conf_wallpaper/e_mod_main.c
new file mode 100644
index 000000000..52122dc27
--- /dev/null
+++ b/src/modules/conf_wallpaper/e_mod_main.c
@@ -0,0 +1,66 @@
+/*
+ * 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 - Layout"
+};
+
+EAPI void *
+e_modapi_init(E_Module *m)
+{
+   e_configure_registry_category_add("appearance", 10, _("Appearance"), NULL, "enlightenment/appearance");
+   e_configure_registry_item_add("appearance/wallpaper", 10, _("Wallpaper"), NULL, "enlightenment/background", e_int_config_wallpaper);
+   e_configure_registry_category_add("internal", -1, _("Internal"), NULL, "enlightenment/internal");
+   e_configure_registry_item_add("internal/wallpaper_desk", -1, _("Wallpaper"), NULL, "enlightenment/windows", e_int_config_wallpaper_desk);
+   conf_module = m;
+   return m;
+}
+
+EAPI int
+e_modapi_shutdown(E_Module *m)
+{
+   e_configure_registry_item_del("internal/wallpaper_desk");
+   e_configure_registry_category_del("internal");
+   e_configure_registry_item_del("appearance/wallpaper");
+   e_configure_registry_category_del("appearance");
+   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 - Wallpaper"),
+			_("Configuration dialog for wallpaper configuration."));
+   return 1;
+}
diff --git a/src/modules/conf_wallpaper/e_mod_main.h b/src/modules/conf_wallpaper/e_mod_main.h
new file mode 100644
index 000000000..9e4f910fe
--- /dev/null
+++ b/src/modules/conf_wallpaper/e_mod_main.h
@@ -0,0 +1,23 @@
+/*
+ * 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_wallpaper.h"
+#include "e_int_config_wallpaper_import.h"
+#include "e_int_config_wallpaper_gradient.h"
+#undef E_TYPEDEFS
+#include "e_int_config_wallpaper.h"
+#include "e_int_config_wallpaper_import.h"
+#include "e_int_config_wallpaper_gradient.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_wallpaper/module.desktop.in b/src/modules/conf_wallpaper/module.desktop.in
new file mode 100644
index 000000000..aaaddfe82
--- /dev/null
+++ b/src/modules/conf_wallpaper/module.desktop.in
@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Link
+Name=Configuration - Wallpaper
+Icon=e-module-conf_wallpaper
diff --git a/src/modules/layout/.cvsignore b/src/modules/layout/.cvsignore
new file mode 100644
index 000000000..06d064a84
--- /dev/null
+++ b/src/modules/layout/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+*.lo
+module.la
+module.desktop