diff --git a/package/rene/ecore/ecore.cache b/package/e17/ecore/ecore.cache
similarity index 100%
rename from package/rene/ecore/ecore.cache
rename to package/e17/ecore/ecore.cache
diff --git a/package/rene/ecore/ecore.conf b/package/e17/ecore/ecore.conf
similarity index 100%
rename from package/rene/ecore/ecore.conf
rename to package/e17/ecore/ecore.conf
diff --git a/package/rene/ecore/ecore.desc b/package/e17/ecore/ecore.desc
similarity index 100%
rename from package/rene/ecore/ecore.desc
rename to package/e17/ecore/ecore.desc
diff --git a/package/e17/ecore/gcc34.patch b/package/e17/ecore/gcc34.patch
new file mode 100644
index 000000000..6fef17f39
--- /dev/null
+++ b/package/e17/ecore/gcc34.patch
@@ -0,0 +1,20 @@
+--- ecore-2004-01-18/src/lib/ecore_config/edb.c.orig	2004-05-13 14:41:41.642699904 +0200
++++ ecore-2004-01-18/src/lib/ecore_config/edb.c	2004-05-13 14:41:55.229634376 +0200
+@@ -106,6 +106,7 @@
+         break;
+       case PT_NIL:
+         /* currently we do nothing for undefined ojects */
++	;
+     }
+ 
+     next=next->next;
+--- ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c.orig	2004-05-13 14:37:15.076224168 +0200
++++ ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c	2004-05-13 14:37:30.233919848 +0200
+@@ -1046,6 +1046,7 @@
+ 	     if (_ecore_fb_alt < 0) _ecore_fb_alt = 0;
+ 	  }
+ 	retry:
++		;
+      }
+    while (v > 0);
+    return 1;
diff --git a/package/rene/edb/con.patch-manual b/package/e17/edb/con.patch-manual
similarity index 100%
rename from package/rene/edb/con.patch-manual
rename to package/e17/edb/con.patch-manual
diff --git a/package/rene/edb/e17.conf b/package/e17/edb/e17.conf
similarity index 100%
rename from package/rene/edb/e17.conf
rename to package/e17/edb/e17.conf
diff --git a/package/rene/edb/edb.cache b/package/e17/edb/edb.cache
similarity index 100%
rename from package/rene/edb/edb.cache
rename to package/e17/edb/edb.cache
diff --git a/package/rene/edb/edb.conf b/package/e17/edb/edb.conf
similarity index 100%
rename from package/rene/edb/edb.conf
rename to package/e17/edb/edb.conf
diff --git a/package/rene/edb/edb.desc b/package/e17/edb/edb.desc
similarity index 100%
rename from package/rene/edb/edb.desc
rename to package/e17/edb/edb.desc
diff --git a/package/rene/edje/edje.cache b/package/e17/edje/edje.cache
similarity index 100%
rename from package/rene/edje/edje.cache
rename to package/e17/edje/edje.cache
diff --git a/package/rene/edje/edje.conf b/package/e17/edje/edje.conf
similarity index 100%
rename from package/rene/edje/edje.conf
rename to package/e17/edje/edje.conf
diff --git a/package/rene/edje/edje.desc b/package/e17/edje/edje.desc
similarity index 100%
rename from package/rene/edje/edje.desc
rename to package/e17/edje/edje.desc
diff --git a/package/rene/eet/eet.cache b/package/e17/eet/eet.cache
similarity index 100%
rename from package/rene/eet/eet.cache
rename to package/e17/eet/eet.cache
diff --git a/package/rene/eet/eet.conf b/package/e17/eet/eet.conf
similarity index 100%
rename from package/rene/eet/eet.conf
rename to package/e17/eet/eet.conf
diff --git a/package/rene/eet/eet.desc b/package/e17/eet/eet.desc
similarity index 100%
rename from package/rene/eet/eet.desc
rename to package/e17/eet/eet.desc
diff --git a/package/rene/efsd/efsd.cache b/package/e17/efsd/efsd.cache
similarity index 100%
rename from package/rene/efsd/efsd.cache
rename to package/e17/efsd/efsd.cache
diff --git a/package/rene/efsd/efsd.conf b/package/e17/efsd/efsd.conf
similarity index 100%
rename from package/rene/efsd/efsd.conf
rename to package/e17/efsd/efsd.conf
diff --git a/package/rene/efsd/efsd.desc b/package/e17/efsd/efsd.desc
similarity index 100%
rename from package/rene/efsd/efsd.desc
rename to package/e17/efsd/efsd.desc
diff --git a/package/rene/efsd/gcc34.patch b/package/e17/efsd/gcc34.patch
similarity index 100%
rename from package/rene/efsd/gcc34.patch
rename to package/e17/efsd/gcc34.patch
diff --git a/package/rene/elicit/elicit.cache b/package/e17/elicit/elicit.cache
similarity index 100%
rename from package/rene/elicit/elicit.cache
rename to package/e17/elicit/elicit.cache
diff --git a/package/rene/elicit/elicit.conf b/package/e17/elicit/elicit.conf
similarity index 100%
rename from package/rene/elicit/elicit.conf
rename to package/e17/elicit/elicit.conf
diff --git a/package/rene/elicit/elicit.desc b/package/e17/elicit/elicit.desc
similarity index 100%
rename from package/rene/elicit/elicit.desc
rename to package/e17/elicit/elicit.desc
diff --git a/package/rene/embryo/embryo.conf b/package/e17/embryo/embryo.conf
similarity index 100%
rename from package/rene/embryo/embryo.conf
rename to package/e17/embryo/embryo.conf
diff --git a/package/rene/embryo/embryo.desc b/package/e17/embryo/embryo.desc
similarity index 100%
rename from package/rene/embryo/embryo.desc
rename to package/e17/embryo/embryo.desc
diff --git a/package/rene/engage/engage.conf b/package/e17/engage/engage.conf
similarity index 100%
rename from package/rene/engage/engage.conf
rename to package/e17/engage/engage.conf
diff --git a/package/rene/engage/engage.desc b/package/e17/engage/engage.desc
similarity index 100%
rename from package/rene/engage/engage.desc
rename to package/e17/engage/engage.desc
diff --git a/package/rene/entrance/entrance.cache b/package/e17/entrance/entrance.cache
similarity index 100%
rename from package/rene/entrance/entrance.cache
rename to package/e17/entrance/entrance.cache
diff --git a/package/rene/entrance/entrance.conf b/package/e17/entrance/entrance.conf
similarity index 100%
rename from package/rene/entrance/entrance.conf
rename to package/e17/entrance/entrance.conf
diff --git a/package/rene/entrance/entrance.cron b/package/e17/entrance/entrance.cron
similarity index 100%
rename from package/rene/entrance/entrance.cron
rename to package/e17/entrance/entrance.cron
diff --git a/package/rene/entrance/entrance.desc b/package/e17/entrance/entrance.desc
similarity index 100%
rename from package/rene/entrance/entrance.desc
rename to package/e17/entrance/entrance.desc
diff --git a/package/rene/epeg/epeg.cache b/package/e17/epeg/epeg.cache
similarity index 100%
rename from package/rene/epeg/epeg.cache
rename to package/e17/epeg/epeg.cache
diff --git a/package/rene/epeg/epeg.conf b/package/e17/epeg/epeg.conf
similarity index 100%
rename from package/rene/epeg/epeg.conf
rename to package/e17/epeg/epeg.conf
diff --git a/package/rene/epeg/epeg.desc b/package/e17/epeg/epeg.desc
similarity index 100%
rename from package/rene/epeg/epeg.desc
rename to package/e17/epeg/epeg.desc
diff --git a/package/rene/epsilon/epsilon.cache b/package/e17/epsilon/epsilon.cache
similarity index 100%
rename from package/rene/epsilon/epsilon.cache
rename to package/e17/epsilon/epsilon.cache
diff --git a/package/rene/epsilon/epsilon.conf b/package/e17/epsilon/epsilon.conf
similarity index 100%
rename from package/rene/epsilon/epsilon.conf
rename to package/e17/epsilon/epsilon.conf
diff --git a/package/rene/epsilon/epsilon.desc b/package/e17/epsilon/epsilon.desc
similarity index 100%
rename from package/rene/epsilon/epsilon.desc
rename to package/e17/epsilon/epsilon.desc
diff --git a/package/rene/epsilon/png-compile-fix.patch b/package/e17/epsilon/png-compile-fix.patch
similarity index 100%
rename from package/rene/epsilon/png-compile-fix.patch
rename to package/e17/epsilon/png-compile-fix.patch
diff --git a/package/rene/esmart/esmart.cache b/package/e17/esmart/esmart.cache
similarity index 100%
rename from package/rene/esmart/esmart.cache
rename to package/e17/esmart/esmart.cache
diff --git a/package/rene/esmart/esmart.conf b/package/e17/esmart/esmart.conf
similarity index 100%
rename from package/rene/esmart/esmart.conf
rename to package/e17/esmart/esmart.conf
diff --git a/package/rene/esmart/esmart.desc b/package/e17/esmart/esmart.desc
similarity index 100%
rename from package/rene/esmart/esmart.desc
rename to package/e17/esmart/esmart.desc
diff --git a/package/e17/esmart/usr-local.patch b/package/e17/esmart/usr-local.patch
new file mode 100644
index 000000000..84f8f6ab3
--- /dev/null
+++ b/package/e17/esmart/usr-local.patch
@@ -0,0 +1,32 @@
+diff -ru esmart-2004-02-02~/configure.in esmart-2004-02-02/configure.in
+--- esmart-2004-02-02~/configure.in	2004-01-17 08:16:46.000000000 +0100
++++ esmart-2004-02-02/configure.in	2004-02-08 17:12:24.000000000 +0100
+@@ -35,7 +35,7 @@
+   container_plugin_dir=${libdir}/${PACKAGE}/layout
+ fi
+ #FIXME: remove this and get it working correctly
+-container_plugin_dir="/usr/local/lib/esmart/layout"
++container_plugin_dir="${libdir}/esmart/layout"
+ AC_DEFINE_UNQUOTED(CONTAINER_PLUGIN_DIR, "${container_plugin_dir}", [Container Plugin Directory])
+ AC_SUBST(container_plugin_dir)
+ 
+diff -ru esmart-2004-02-02~/src/container/layout/default/Makefile.am esmart-2004-02-02/src/container/layout/default/Makefile.am
+--- esmart-2004-02-02~/src/container/layout/default/Makefile.am	2004-01-13 20:26:41.000000000 +0100
++++ esmart-2004-02-02/src/container/layout/default/Makefile.am	2004-02-08 17:04:54.000000000 +0100
+@@ -1,5 +1,5 @@
+ plugin_LTLIBRARIES = default.la
+-plugindir = /usr/local/lib/esmart/layout
++plugindir = $(libdir)/esmart/layout
+ 
+ default_la_SOURCES = default.c
+ default_la_LDFLAGS = -module  -avoid-version
+diff -ru esmart-2004-02-02~/src/container/layout/entice/Makefile.am esmart-2004-02-02/src/container/layout/entice/Makefile.am
+--- esmart-2004-02-02~/src/container/layout/entice/Makefile.am	2004-01-13 02:25:09.000000000 +0100
++++ esmart-2004-02-02/src/container/layout/entice/Makefile.am	2004-02-08 17:04:54.000000000 +0100
+@@ -1,5 +1,5 @@
+ plugin_LTLIBRARIES = entice.la
+-plugindir = /usr/local/lib/esmart/layout
++plugindir = $(libdir)/esmart/layout
+ 
+ entice_la_SOURCES = entice.c
+ entice_la_LDFLAGS = -module  -avoid-version
diff --git a/package/rene/estyle/estyle.cache b/package/e17/estyle/estyle.cache
similarity index 100%
rename from package/rene/estyle/estyle.cache
rename to package/e17/estyle/estyle.cache
diff --git a/package/rene/estyle/estyle.conf b/package/e17/estyle/estyle.conf
similarity index 100%
rename from package/rene/estyle/estyle.conf
rename to package/e17/estyle/estyle.conf
diff --git a/package/rene/estyle/estyle.desc b/package/e17/estyle/estyle.desc
similarity index 100%
rename from package/rene/estyle/estyle.desc
rename to package/e17/estyle/estyle.desc
diff --git a/package/rene/etox/etox.cache b/package/e17/etox/etox.cache
similarity index 100%
rename from package/rene/etox/etox.cache
rename to package/e17/etox/etox.cache
diff --git a/package/rene/etox/etox.conf b/package/e17/etox/etox.conf
similarity index 100%
rename from package/rene/etox/etox.conf
rename to package/e17/etox/etox.conf
diff --git a/package/rene/etox/etox.desc b/package/e17/etox/etox.desc
similarity index 100%
rename from package/rene/etox/etox.desc
rename to package/e17/etox/etox.desc
diff --git a/package/rene/evas/disable-GL_NV_texture-use.patch b/package/e17/evas/disable-GL_NV_texture-use.patch
similarity index 100%
rename from package/rene/evas/disable-GL_NV_texture-use.patch
rename to package/e17/evas/disable-GL_NV_texture-use.patch
diff --git a/package/rene/evas/evas.cache b/package/e17/evas/evas.cache
similarity index 100%
rename from package/rene/evas/evas.cache
rename to package/e17/evas/evas.cache
diff --git a/package/rene/evas/evas.conf b/package/e17/evas/evas.conf
similarity index 100%
rename from package/rene/evas/evas.conf
rename to package/e17/evas/evas.conf
diff --git a/package/rene/evas/evas.desc b/package/e17/evas/evas.desc
similarity index 100%
rename from package/rene/evas/evas.desc
rename to package/e17/evas/evas.desc
diff --git a/package/rene/evas/gl_common-fix.patch b/package/e17/evas/gl_common-fix.patch
similarity index 100%
rename from package/rene/evas/gl_common-fix.patch
rename to package/e17/evas/gl_common-fix.patch
diff --git a/package/rene/evidence/evidence.cache b/package/e17/evidence/evidence.cache
similarity index 100%
rename from package/rene/evidence/evidence.cache
rename to package/e17/evidence/evidence.cache
diff --git a/package/rene/evidence/evidence.desc b/package/e17/evidence/evidence.desc
similarity index 100%
rename from package/rene/evidence/evidence.desc
rename to package/e17/evidence/evidence.desc
diff --git a/package/rene/ewd/ewd.cache b/package/e17/ewd/ewd.cache
similarity index 100%
rename from package/rene/ewd/ewd.cache
rename to package/e17/ewd/ewd.cache
diff --git a/package/rene/ewd/ewd.conf b/package/e17/ewd/ewd.conf
similarity index 100%
rename from package/rene/ewd/ewd.conf
rename to package/e17/ewd/ewd.conf
diff --git a/package/rene/ewd/ewd.desc b/package/e17/ewd/ewd.desc
similarity index 100%
rename from package/rene/ewd/ewd.desc
rename to package/e17/ewd/ewd.desc
diff --git a/package/rene/ewl/ewl.cache b/package/e17/ewl/ewl.cache
similarity index 100%
rename from package/rene/ewl/ewl.cache
rename to package/e17/ewl/ewl.cache
diff --git a/package/rene/ewl/ewl.conf b/package/e17/ewl/ewl.conf
similarity index 100%
rename from package/rene/ewl/ewl.conf
rename to package/e17/ewl/ewl.conf
diff --git a/package/rene/ewl/ewl.desc b/package/e17/ewl/ewl.desc
similarity index 100%
rename from package/rene/ewl/ewl.desc
rename to package/e17/ewl/ewl.desc
diff --git a/package/rene/examine/examine.conf b/package/e17/examine/examine.conf
similarity index 100%
rename from package/rene/examine/examine.conf
rename to package/e17/examine/examine.conf
diff --git a/package/rene/examine/examine.desc b/package/e17/examine/examine.desc
similarity index 100%
rename from package/rene/examine/examine.desc
rename to package/e17/examine/examine.desc
diff --git a/package/rene/examine/gcc34.patch b/package/e17/examine/gcc34.patch
similarity index 100%
rename from package/rene/examine/gcc34.patch
rename to package/e17/examine/gcc34.patch
diff --git a/package/rene/imlib2/config.hlp b/package/e17/imlib2/config.hlp
similarity index 100%
rename from package/rene/imlib2/config.hlp
rename to package/e17/imlib2/config.hlp
diff --git a/package/rene/imlib2/config.in b/package/e17/imlib2/config.in
similarity index 100%
rename from package/rene/imlib2/config.in
rename to package/e17/imlib2/config.in
diff --git a/package/rene/imlib2/e17.conf b/package/e17/imlib2/e17.conf
similarity index 100%
rename from package/rene/imlib2/e17.conf
rename to package/e17/imlib2/e17.conf
diff --git a/package/e17/imlib2/gcc34.patch b/package/e17/imlib2/gcc34.patch
new file mode 100644
index 000000000..db51ed14b
--- /dev/null
+++ b/package/e17/imlib2/gcc34.patch
@@ -0,0 +1,23 @@
+
+The usual gcc-3.4 fixes ...
+
+  - Rene Rebe <rene@rocklinux.org>
+
+--- imlib2-2004-01-18-orig/src/rgbadraw.c	2003-07-13 03:09:17.000000000 +0200
++++ imlib2-2004-01-18/src/rgbadraw.c	2004-05-05 18:31:54.920199456 +0200
+@@ -2358,6 +2358,7 @@
+                        if (ps)
+                           ps->next = s;
+                      nospans:
++                       ;
+                     }
+                }
+              if (i == y2)
+@@ -2365,6 +2366,7 @@
+              i += step;
+           }
+       nolines:
++        ;
+      }
+    for (i = 0; i < h; i++)
+      {
diff --git a/package/rene/imlib2/imlib2.cache b/package/e17/imlib2/imlib2.cache
similarity index 100%
rename from package/rene/imlib2/imlib2.cache
rename to package/e17/imlib2/imlib2.cache
diff --git a/package/rene/imlib2/imlib2.conf b/package/e17/imlib2/imlib2.conf
similarity index 100%
rename from package/rene/imlib2/imlib2.conf
rename to package/e17/imlib2/imlib2.conf
diff --git a/package/rene/imlib2/imlib2.desc b/package/e17/imlib2/imlib2.desc
similarity index 100%
rename from package/rene/imlib2/imlib2.desc
rename to package/e17/imlib2/imlib2.desc
diff --git a/package/rene/imlib2/makefile.am.patch b/package/e17/imlib2/makefile.am.patch
similarity index 100%
rename from package/rene/imlib2/makefile.am.patch
rename to package/e17/imlib2/makefile.am.patch
diff --git a/package/rene/imlib2_loaders/imlib2_loaders.cache b/package/e17/imlib2_loaders/imlib2_loaders.cache
similarity index 100%
rename from package/rene/imlib2_loaders/imlib2_loaders.cache
rename to package/e17/imlib2_loaders/imlib2_loaders.cache
diff --git a/package/rene/imlib2_loaders/imlib2_loaders.conf b/package/e17/imlib2_loaders/imlib2_loaders.conf
similarity index 100%
rename from package/rene/imlib2_loaders/imlib2_loaders.conf
rename to package/e17/imlib2_loaders/imlib2_loaders.conf
diff --git a/package/rene/imlib2_loaders/imlib2_loaders.desc b/package/e17/imlib2_loaders/imlib2_loaders.desc
similarity index 100%
rename from package/rene/imlib2_loaders/imlib2_loaders.desc
rename to package/e17/imlib2_loaders/imlib2_loaders.desc