Index: gnome/gnome.ent
===================================================================
--- gnome/gnome.ent	(revision 579b09a0e9905c5b24179ba104d48ce31974cbaa)
+++ gnome/gnome.ent	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
@@ -40,5 +40,5 @@
 <!ENTITY % vte SYSTEM "lib/vte/vte.ent">
 <!ENTITY % gnome-themes SYSTEM "lib/themes/gnome-themes.ent">
-<!ENTITY % gtk-thinice-engine SYSTEM "lib/themes/gtk-thinice-engine.ent">
+<!ENTITY % gtk-thinice-engine SYSTEM "lib/gtk-thinice-engine/gtk-thinice-engine.ent">
 <!ENTITY % gal2 SYSTEM "lib/gal/gal2.ent">
 <!ENTITY % gtkhtml2 SYSTEM "lib/gtkhtml/gtkhtml2.ent">
Index: gnome/lib/gtk-thinice-engine/gtk-thinice-engine-desc.xml
===================================================================
--- gnome/lib/gtk-thinice-engine/gtk-thinice-engine-desc.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
+++ gnome/lib/gtk-thinice-engine/gtk-thinice-engine-desc.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
@@ -0,0 +1,7 @@
+<sect2>
+<title>Contents</title>
+
+<para>The <application><acronym>GTK</acronym> ThinIce Engine</application> package contains themes.</para>
+
+</sect2>
+
Index: gnome/lib/gtk-thinice-engine/gtk-thinice-engine-inst.xml
===================================================================
--- gnome/lib/gtk-thinice-engine/gtk-thinice-engine-inst.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
+++ gnome/lib/gtk-thinice-engine/gtk-thinice-engine-inst.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
@@ -0,0 +1,12 @@
+<sect2>
+<title>Installation of <application><acronym>GTK</acronym> ThinIce
+Engine</application></title>
+
+<para>Install <application><acronym>GTK</acronym> ThinIce Engine</application> by running the following commands:</para>
+
+<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
+make &amp;&amp;
+make install</command></userinput></screen>
+
+</sect2>
+
Index: gnome/lib/gtk-thinice-engine/gtk-thinice-engine-intro.xml
===================================================================
--- gnome/lib/gtk-thinice-engine/gtk-thinice-engine-intro.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
+++ gnome/lib/gtk-thinice-engine/gtk-thinice-engine-intro.xml	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
@@ -0,0 +1,26 @@
+<sect2>
+<title>Introduction to <application><acronym>GTK</acronym> ThinIce
+Engine</application></title>
+
+<para>The <application><acronym>GTK</acronym> ThinIce
+Engine</application> package contains theme sets.</para>
+
+<sect3><title>Package information</title>
+<itemizedlist spacing='compact'>
+<listitem><para>Download (HTTP): <ulink
+url="&gtk-thinice-engine-download-http;"/></para></listitem>
+<listitem><para>Download (FTP): <ulink
+url="&gtk-thinice-engine-download-ftp;"/></para></listitem>
+<listitem><para>Download size: &gtk-thinice-engine-size;</para></listitem>
+<listitem><para>Estimated Disk space required:
+&gtk-thinice-engine-buildsize;</para></listitem>
+<listitem><para>Estimated build time:
+&gtk-thinice-engine-time;</para></listitem></itemizedlist>
+</sect3>
+
+<sect3><title><application><acronym>GTK</acronym> ThinIce Engine</application> dependencies</title>
+<sect4><title>Required</title>
+<para><xref linkend="GTK2"/></para></sect4>
+</sect3>
+
+</sect2>
Index: gnome/lib/gtk-thinice-engine/gtk-thinice-engine.ent
===================================================================
--- gnome/lib/gtk-thinice-engine/gtk-thinice-engine.ent	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
+++ gnome/lib/gtk-thinice-engine/gtk-thinice-engine.ent	(revision efaa23695173a6480cce947a9dd3f6962e77b4ba)
@@ -0,0 +1,10 @@
+<!ENTITY gtk-thinice-engine SYSTEM "../gtk-thinice-engine.xml">
+<!ENTITY gtk-thinice-engine-intro SYSTEM "gtk-thinice-engine-intro.xml">
+<!ENTITY gtk-thinice-engine-inst SYSTEM "gtk-thinice-engine-inst.xml">
+<!ENTITY gtk-thinice-engine-desc SYSTEM "gtk-thinice-engine-desc.xml">
+<!ENTITY gtk-thinice-engine-version "2.0.2">
+<!ENTITY gtk-thinice-engine-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtk-thinice-engine/2.0/gtk-thinice-engine-&gtk-thinice-engine-version;.tar.bz2">
+<!ENTITY gtk-thinice-engine-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtk-thinice-engine/2.0/gtk-thinice-engine-&gtk-thinice-engine-version;.tar.bz2">
+<!ENTITY gtk-thinice-engine-size "136 KB">
+<!ENTITY gtk-thinice-engine-buildsize "1.6 MB">
+<!ENTITY gtk-thinice-engine-time "0.00 SBU">
Index: ome/lib/themes/gtk-thinice-engine-desc.xml
===================================================================
--- gnome/lib/themes/gtk-thinice-engine-desc.xml	(revision 579b09a0e9905c5b24179ba104d48ce31974cbaa)
+++ 	(revision )
@@ -1,7 +1,0 @@
-<sect2>
-<title>Contents</title>
-
-<para>The <application><acronym>GTK</acronym> ThinIce Engine</application> package contains themes.</para>
-
-</sect2>
-
Index: ome/lib/themes/gtk-thinice-engine-inst.xml
===================================================================
--- gnome/lib/themes/gtk-thinice-engine-inst.xml	(revision 579b09a0e9905c5b24179ba104d48ce31974cbaa)
+++ 	(revision )
@@ -1,12 +1,0 @@
-<sect2>
-<title>Installation of <application><acronym>GTK</acronym> ThinIce
-Engine</application></title>
-
-<para>Install <application><acronym>GTK</acronym> ThinIce Engine</application> by running the following commands:</para>
-
-<screen><userinput><command>./configure --prefix=/usr &amp;&amp;
-make &amp;&amp;
-make install</command></userinput></screen>
-
-</sect2>
-
Index: ome/lib/themes/gtk-thinice-engine-intro.xml
===================================================================
--- gnome/lib/themes/gtk-thinice-engine-intro.xml	(revision 579b09a0e9905c5b24179ba104d48ce31974cbaa)
+++ 	(revision )
@@ -1,26 +1,0 @@
-<sect2>
-<title>Introduction to <application><acronym>GTK</acronym> ThinIce
-Engine</application></title>
-
-<para>The <application><acronym>GTK</acronym> ThinIce
-Engine</application> package contains theme sets.</para>
-
-<sect3><title>Package information</title>
-<itemizedlist spacing='compact'>
-<listitem><para>Download (HTTP): <ulink
-url="&gtk-thinice-engine-download-http;"/></para></listitem>
-<listitem><para>Download (FTP): <ulink
-url="&gtk-thinice-engine-download-ftp;"/></para></listitem>
-<listitem><para>Download size: &gtk-thinice-engine-size;</para></listitem>
-<listitem><para>Estimated Disk space required:
-&gtk-thinice-engine-buildsize;</para></listitem>
-<listitem><para>Estimated build time:
-&gtk-thinice-engine-time;</para></listitem></itemizedlist>
-</sect3>
-
-<sect3><title><application><acronym>GTK</acronym> ThinIce Engine</application> dependencies</title>
-<sect4><title>Required</title>
-<para><xref linkend="GTK2"/></para></sect4>
-</sect3>
-
-</sect2>
Index: ome/lib/themes/gtk-thinice-engine.ent
===================================================================
--- gnome/lib/themes/gtk-thinice-engine.ent	(revision 579b09a0e9905c5b24179ba104d48ce31974cbaa)
+++ 	(revision )
@@ -1,10 +1,0 @@
-<!ENTITY gtk-thinice-engine SYSTEM "../gtk-thinice-engine.xml">
-<!ENTITY gtk-thinice-engine-intro SYSTEM "gtk-thinice-engine-intro.xml">
-<!ENTITY gtk-thinice-engine-inst SYSTEM "gtk-thinice-engine-inst.xml">
-<!ENTITY gtk-thinice-engine-desc SYSTEM "gtk-thinice-engine-desc.xml">
-<!ENTITY gtk-thinice-engine-version "2.0.2">
-<!ENTITY gtk-thinice-engine-download-http "http://ftp.gnome.org/pub/GNOME/sources/gtk-thinice-engine/2.0/gtk-thinice-engine-&gtk-thinice-engine-version;.tar.bz2">
-<!ENTITY gtk-thinice-engine-download-ftp "ftp://ftp.gnome.org/pub/GNOME/sources/gtk-thinice-engine/2.0/gtk-thinice-engine-&gtk-thinice-engine-version;.tar.bz2">
-<!ENTITY gtk-thinice-engine-size "136 KB">
-<!ENTITY gtk-thinice-engine-buildsize "1.6 MB">
-<!ENTITY gtk-thinice-engine-time "0.00 SBU">
