diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 432cac3..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,23 +0,0 @@
-ABOUT-NLS
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-e_modules-photo.spec
-install-sh
-libtool
-ltmain.sh
-m4
-missing
-mkinstalldirs
-stamp-h1
-*.tar.gz
diff --git a/Makefile.am b/Makefile.am
index cc09dbc..b786b2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,25 @@
 ACLOCAL_AMFLAGS = -I m4
-MAINTAINERCLEANFILES = Makefile.in
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
+		       config.sub configure depcomp install-sh ltmain.sh \
+		       missing module.desktop config.rpath mkinstalldirs
 
 SUBDIRS = src data po
 
+EDJE_FLAGS = -v \
+	     -id $(top_srcdir)/data/images
+
 filesdir = $(datadir)
 files_DATA = e-module-photo.edj module.desktop
-EXTRA_DIST= $(files_DATA)
 
-pkgdir = $(datadir)/$(MODULE_ARCH)
\ No newline at end of file
+EXTRA_DIST = module.desktop.in \
+	     e_modules-photo.spec.in \
+	     e-module-photo.edc \
+
+%.edj:  %.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $< $@
+
+clean-local:
+	 rm -rf e-module-photo.edj module.desktop e_modules-photo.spec *~
+
+uninstall:
+	 rm -rf $(DESTDIR)$(datadir)
diff --git a/configure.ac b/configure.ac
index 1c4539a..dd3062d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
+# get rid of that stupid cache mechanism
+rm -f config.cache
+
 AC_INIT(photo, 0.1.0, ooookiwi@gmail.com)
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(configure.ac)
@@ -57,8 +60,8 @@ data/Makefile
 data/images/Makefile
 data/theme/Makefile
 src/Makefile
-src/module/Makefile
 po/Makefile.in
+module.desktop
 ], [
 ])
 
