diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index b5932c6..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,28 +0,0 @@
-ABOUT-NLS
-.deps
-.libs
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.rpath
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-m4
-missing
-mkinstalldirs
-ltmain.sh
-stamp-h1
-*.lo
-*.la
-*.spec
-*.tar.gz
-module.desktop
diff --git a/Makefile.am b/Makefile.am
index d2a4b22..e04e069 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,29 +1,26 @@
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = po themes
+MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
+		       config.sub configure depcomp install-sh ltmain.sh \
+		       missing module.desktop config.rpath mkinstalldirs
 
-MAINTAINERCLEANFILES = Makefile.in aclocal.m4 ABOUT-NLS config.h.in \
-   config.guess config.rpath config.sub configure depcomp ltmain.sh \
-   install-sh missing mkinstalldirs m4
+SUBDIRS = src po themes
+
+EDJE_FLAGS = -v \
+	     -id $(top_srcdir)/images
 
-# data files for the module
 filesdir = $(datadir)
-files_DATA = \
-module.desktop \
-e-module-penguins.edj
+files_DATA = module.desktop e-module-penguins.edj
 
-EXTRA_DIST = $(files_DATA) e_modules-penguins.spec
+EXTRA_DIST = module.desktop.in \
+	     e_modules-penguins.spec.in \
+	     e-module-penguins.edc \
+	     $(wildcard images/*.png)
 
-# the module .so file
-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 \
-		         e_mod_config.c \
-		         e_mod_config.h
-module_la_LIBADD       = @E_LIBS@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
+%.edj:  %.edc
+	$(EDJE_CC) $(EDJE_FLAGS) $< $@
+
+clean-local:
+	 rm -rf e-module-penguins.edj module.desktop e_modules-penguins.spec *~
+
+uninstall:
+	 rm -rf $(DESTDIR)$(datadir)
diff --git a/configure.ac b/configure.ac
index b502250..57f2976 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,7 +54,9 @@ AC_ARG_ENABLE(homedir-install,
 
 AC_OUTPUT([
 Makefile
+src/Makefile
 e_modules-penguins.spec
+module.desktop
 po/Makefile.in
 themes/Makefile
 themes/default/Makefile
diff --git a/e-module-penguins.edc b/e-module-penguins.edc
new file mode 100644
index 0000000..7d3bc3c
--- /dev/null
+++ b/e-module-penguins.edc
@@ -0,0 +1,57 @@
+images {
+	image: "walker0.png" COMP;
+	image: "walker1.png" COMP;
+	image: "walker2.png" COMP;
+	image: "walker3.png" COMP;
+	image: "walker4.png" COMP;
+	image: "walker5.png" COMP;
+	image: "walker6.png" COMP;
+	image: "walker7.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: "walker0.png";
+						tween: "walker1.png";
+						tween: "walker2.png";
+						tween: "walker3.png";
+						tween: "walker4.png";
+						tween: "walker5.png";
+						tween: "walker6.png";
+						tween: "walker7.png";
+					}
+				}
+			}
+		}
+		programs {
+			program {
+				name: "animate";
+				signal: "show";
+				source: "";
+				action: STATE_SET "default" 0.0;
+				transition: LINEAR 0.8;
+				target: "image";
+				after: "animate";
+			}
+		}
+	}
+}
diff --git a/e-module-penguins.edj b/e-module-penguins.edj
deleted file mode 100644
index 0831c35..0000000
Binary files a/e-module-penguins.edj and /dev/null differ
diff --git a/images/walker0.png b/images/walker0.png
new file mode 100644
index 0000000..e732d00
Binary files /dev/null and b/images/walker0.png differ
diff --git a/images/walker1.png b/images/walker1.png
new file mode 100644
index 0000000..411ebc4
Binary files /dev/null and b/images/walker1.png differ
diff --git a/images/walker2.png b/images/walker2.png
new file mode 100644
index 0000000..a0df58c
Binary files /dev/null and b/images/walker2.png differ
diff --git a/images/walker3.png b/images/walker3.png
new file mode 100644
index 0000000..58882eb
Binary files /dev/null and b/images/walker3.png differ
diff --git a/images/walker4.png b/images/walker4.png
new file mode 100644
index 0000000..f16a68a
Binary files /dev/null and b/images/walker4.png differ
diff --git a/images/walker5.png b/images/walker5.png
new file mode 100644
index 0000000..698e479
Binary files /dev/null and b/images/walker5.png differ
diff --git a/images/walker6.png b/images/walker6.png
new file mode 100644
index 0000000..370aa84
Binary files /dev/null and b/images/walker6.png differ
diff --git a/images/walker7.png b/images/walker7.png
new file mode 100644
index 0000000..98dab5a
Binary files /dev/null and b/images/walker7.png 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 5552956..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
-POTFILES
-penguins.pot
-quot.sed
-remove-potcdate.sin
-remove-potcdate.sed
-stamp-po
-*.gmo
-*.mo
diff --git a/src/Makefile.am b/src/Makefile.am
new file mode 100644
index 0000000..1201c67
--- /dev/null
+++ b/src/Makefile.am
@@ -0,0 +1,20 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+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 \
+		    e_mod_config.c \
+		    e_mod_config.h
+
+module_la_LIBADD       = @E_LIBS@
+module_la_LDFLAGS      = -module -avoid-version
+module_la_DEPENDENCIES = $(top_builddir)/config.h
+
+clean-local:
+	rm -rf *~
diff --git a/e_mod_config.c b/src/e_mod_config.c
similarity index 100%
rename from e_mod_config.c
rename to src/e_mod_config.c
diff --git a/e_mod_config.h b/src/e_mod_config.h
similarity index 100%
rename from e_mod_config.h
rename to src/e_mod_config.h
diff --git a/e_mod_main.c b/src/e_mod_main.c
similarity index 100%
rename from e_mod_main.c
rename to src/e_mod_main.c
diff --git a/e_mod_main.h b/src/e_mod_main.h
similarity index 100%
rename from e_mod_main.h
rename to src/e_mod_main.h
diff --git a/themes/.cvsignore b/themes/.cvsignore
deleted file mode 100644
index 3dda729..0000000
--- a/themes/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile.in
-Makefile
diff --git a/themes/default/.cvsignore b/themes/default/.cvsignore
deleted file mode 100644
index 827a55b..0000000
--- a/themes/default/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-*.edj
diff --git a/themes/lemmings/.cvsignore b/themes/lemmings/.cvsignore
deleted file mode 100644
index 827a55b..0000000
--- a/themes/lemmings/.cvsignore
+++ /dev/null
@@ -1,3 +0,0 @@
-Makefile.in
-Makefile
-*.edj