diff --git a/data/.cvsignore b/data/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/data/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/images/.cvsignore b/data/images/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/data/images/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/data/theme/.cvsignore b/data/theme/.cvsignore
deleted file mode 100644
index d66d798..0000000
--- a/data/theme/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile
-Makefile.in
-photo.edj
diff --git a/e-module-photo.edc b/e-module-photo.edc
new file mode 100644
index 0000000..4447a58
--- /dev/null
+++ b/e-module-photo.edc
@@ -0,0 +1,32 @@
+images {
+	image: "photo_logo.png" COMP;
+}
+collections {
+	group {
+		name: "icon";
+		max: 48 48;
+		parts {
+			part {
+				name: "image";
+				type: IMAGE;
+				mouse_events: 0;
+				description {
+					state: "default" 0.00;
+					visible: 1;
+					aspect: 1.00 1.00;
+					rel1 {
+						relative: 0.00 0.00;
+						offset: 0 0;
+					}
+					rel2 {
+						relative: 1.00 1.00;
+						offset: -1 -1;
+					}
+					image {
+						normal: "photo_logo.png";
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/e-module-photo.edj b/e-module-photo.edj
deleted file mode 100644
index c01de71..0000000
Binary files a/e-module-photo.edj and /dev/null differ
diff --git a/module.desktop b/module.desktop.in
similarity index 100%
rename from module.desktop
rename to module.desktop.in
diff --git a/po/.cvsignore b/po/.cvsignore
deleted file mode 100644
index fbac0a9..0000000
--- a/po/.cvsignore
+++ /dev/null
@@ -1,17 +0,0 @@
-Makefile
-Makefile.in
-Makefile.in.in
-Makevars.template
-Rules-quot
-boldquot.sed
-en@boldquot.header
-en@quot.header
-insert-header.sin
-quot.sed
-remove-potcdate.sin
-POTFILES
-remove-potcdate.sed
-stamp-po
-*.pot
-*.mo
-*.gmo
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/Makefile.am b/src/Makefile.am
index cd87e9a..391576c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,2 +1,18 @@
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = module
+
+INCLUDES = -I. \
+	   -I$(top_srcdir) \
+           -I$(includedir) \
+	   @E_CFLAGS@
+
+pkgdir = $(datadir)/$(MODULE_ARCH)
+pkg_LTLIBRARIES = module.la
+module_la_SOURCES = $(wildcard *.c) \
+		    $(wildcard *.h)
+
+module_la_LIBADD = @E_LIBS@
+module_la_LDFLAGS = -module -avoid-version -s
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+clean-local:
+	rm -rf *~
diff --git a/src/module/Photo.h b/src/Photo.h
similarity index 100%
rename from src/module/Photo.h
rename to src/Photo.h
diff --git a/src/module/Photo_includes.h b/src/Photo_includes.h
similarity index 100%
rename from src/module/Photo_includes.h
rename to src/Photo_includes.h
diff --git a/src/module/e_mod_main.c b/src/e_mod_main.c
similarity index 100%
rename from src/module/e_mod_main.c
rename to src/e_mod_main.c
diff --git a/src/module/e_mod_main.h b/src/e_mod_main.h
similarity index 100%
rename from src/module/e_mod_main.h
rename to src/e_mod_main.h
diff --git a/src/module/.cvsignore b/src/module/.cvsignore
deleted file mode 100644
index 09980ae..0000000
--- a/src/module/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.lo
-*.la
diff --git a/src/module/Makefile.am b/src/module/Makefile.am
deleted file mode 100644
index bfeb1a5..0000000
--- a/src/module/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-INCLUDES              = -I. \
-			-I$(top_srcdir) \
-                        -I$(includedir) \
-			@E_CFLAGS@
-pkgdir                 = $(datadir)/$(MODULE_ARCH)
-
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h \
-			 photo_item.c \
-			 photo_item.h \
-			 photo_config.c \
-                         photo_config.h \
-			 photo_config_dialog.c \
-                         photo_config_dialog.h \
-			 photo_config_dialog_dir.c \
-                         photo_config_dialog_dir.h \
-			 photo_config_dialog_item.c \
-                         photo_config_dialog_item.h \
-			 photo_menu.c \
-                         photo_menu.h \
-			 photo_picture.c \
-                         photo_picture.h \
-			 photo_picture_histo.c \
-                         photo_picture_histo.h \
-			 photo_picture_local.c \
-                         photo_picture_local.h \
-			 photo_picture_net.c \
-                         photo_picture_net.h \
-			 photo_popup_warn.c \
-                         photo_popup_warn.h \
-			 photo_popup_info.c \
-                         photo_popup_info.h \
-			 photo_utils.c \
-                         photo_utils.h \
-                         Photo.h \
-                         Photo_includes.h
-module_la_LIBADD       = @E_LIBS@
-module_la_LDFLAGS      = -module -avoid-version -s
-module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/src/module/photo_config.c b/src/photo_config.c
similarity index 100%
rename from src/module/photo_config.c
rename to src/photo_config.c
diff --git a/src/module/photo_config.h b/src/photo_config.h
similarity index 100%
rename from src/module/photo_config.h
rename to src/photo_config.h
diff --git a/src/module/photo_config_dialog.c b/src/photo_config_dialog.c
similarity index 100%
rename from src/module/photo_config_dialog.c
rename to src/photo_config_dialog.c
diff --git a/src/module/photo_config_dialog.h b/src/photo_config_dialog.h
similarity index 100%
rename from src/module/photo_config_dialog.h
rename to src/photo_config_dialog.h
diff --git a/src/module/photo_config_dialog_dir.c b/src/photo_config_dialog_dir.c
similarity index 100%
rename from src/module/photo_config_dialog_dir.c
rename to src/photo_config_dialog_dir.c
diff --git a/src/module/photo_config_dialog_dir.h b/src/photo_config_dialog_dir.h
similarity index 100%
rename from src/module/photo_config_dialog_dir.h
rename to src/photo_config_dialog_dir.h
diff --git a/src/module/photo_config_dialog_item.c b/src/photo_config_dialog_item.c
similarity index 100%
rename from src/module/photo_config_dialog_item.c
rename to src/photo_config_dialog_item.c
diff --git a/src/module/photo_config_dialog_item.h b/src/photo_config_dialog_item.h
similarity index 100%
rename from src/module/photo_config_dialog_item.h
rename to src/photo_config_dialog_item.h
diff --git a/src/module/photo_item.c b/src/photo_item.c
similarity index 100%
rename from src/module/photo_item.c
rename to src/photo_item.c
diff --git a/src/module/photo_item.h b/src/photo_item.h
similarity index 100%
rename from src/module/photo_item.h
rename to src/photo_item.h
diff --git a/src/module/photo_menu.c b/src/photo_menu.c
similarity index 100%
rename from src/module/photo_menu.c
rename to src/photo_menu.c
diff --git a/src/module/photo_menu.h b/src/photo_menu.h
similarity index 100%
rename from src/module/photo_menu.h
rename to src/photo_menu.h
diff --git a/src/module/photo_picture.c b/src/photo_picture.c
similarity index 100%
rename from src/module/photo_picture.c
rename to src/photo_picture.c
diff --git a/src/module/photo_picture.h b/src/photo_picture.h
similarity index 100%
rename from src/module/photo_picture.h
rename to src/photo_picture.h
diff --git a/src/module/photo_picture_histo.c b/src/photo_picture_histo.c
similarity index 100%
rename from src/module/photo_picture_histo.c
rename to src/photo_picture_histo.c
diff --git a/src/module/photo_picture_histo.h b/src/photo_picture_histo.h
similarity index 100%
rename from src/module/photo_picture_histo.h
rename to src/photo_picture_histo.h
diff --git a/src/module/photo_picture_local.c b/src/photo_picture_local.c
similarity index 100%
rename from src/module/photo_picture_local.c
rename to src/photo_picture_local.c
diff --git a/src/module/photo_picture_local.h b/src/photo_picture_local.h
similarity index 100%
rename from src/module/photo_picture_local.h
rename to src/photo_picture_local.h
diff --git a/src/module/photo_picture_net.c b/src/photo_picture_net.c
similarity index 100%
rename from src/module/photo_picture_net.c
rename to src/photo_picture_net.c
diff --git a/src/module/photo_picture_net.h b/src/photo_picture_net.h
similarity index 100%
rename from src/module/photo_picture_net.h
rename to src/photo_picture_net.h
diff --git a/src/module/photo_popup_info.c b/src/photo_popup_info.c
similarity index 100%
rename from src/module/photo_popup_info.c
rename to src/photo_popup_info.c
diff --git a/src/module/photo_popup_info.h b/src/photo_popup_info.h
similarity index 100%
rename from src/module/photo_popup_info.h
rename to src/photo_popup_info.h
diff --git a/src/module/photo_popup_warn.c b/src/photo_popup_warn.c
similarity index 100%
rename from src/module/photo_popup_warn.c
rename to src/photo_popup_warn.c
diff --git a/src/module/photo_popup_warn.h b/src/photo_popup_warn.h
similarity index 100%
rename from src/module/photo_popup_warn.h
rename to src/photo_popup_warn.h
diff --git a/src/module/photo_utils.c b/src/photo_utils.c
similarity index 100%
rename from src/module/photo_utils.c
rename to src/photo_utils.c
diff --git a/src/module/photo_utils.h b/src/photo_utils.h
similarity index 100%
rename from src/module/photo_utils.h
rename to src/photo_utils.h