From c0b2e79d774c0ee1cbeeafaf728b559bbaecad5f Mon Sep 17 00:00:00 2001
From: Jamie Norrish <jamie@artefact.org.nz>
Date: Thu, 17 Nov 2011 15:55:24 +1300
Subject: [PATCH 1/2] Restructured file layout.

Moved all kiln-specific Cocoon files into a webapp/root/kiln, to allow for easier upgrades of kiln within a project. Updated paths within sitemaps and XSLT to match.
---
 .../{sitemap/xmod => kiln/sitemaps}/odd.xmap  |   0
 .../xmod => kiln/sitemaps}/schematron.xmap    |   6 +-
 .../xmod => kiln/sitemaps}/sitemap.xmap       | 414 +++++++++---------
 .../xmod => kiln/stylesheets}/menu/menu.xsl   |   0
 .../stylesheets}/menu/normalise-menu.xsl      |   0
 .../metadata/files-metadata-generator.xsl     |   0
 .../metadata/images-metadata-generator.xsl    |   0
 .../stylesheets}/metadata/xinclude.xsl        |   0
 .../properties/properties-generator.xsl       |   0
 .../check-missing-resources.xsl               |   0
 .../resource-check/flatten-dir-list.xsl       |   0
 .../resource-check/report-to-html.xsl         |   0
 .../schematron/iso_abstract_expand.xsl        |   0
 .../schematron/iso_dsdl_include.xsl           |   0
 .../iso_schematron_skeleton_for_saxon.xsl     |   0
 .../schematron/iso_svrl_for_xslt2.xsl         |   0
 .../stylesheets}/schematron/svrl_to_html.xsl  |   0
 .../stylesheets}/schematron/verbatim.xsl      |   0
 .../stylesheets}/schematron/verbid.xsl        |   0
 .../xmod => kiln/stylesheets}/solr/delete.xsl |   0
 .../solr/normalize-eats-for-solr.xsl          |   0
 .../stylesheets}/solr/tei-eats-to-solr.xsl    |   0
 .../stylesheets}/solr/tei-to-solr.xsl         |   0
 .../xmod => kiln/stylesheets}/tei/p4top5.xsl  |   0
 .../xmod => kiln/stylesheets}/tei/p5.xsl      |   0
 .../template/inherit-template.xsl             |   0
 .../stylesheets}/views/private.xsl            |   0
 .../stylesheets}/views/screen.xsl             |   0
 webapp/root/mount-table.xml                   |   2 +-
 webapp/root/{ => sitemaps}/config.xmap        |   6 +-
 webapp/root/{ => sitemaps}/main.xmap          |   6 +-
 webapp/root/{ => sitemaps}/private.xmap       |  18 +-
 .../root/stylesheets/{local => }/default.xsl  |   4 +-
 .../{local => }/private/default.xsl           |   2 +-
 .../{local => }/private/expand-image-refs.xsl |   0
 .../private/xml-dirs-to-index-list-html.xsl   |   0
 .../private/xml-dirs-to-process-list-html.xsl |   0
 .../{local => }/schematron/svrl_to_html.xsl   |   2 +-
 .../{local => }/solr/delete-by-file-path.xsl  |   2 +-
 .../{local => }/solr/tei-eats-to-solr.xsl     |   2 +-
 .../{local => }/solr/tei-to-solr.xsl          |   2 +-
 41 files changed, 236 insertions(+), 230 deletions(-)
 rename webapp/root/{sitemap/xmod => kiln/sitemaps}/odd.xmap (100%)
 rename webapp/root/{sitemap/xmod => kiln/sitemaps}/schematron.xmap (93%)
 rename webapp/root/{sitemap/xmod => kiln/sitemaps}/sitemap.xmap (82%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/menu/menu.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/menu/normalise-menu.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/metadata/files-metadata-generator.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/metadata/images-metadata-generator.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/metadata/xinclude.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/properties/properties-generator.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/resource-check/check-missing-resources.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/resource-check/flatten-dir-list.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/resource-check/report-to-html.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/iso_abstract_expand.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/iso_dsdl_include.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/iso_schematron_skeleton_for_saxon.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/iso_svrl_for_xslt2.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/svrl_to_html.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/verbatim.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/schematron/verbid.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/solr/delete.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/solr/normalize-eats-for-solr.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/solr/tei-eats-to-solr.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/solr/tei-to-solr.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/tei/p4top5.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/tei/p5.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/template/inherit-template.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/views/private.xsl (100%)
 rename webapp/root/{stylesheets/xmod => kiln/stylesheets}/views/screen.xsl (100%)
 rename webapp/root/{ => sitemaps}/config.xmap (84%)
 rename webapp/root/{ => sitemaps}/main.xmap (95%)
 rename webapp/root/{ => sitemaps}/private.xmap (86%)
 rename webapp/root/stylesheets/{local => }/default.xsl (94%)
 rename webapp/root/stylesheets/{local => }/private/default.xsl (97%)
 rename webapp/root/stylesheets/{local => }/private/expand-image-refs.xsl (100%)
 rename webapp/root/stylesheets/{local => }/private/xml-dirs-to-index-list-html.xsl (100%)
 rename webapp/root/stylesheets/{local => }/private/xml-dirs-to-process-list-html.xsl (100%)
 rename webapp/root/stylesheets/{local => }/schematron/svrl_to_html.xsl (82%)
 rename webapp/root/stylesheets/{local => }/solr/delete-by-file-path.xsl (93%)
 rename webapp/root/stylesheets/{local => }/solr/tei-eats-to-solr.xsl (91%)
 rename webapp/root/stylesheets/{local => }/solr/tei-to-solr.xsl (91%)

diff --git a/webapp/root/sitemap/xmod/odd.xmap b/webapp/root/kiln/sitemaps/odd.xmap
similarity index 100%
rename from webapp/root/sitemap/xmod/odd.xmap
rename to webapp/root/kiln/sitemaps/odd.xmap
diff --git a/webapp/root/sitemap/xmod/schematron.xmap b/webapp/root/kiln/sitemaps/schematron.xmap
similarity index 93%
rename from webapp/root/sitemap/xmod/schematron.xmap
rename to webapp/root/kiln/sitemaps/schematron.xmap
index 16a8b0ea1c..cc00f79b7f 100644
--- a/webapp/root/sitemap/xmod/schematron.xmap
+++ b/webapp/root/kiln/sitemaps/schematron.xmap
@@ -30,9 +30,9 @@
            applied to an XML file. -->
       <map:match pattern="*/*/*.xsl">
 	<map:generate src="cocoon:/schema/{1}.sch"/>
-	<map:transform src="../../stylesheets/xmod/schematron/iso_dsdl_include.xsl"/>
-	<map:transform src="../../stylesheets/xmod/schematron/iso_abstract_expand.xsl"/>
-	<map:transform src="../../stylesheets/xmod/schematron/{3}.xsl">
+	<map:transform src="../stylesheets/schematron/iso_dsdl_include.xsl"/>
+	<map:transform src="../stylesheets/schematron/iso_abstract_expand.xsl"/>
+	<map:transform src="../stylesheets/schematron/{3}.xsl">
 	  <map:parameter name="phase" value="{2}"/>
 	  <map:parameter name="allow-foreign" value="true"/>
 	</map:transform>
diff --git a/webapp/root/sitemap/xmod/sitemap.xmap b/webapp/root/kiln/sitemaps/sitemap.xmap
similarity index 82%
rename from webapp/root/sitemap/xmod/sitemap.xmap
rename to webapp/root/kiln/sitemaps/sitemap.xmap
index b0f33e2c85..4299dd2ac2 100644
--- a/webapp/root/sitemap/xmod/sitemap.xmap
+++ b/webapp/root/kiln/sitemaps/sitemap.xmap
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
-
+<?xml version="1.0" encoding="UTF-8"?>
+
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+
   <!--
     
     xMod configuration sitemap.
@@ -13,207 +13,211 @@
     The top-level project-specific sitemap, config.xmap, is mounted
     from here.
 
-  -->
-
-  <map:components>
-    <map:transformers default="saxon">
-      <map:transformer logger="sitemap.transformer.solr" name="solr"
-        src="uk.ac.kcl.cch.xmod.cocoon.transformation.SolrTransformer" />
-    </map:transformers>
-
-    <map:serializers>
-      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html; charset=utf-8" name="xhtml"
-        pool-max="${xhtml-serializer.pool-max}" src="org.apache.cocoon.serialization.XMLSerializer">
-        <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
-        <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
-        <encoding>UTF-8</encoding>
-        <indent>yes</indent>
-        <omit-xml-declaration>yes</omit-xml-declaration>
-      </map:serializer>
-    </map:serializers>
-  </map:components>
-
-  <map:pipelines>
-    <map:component-configurations>
-      <global-variables />
-    </map:component-configurations>
-
-    <!-- Properties pipeline. -->
-    <map:pipeline id="xmod-properties" internal-only="true">
-      <map:match pattern="_internal/properties/properties.xsl">
-        <map:generate src="../../properties/properties.xml" />
-        <map:transform src="../../stylesheets/xmod/properties/properties-generator.xsl" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- Menu pipeline. -->
-    <map:pipeline id="xmod-menu" internal-only="true">
-      <map:match pattern="_internal/menu/*.xml">
-        <map:generate src="../../xml/menu/{1}.xml" />
-        <map:transform src="../../stylesheets/xmod/menu/normalise-menu.xsl" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- Metadata pipeline. -->
-    <map:pipeline id="xmod-metadata" internal-only="true">
-      <map:match pattern="_internal/allxmlcontent.xml">
-        <map:generate src="../../xml/content" type="directory">
-          <map:parameter name="depth" value="99" />
-          <map:parameter name="exclude" value="\.svn" />
-        </map:generate>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <map:match pattern="_internal/metadata/*/**.xml">
-        <map:generate src="../../xml/content/{2}.xml" />
-        <map:transform src="../../stylesheets/xmod/metadata/{1}-metadata-generator.xsl">
-          <map:parameter name="path" value="{2}.xml" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <map:match pattern="_internal/metadata/*.xml">
-        <map:generate src="cocoon://_internal/allxmlcontent.xml" />
-        <map:transform src="../../stylesheets/xmod/metadata/xinclude.xsl">
-          <map:parameter name="type" value="{1}" />
-        </map:transform>
-        <map:transform type="xinclude" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- Solr indexing and querying. -->
-    <map:pipeline id="xmod-solr" internal-only="true">
-      <!-- Indexing. -->
+  -->
+
+  <map:components>
+    <map:transformers default="saxon">
+      <map:transformer logger="sitemap.transformer.solr" name="solr"
+        src="uk.ac.kcl.cch.xmod.cocoon.transformation.SolrTransformer" />
+    </map:transformers>
+
+    <map:serializers>
+      <map:serializer logger="sitemap.serializer.xhtml" mime-type="text/html; charset=utf-8" name="xhtml"
+        pool-max="${xhtml-serializer.pool-max}" src="org.apache.cocoon.serialization.XMLSerializer">
+        <doctype-public>-//W3C//DTD XHTML 1.0 Strict//EN</doctype-public>
+        <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
+        <encoding>UTF-8</encoding>
+        <indent>yes</indent>
+        <omit-xml-declaration>yes</omit-xml-declaration>
+      </map:serializer>
+    </map:serializers>
+  </map:components>
+
+  <map:pipelines>
+    <map:component-configurations>
+      <global-variables />
+    </map:component-configurations>
+
+    <!-- Properties pipeline. -->
+    <map:pipeline id="xmod-properties" internal-only="true">
+      <map:match pattern="_internal/properties/properties.xsl">
+        <map:generate src="../../properties/properties.xml" />
+        <map:transform src="../stylesheets/properties/properties-generator.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Menu pipeline. -->
+    <map:pipeline id="xmod-menu" internal-only="true">
+      <map:match pattern="_internal/menu/*.xml">
+        <map:generate src="../../xml/menu/{1}.xml" />
+        <map:transform src="../stylesheets/menu/normalise-menu.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Metadata pipeline. -->
+    <map:pipeline id="xmod-metadata" internal-only="true">
+      <map:match pattern="_internal/allxmlcontent.xml">
+        <map:generate src="../../xml/content" type="directory">
+          <map:parameter name="depth" value="99" />
+          <map:parameter name="exclude" value="\.svn" />
+        </map:generate>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="_internal/metadata/*/**.xml">
+        <map:generate src="../../xml/content/{2}.xml" />
+        <map:transform src="../stylesheets/metadata/{1}-metadata-generator.xsl">
+          <map:parameter name="path" value="{2}.xml" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <map:match pattern="_internal/metadata/*.xml">
+        <map:generate src="cocoon://_internal/allxmlcontent.xml" />
+        <map:transform src="../stylesheets/metadata/xinclude.xsl">
+          <map:parameter name="type" value="{1}" />
+        </map:transform>
+        <map:transform type="xinclude" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Solr indexing and querying. -->
+    <map:pipeline id="xmod-solr" internal-only="true">
+      <!-- Indexing. -->
       <!-- First deletes the document from the Solr, and then adds the
-           document to Solr -->
-      <map:match pattern="_internal/solr/index/*/**.xml">
-        <map:aggregate element="response">
-          <map:part element="delete" src="cocoon:/_internal/solr/delete-by-file-path/{2}.xml" />
-          <map:part element="add" src="cocoon:/_internal/solr/add/{1}/{2}.xml" />
-          <map:part element="optimize" src="cocoon:/_internal/solr/optimize" />
-        </map:aggregate>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Deleting. -->
-      <map:match pattern="_internal/solr/delete-by-file-path/**.xml">
-        <map:generate src="empty:empty" />
-        <map:transform src="../../stylesheets/local/solr/delete-by-file-path.xsl">
-          <map:parameter name="file-path" value="{1}" />
-        </map:transform>
-        <map:transform type="solr">
-          <map:parameter name="url" value="{global:solr-server}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Adding TEI with EATS. -->
-      <map:match pattern="_internal/solr/add/tei-eats/**.xml">
-        <map:aggregate element="source">
-          <map:part element="tei" src="../../xml/content/{1}.xml" />
-          <map:part element="eats" src="cocoon:/_internal/eats/entities.xml" />
-        </map:aggregate>
-        <map:transform src="../../stylesheets/local/solr/tei-eats-to-solr.xsl">
-          <map:parameter name="file-path" value="{1}" />
-        </map:transform>
-        <map:transform type="solr">
-          <map:parameter name="url" value="{global:solr-server}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Adding TEI with EATS specifying the authority. The first parameter is the authority id. -->
-      <map:match pattern="_internal/solr/add/tei-eats/*/**.xml">
-        <map:aggregate element="source">
-          <map:part element="tei" src="../../xml/content/{2}.xml" />
-          <map:part element="eatsml" src="cocoon:/_internal/eats/{1}/entities.xml" />
-        </map:aggregate>
-        <map:transform src="../../stylesheets/local/solr/tei-eats-to-solr.xsl">
-          <map:parameter name="file-path" value="{2}" />
-        </map:transform>
-        <map:transform type="solr">
-          <map:parameter name="url" value="{global:solr-server}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Adding TEI only. The first parameter is the file type. -->
-      <map:match pattern="_internal/solr/add/*/**.xml">
-        <map:generate src="../../xml/content/{2}.xml" />
-        <map:transform src="../../stylesheets/local/solr/{1}-to-solr.xsl">
-          <map:parameter name="file-path" value="{2}" />
-        </map:transform>
-        <map:transform type="solr">
-          <map:parameter name="url" value="{global:solr-server}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Optimize. -->
-      <map:match pattern="_internal/solr/optimize">
-        <map:generate src="empty:optimize" />
-        <map:transform type="solr">
-          <map:parameter name="url" value="{global:solr-server}" />
-        </map:transform>
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Querying. -->
-      <map:match pattern="_internal/solr/query/*">
-        <map:generate src="{global:solr-server}select/?{1}" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- EATS -->
-    <map:pipeline id="xmod-eats" internal-only="true">
-      <!-- Exports all the entities in EATSML -->
-      <map:match pattern="_internal/eats/entities.xml">
-        <map:generate src="{global:eats-server}edit/export/eatsml/" />
-        <map:transform src="../../stylesheets/xmod/solr/normalize-eats-for-solr.xsl" />
-        <map:serialize type="xml" />
-      </map:match>
-
-      <!-- Exports all the entities that are associated with an authority (id) in EATSML -->
-      <map:match pattern="_internal/eats/*/entities.xml">
-        <map:generate src="{global:eats-server}edit/export/eatsml/{1}/" />
-        <map:transform src="../../stylesheets/xmod/solr/normalize-eats-for-solr.xsl" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- Templating. -->
-    <map:pipeline id="xmod-templating" internal-only="true">
+           document to Solr -->
+      <map:match pattern="_internal/solr/index/*/**.xml">
+        <map:aggregate element="response">
+          <map:part element="delete" src="cocoon:/_internal/solr/delete-by-file-path/{2}.xml" />
+          <map:part element="add" src="cocoon:/_internal/solr/add/{1}/{2}.xml" />
+          <map:part element="optimize" src="cocoon:/_internal/solr/optimize" />
+        </map:aggregate>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Deleting. -->
+      <map:match pattern="_internal/solr/delete-by-file-path/**.xml">
+        <map:generate src="empty:empty" />
+        <map:transform src="../../stylesheets/solr/delete-by-file-path.xsl">
+          <map:parameter name="file-path" value="{1}" />
+        </map:transform>
+        <map:transform type="solr">
+          <map:parameter name="url" value="{global:solr-server}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Adding TEI with EATS. -->
+      <map:match pattern="_internal/solr/add/tei-eats/**.xml">
+        <map:aggregate element="aggregation">
+          <map:part element="tei" src="../../xml/content/{1}.xml" />
+          <map:part element="eats" src="cocoon:/_internal/eats/entities.xml" />
+        </map:aggregate>
+        <map:transform src="../../stylesheets/solr/tei-eats-to-solr.xsl">
+          <map:parameter name="file-path" value="{1}" />
+        </map:transform>
+        <map:transform type="solr">
+          <map:parameter name="url" value="{global:solr-server}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Adding TEI with EATS specifying the authority. The first parameter is the authority id. -->
+      <map:match pattern="_internal/solr/add/tei-eats/*/**.xml">
+        <map:aggregate element="aggregation">
+          <map:part element="tei" src="../../xml/content/{2}.xml" />
+          <map:part element="eatsml" src="cocoon:/_internal/eats/{1}/entities.xml" />
+        </map:aggregate>
+        <map:transform src="../../stylesheets/solr/tei-eats-to-solr.xsl">
+          <map:parameter name="file-path" value="{2}" />
+        </map:transform>
+        <map:transform type="solr">
+          <map:parameter name="url" value="{global:solr-server}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Adding TEI only. The first parameter is the file type. -->
+      <map:match pattern="_internal/solr/add/*/**.xml">
+        <map:generate src="../../xml/content/{2}.xml" />
+        <map:transform src="../../stylesheets/solr/{1}-to-solr.xsl">
+          <map:parameter name="file-path" value="{2}" />
+        </map:transform>
+        <map:transform type="solr">
+          <map:parameter name="url" value="{global:solr-server}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Optimize. -->
+      <map:match pattern="_internal/solr/optimize">
+        <map:generate src="empty:optimize" />
+        <map:transform type="solr">
+          <map:parameter name="url" value="{global:solr-server}" />
+        </map:transform>
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Querying. -->
+      <map:match pattern="_internal/solr/query/*">
+        <map:generate src="{global:solr-server}select/?{1}" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- EATS -->
+    <map:pipeline id="xmod-eats" internal-only="true">
+      <!-- Exports all the entities in EATSML -->
+      <map:match pattern="_internal/eats/entities.xml">
+        <map:generate src="{global:eats-server}edit/export/eatsml/" />
+        <map:transform src="../stylesheets/solr/normalize-eats-for-solr.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+
+      <!-- Exports all the entities that are associated with an
+           authority (id) in EATSML. -->
+      <map:match pattern="_internal/eats/*/entities.xml">
+        <map:generate src="{global:eats-server}edit/export/eatsml/{1}/" />
+        <map:transform src="../stylesheets/solr/normalize-eats-for-solr.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Templating. -->
+    <map:pipeline id="xmod-templating" internal-only="true">
       <!-- Transform an XML template into an XSLT, handling template
-           inheritance. -->
-      <map:match pattern="_internal/template/**.xsl">
-        <map:generate src="../../xml/template/{1}.xml" />
-        <map:transform type="xinclude" />
-        <map:transform src="../../stylesheets/xmod/template/inherit-template.xsl" />
-        <map:serialize type="xml" />
-      </map:match>
-    </map:pipeline>
-
-    <!-- Mount sub-sitemaps. -->
-    <map:pipeline>
-      <!-- ODD handling (part of xMod). -->
-      <map:match pattern="_internal/odd/**">
-        <map:mount check-reload="yes" src="odd.xmap" uri-prefix="_internal/odd/" />
-      </map:match>
-
-      <!-- Schematron handling (part of xMod). -->
-      <map:match pattern="_internal/schematron/**">
-        <map:mount check-reload="yes" src="schematron.xmap" uri-prefix="_internal/schematron/" />
-      </map:match>
-
+           inheritance. -->
+      <map:match pattern="_internal/template/**.xsl">
+        <map:generate src="../../xml/template/{1}.xml" />
+        <map:transform type="xinclude" />
+        <map:transform src="../stylesheets/template/inherit-template.xsl" />
+        <map:serialize type="xml" />
+      </map:match>
+    </map:pipeline>
+
+    <!-- Mount sub-sitemaps. -->
+    <map:pipeline>
+      <!-- ODD handling (part of xMod). -->
+      <map:match pattern="_internal/odd/**">
+        <map:mount check-reload="yes" src="odd.xmap"
+                   uri-prefix="_internal/odd/" />
+      </map:match>
+
+      <!-- Schematron handling (part of xMod). -->
+      <map:match pattern="_internal/schematron/**">
+        <map:mount check-reload="yes" src="schematron.xmap"
+                   uri-prefix="_internal/schematron/" />
+      </map:match>
+
       <!-- Main project-specific sitemap, matching on the remaining
-           URL space. -->
-      <map:match pattern="**">
-        <map:mount check-reload="yes" src="../../main.xmap" uri-prefix="" />
-      </map:match>
-    </map:pipeline>
-  </map:pipelines>
-</map:sitemap>
+           URL space. -->
+      <map:match pattern="**">
+        <map:mount check-reload="yes" src="../../sitemaps/main.xmap"
+                   uri-prefix="" />
+      </map:match>
+    </map:pipeline>
+  </map:pipelines>
+</map:sitemap>
diff --git a/webapp/root/stylesheets/xmod/menu/menu.xsl b/webapp/root/kiln/stylesheets/menu/menu.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/menu/menu.xsl
rename to webapp/root/kiln/stylesheets/menu/menu.xsl
diff --git a/webapp/root/stylesheets/xmod/menu/normalise-menu.xsl b/webapp/root/kiln/stylesheets/menu/normalise-menu.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/menu/normalise-menu.xsl
rename to webapp/root/kiln/stylesheets/menu/normalise-menu.xsl
diff --git a/webapp/root/stylesheets/xmod/metadata/files-metadata-generator.xsl b/webapp/root/kiln/stylesheets/metadata/files-metadata-generator.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/metadata/files-metadata-generator.xsl
rename to webapp/root/kiln/stylesheets/metadata/files-metadata-generator.xsl
diff --git a/webapp/root/stylesheets/xmod/metadata/images-metadata-generator.xsl b/webapp/root/kiln/stylesheets/metadata/images-metadata-generator.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/metadata/images-metadata-generator.xsl
rename to webapp/root/kiln/stylesheets/metadata/images-metadata-generator.xsl
diff --git a/webapp/root/stylesheets/xmod/metadata/xinclude.xsl b/webapp/root/kiln/stylesheets/metadata/xinclude.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/metadata/xinclude.xsl
rename to webapp/root/kiln/stylesheets/metadata/xinclude.xsl
diff --git a/webapp/root/stylesheets/xmod/properties/properties-generator.xsl b/webapp/root/kiln/stylesheets/properties/properties-generator.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/properties/properties-generator.xsl
rename to webapp/root/kiln/stylesheets/properties/properties-generator.xsl
diff --git a/webapp/root/stylesheets/xmod/resource-check/check-missing-resources.xsl b/webapp/root/kiln/stylesheets/resource-check/check-missing-resources.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/resource-check/check-missing-resources.xsl
rename to webapp/root/kiln/stylesheets/resource-check/check-missing-resources.xsl
diff --git a/webapp/root/stylesheets/xmod/resource-check/flatten-dir-list.xsl b/webapp/root/kiln/stylesheets/resource-check/flatten-dir-list.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/resource-check/flatten-dir-list.xsl
rename to webapp/root/kiln/stylesheets/resource-check/flatten-dir-list.xsl
diff --git a/webapp/root/stylesheets/xmod/resource-check/report-to-html.xsl b/webapp/root/kiln/stylesheets/resource-check/report-to-html.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/resource-check/report-to-html.xsl
rename to webapp/root/kiln/stylesheets/resource-check/report-to-html.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/iso_abstract_expand.xsl b/webapp/root/kiln/stylesheets/schematron/iso_abstract_expand.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/iso_abstract_expand.xsl
rename to webapp/root/kiln/stylesheets/schematron/iso_abstract_expand.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/iso_dsdl_include.xsl b/webapp/root/kiln/stylesheets/schematron/iso_dsdl_include.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/iso_dsdl_include.xsl
rename to webapp/root/kiln/stylesheets/schematron/iso_dsdl_include.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/iso_schematron_skeleton_for_saxon.xsl b/webapp/root/kiln/stylesheets/schematron/iso_schematron_skeleton_for_saxon.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/iso_schematron_skeleton_for_saxon.xsl
rename to webapp/root/kiln/stylesheets/schematron/iso_schematron_skeleton_for_saxon.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/iso_svrl_for_xslt2.xsl b/webapp/root/kiln/stylesheets/schematron/iso_svrl_for_xslt2.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/iso_svrl_for_xslt2.xsl
rename to webapp/root/kiln/stylesheets/schematron/iso_svrl_for_xslt2.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/svrl_to_html.xsl b/webapp/root/kiln/stylesheets/schematron/svrl_to_html.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/svrl_to_html.xsl
rename to webapp/root/kiln/stylesheets/schematron/svrl_to_html.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/verbatim.xsl b/webapp/root/kiln/stylesheets/schematron/verbatim.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/verbatim.xsl
rename to webapp/root/kiln/stylesheets/schematron/verbatim.xsl
diff --git a/webapp/root/stylesheets/xmod/schematron/verbid.xsl b/webapp/root/kiln/stylesheets/schematron/verbid.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/schematron/verbid.xsl
rename to webapp/root/kiln/stylesheets/schematron/verbid.xsl
diff --git a/webapp/root/stylesheets/xmod/solr/delete.xsl b/webapp/root/kiln/stylesheets/solr/delete.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/solr/delete.xsl
rename to webapp/root/kiln/stylesheets/solr/delete.xsl
diff --git a/webapp/root/stylesheets/xmod/solr/normalize-eats-for-solr.xsl b/webapp/root/kiln/stylesheets/solr/normalize-eats-for-solr.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/solr/normalize-eats-for-solr.xsl
rename to webapp/root/kiln/stylesheets/solr/normalize-eats-for-solr.xsl
diff --git a/webapp/root/stylesheets/xmod/solr/tei-eats-to-solr.xsl b/webapp/root/kiln/stylesheets/solr/tei-eats-to-solr.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/solr/tei-eats-to-solr.xsl
rename to webapp/root/kiln/stylesheets/solr/tei-eats-to-solr.xsl
diff --git a/webapp/root/stylesheets/xmod/solr/tei-to-solr.xsl b/webapp/root/kiln/stylesheets/solr/tei-to-solr.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/solr/tei-to-solr.xsl
rename to webapp/root/kiln/stylesheets/solr/tei-to-solr.xsl
diff --git a/webapp/root/stylesheets/xmod/tei/p4top5.xsl b/webapp/root/kiln/stylesheets/tei/p4top5.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/tei/p4top5.xsl
rename to webapp/root/kiln/stylesheets/tei/p4top5.xsl
diff --git a/webapp/root/stylesheets/xmod/tei/p5.xsl b/webapp/root/kiln/stylesheets/tei/p5.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/tei/p5.xsl
rename to webapp/root/kiln/stylesheets/tei/p5.xsl
diff --git a/webapp/root/stylesheets/xmod/template/inherit-template.xsl b/webapp/root/kiln/stylesheets/template/inherit-template.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/template/inherit-template.xsl
rename to webapp/root/kiln/stylesheets/template/inherit-template.xsl
diff --git a/webapp/root/stylesheets/xmod/views/private.xsl b/webapp/root/kiln/stylesheets/views/private.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/views/private.xsl
rename to webapp/root/kiln/stylesheets/views/private.xsl
diff --git a/webapp/root/stylesheets/xmod/views/screen.xsl b/webapp/root/kiln/stylesheets/views/screen.xsl
similarity index 100%
rename from webapp/root/stylesheets/xmod/views/screen.xsl
rename to webapp/root/kiln/stylesheets/views/screen.xsl
diff --git a/webapp/root/mount-table.xml b/webapp/root/mount-table.xml
index ad517a7250..8afa4c2dd0 100644
--- a/webapp/root/mount-table.xml
+++ b/webapp/root/mount-table.xml
@@ -1,4 +1,4 @@
 <!-- Cocoon mount table. -->
 <mount-table>
-  <mount uri-prefix="" check-reload="yes" src="config.xmap"/>
+  <mount uri-prefix="" check-reload="yes" src="sitemaps/config.xmap"/>
 </mount-table>
\ No newline at end of file
diff --git a/webapp/root/config.xmap b/webapp/root/sitemaps/config.xmap
similarity index 84%
rename from webapp/root/config.xmap
rename to webapp/root/sitemaps/config.xmap
index a19f77caa3..a9003ca685 100644
--- a/webapp/root/config.xmap
+++ b/webapp/root/sitemaps/config.xmap
@@ -28,9 +28,11 @@
 
     <!-- Mount sub-sitemaps. -->
     <map:pipeline>
-      <!-- Main project-specific sitemap, matching on the remaining URL space.. -->
+      <!-- Main project-specific sitemap, matching on the remaining
+           URL space. -->
       <map:match pattern="**">
-        <map:mount check-reload="yes" src="sitemap/xmod/" uri-prefix="" />
+        <map:mount check-reload="yes" src="../kiln/sitemaps/sitemap.xmap"
+                   uri-prefix="" />
       </map:match>
     </map:pipeline>
   </map:pipelines>
diff --git a/webapp/root/main.xmap b/webapp/root/sitemaps/main.xmap
similarity index 95%
rename from webapp/root/main.xmap
rename to webapp/root/sitemaps/main.xmap
index 779f544507..58b354dac6 100644
--- a/webapp/root/main.xmap
+++ b/webapp/root/sitemaps/main.xmap
@@ -82,7 +82,7 @@
           <map:part src="cocoon://_internal/metadata/files.xml" />
           <map:part src="xml/content/{1}.xml" label="tei" />
         </map:aggregate>
-        <map:transform src="stylesheets/local/default.xsl">
+        <map:transform src="../stylesheets/default.xsl">
           <map:parameter name="filedir" value="." />
           <map:parameter name="filename" value="{1}.xml" />
           <map:parameter name="fileextension" value="html" />
@@ -96,7 +96,7 @@
           <map:part src="cocoon://_internal/metadata/files.xml" />
           <map:part src="xml/content/doc/{1}.xml" label="tei" />
         </map:aggregate>
-        <map:transform src="stylesheets/local/doc.xsl">
+        <map:transform src="../stylesheets/doc.xsl">
           <map:parameter name="filedir" value="{1}" />
           <map:parameter name="filename" value="{2}.xml" />
           <map:parameter name="fileextension" value="html" />
@@ -110,7 +110,7 @@
           <map:part src="cocoon://_internal/metadata/files.xml" />
           <map:part src="xml/content/{1}/{2}.xml" label="tei" />
         </map:aggregate>
-        <map:transform src="stylesheets/local/default.xsl">
+        <map:transform src="../stylesheets/default.xsl">
           <map:parameter name="filedir" value="{1}" />
           <map:parameter name="filename" value="{2}.xml" />
           <map:parameter name="fileextension" value="html" />
diff --git a/webapp/root/private.xmap b/webapp/root/sitemaps/private.xmap
similarity index 86%
rename from webapp/root/private.xmap
rename to webapp/root/sitemaps/private.xmap
index ec780b6c04..88e4de795e 100644
--- a/webapp/root/private.xmap
+++ b/webapp/root/sitemaps/private.xmap
@@ -11,9 +11,9 @@
       <map:match pattern="xml/index.html">
         <map:generate src="xml/content" type="directory">
           <map:parameter name="depth" value="99" />
-          <map:parameter name="exclude" value="\.svn" />
+          <map:parameter name="exclude" value="\..*" />
         </map:generate>
-        <map:transform src="stylesheets/local/private/xml-dirs-to-process-list-html.xsl">
+        <map:transform src="../stylesheets/private/xml-dirs-to-process-list-html.xsl">
           <map:parameter name="initial_path" value="content/" />
         </map:transform>
         <map:serialize type="xhtml" />
@@ -30,7 +30,7 @@
           <map:parameter name="depth" value="99"/>
           <map:parameter name="exclude" value="^\..*"/>
         </map:generate>
-        <map:transform src="stylesheets/local/private/xml-dirs-to-index-list-html.xsl"/>
+        <map:transform src="../stylesheets/private/xml-dirs-to-index-list-html.xsl"/>
         <map:serialize type="xhtml"/>
       </map:match>
 
@@ -56,7 +56,7 @@
              the project's encoding guidelines. #ALL means that all
              phases specified in the schema are used. -->
         <map:generate src="cocoon://_internal/schematron/validate/#PROJECT/#ALL/{1}.xml" />
-        <map:transform src="stylesheets/local/schematron/svrl_to_html.xsl">
+        <map:transform src="../stylesheets/schematron/svrl_to_html.xsl">
           <map:parameter name="file" value="{1}.xml"/>
         </map:transform>
         <map:serialize type="xhtml" />
@@ -68,7 +68,7 @@
     <map:pipeline id="local-resource-check">
       <map:match pattern="xml/resource-check/images/**.html">
         <map:generate src="cocoon:/xml/resource-check/images/{1}.xml" />
-        <map:transform src="stylesheets/xmod/resource-check/report-to-html.xsl" />
+        <map:transform src="../kiln/stylesheets/resource-check/report-to-html.xsl" />
         <map:serialize type="xhtml" />
       </map:match>
     </map:pipeline>
@@ -83,7 +83,7 @@
           <map:part src="cocoon://private/xml/resource-check/image-refs/{1}.xml" />
           <map:part src="cocoon://private/xml/resource-check/image-files.xml" />
         </map:aggregate>
-        <map:transform src="stylesheets/xmod/resource-check/check-missing-resources.xsl" />
+        <map:transform src="../kiln/stylesheets/resource-check/check-missing-resources.xsl" />
         <map:serialize type="xml" />
       </map:match>
 
@@ -94,7 +94,7 @@
            thumbnails) of each image. -->
       <map:match pattern="xml/resource-check/image-refs/content/**.xml">
         <map:generate src="cocoon://_internal/metadata/images/{1}.xml" />
-        <map:transform src="stylesheets/local/private/expand-image-refs.xsl" />
+        <map:transform src="../stylesheets/private/expand-image-refs.xsl" />
         <map:serialize type="xml" />
       </map:match>
 
@@ -102,9 +102,9 @@
       <map:match pattern="xml/resource-check/image-files.xml">
         <map:generate src="images" type="imagedirectory">
           <map:parameter name="depth" value="99" />
-          <map:parameter name="exclude" value="\.svn" />
+          <map:parameter name="exclude" value="\..*" />
         </map:generate>
-        <map:transform src="stylesheets/xmod/resource-check/flatten-dir-list.xsl" />
+        <map:transform src="../kiln/stylesheets/resource-check/flatten-dir-list.xsl" />
         <map:serialize type="xml" />
       </map:match>
     </map:pipeline>
diff --git a/webapp/root/stylesheets/local/default.xsl b/webapp/root/stylesheets/default.xsl
similarity index 94%
rename from webapp/root/stylesheets/local/default.xsl
rename to webapp/root/stylesheets/default.xsl
index 4bbb3ada4f..261d80b6ee 100644
--- a/webapp/root/stylesheets/local/default.xsl
+++ b/webapp/root/stylesheets/default.xsl
@@ -19,8 +19,8 @@
       needed. Project-wide changes should be made here.
   -->
 
-  <xsl:import href="../xmod/views/screen.xsl" />
-  <xsl:import href="../xmod/tei/p5.xsl" />
+  <xsl:import href="../kiln/stylesheets/views/screen.xsl" />
+  <xsl:import href="../kiln/stylesheets/tei/p5.xsl" />
   
   <xsl:param name="filedir" />
   <xsl:param name="filename" />
diff --git a/webapp/root/stylesheets/local/private/default.xsl b/webapp/root/stylesheets/private/default.xsl
similarity index 97%
rename from webapp/root/stylesheets/local/private/default.xsl
rename to webapp/root/stylesheets/private/default.xsl
index f50dd7b21a..e28e745ca7 100644
--- a/webapp/root/stylesheets/local/private/default.xsl
+++ b/webapp/root/stylesheets/private/default.xsl
@@ -14,7 +14,7 @@
        should be imported by other project specific stylesheets, where
        the variables/templates should be overriden as needed. -->
 
-  <xsl:import href="../../xmod/views/private.xsl"/>
+  <xsl:import href="../../kiln/stylesheets/views/private.xsl"/>
   
   <xsl:param name="filedir"/>
   <xsl:param name="filename"/>
diff --git a/webapp/root/stylesheets/local/private/expand-image-refs.xsl b/webapp/root/stylesheets/private/expand-image-refs.xsl
similarity index 100%
rename from webapp/root/stylesheets/local/private/expand-image-refs.xsl
rename to webapp/root/stylesheets/private/expand-image-refs.xsl
diff --git a/webapp/root/stylesheets/local/private/xml-dirs-to-index-list-html.xsl b/webapp/root/stylesheets/private/xml-dirs-to-index-list-html.xsl
similarity index 100%
rename from webapp/root/stylesheets/local/private/xml-dirs-to-index-list-html.xsl
rename to webapp/root/stylesheets/private/xml-dirs-to-index-list-html.xsl
diff --git a/webapp/root/stylesheets/local/private/xml-dirs-to-process-list-html.xsl b/webapp/root/stylesheets/private/xml-dirs-to-process-list-html.xsl
similarity index 100%
rename from webapp/root/stylesheets/local/private/xml-dirs-to-process-list-html.xsl
rename to webapp/root/stylesheets/private/xml-dirs-to-process-list-html.xsl
diff --git a/webapp/root/stylesheets/local/schematron/svrl_to_html.xsl b/webapp/root/stylesheets/schematron/svrl_to_html.xsl
similarity index 82%
rename from webapp/root/stylesheets/local/schematron/svrl_to_html.xsl
rename to webapp/root/stylesheets/schematron/svrl_to_html.xsl
index 03e52a02c5..f49995b8c6 100644
--- a/webapp/root/stylesheets/local/schematron/svrl_to_html.xsl
+++ b/webapp/root/stylesheets/schematron/svrl_to_html.xsl
@@ -4,7 +4,7 @@
   <!-- Import the xMod version of this XSLT for default HTML
        rendering. Project-specific customisations are made in this
        file. -->
-  <xsl:import href="../../xmod/schematron/svrl_to_html.xsl"/>
+  <xsl:import href="../../kiln/stylesheets/schematron/svrl_to_html.xsl"/>
 
   <!-- File path of document being validated. -->
   <xsl:param name="file" select="''"/>
diff --git a/webapp/root/stylesheets/local/solr/delete-by-file-path.xsl b/webapp/root/stylesheets/solr/delete-by-file-path.xsl
similarity index 93%
rename from webapp/root/stylesheets/local/solr/delete-by-file-path.xsl
rename to webapp/root/stylesheets/solr/delete-by-file-path.xsl
index 8c322d7bdc..6df08e51f4 100644
--- a/webapp/root/stylesheets/local/solr/delete-by-file-path.xsl
+++ b/webapp/root/stylesheets/solr/delete-by-file-path.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../xmod/solr/delete.xsl" />
+  <xsl:import href="../../kiln/stylesheets/solr/delete.xsl" />
 
   <xd:doc scope="stylesheet">
     <xd:desc>
diff --git a/webapp/root/stylesheets/local/solr/tei-eats-to-solr.xsl b/webapp/root/stylesheets/solr/tei-eats-to-solr.xsl
similarity index 91%
rename from webapp/root/stylesheets/local/solr/tei-eats-to-solr.xsl
rename to webapp/root/stylesheets/solr/tei-eats-to-solr.xsl
index 0d128d37e5..0222a17d20 100644
--- a/webapp/root/stylesheets/local/solr/tei-eats-to-solr.xsl
+++ b/webapp/root/stylesheets/solr/tei-eats-to-solr.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../xmod/solr/tei-eats-to-solr.xsl" />
+  <xsl:import href="../../kiln/stylesheets/solr/tei-eats-to-solr.xsl" />
 
   <xd:doc scope="stylesheet">
     <xd:desc>
diff --git a/webapp/root/stylesheets/local/solr/tei-to-solr.xsl b/webapp/root/stylesheets/solr/tei-to-solr.xsl
similarity index 91%
rename from webapp/root/stylesheets/local/solr/tei-to-solr.xsl
rename to webapp/root/stylesheets/solr/tei-to-solr.xsl
index 4e9f1b5428..956fdf6345 100644
--- a/webapp/root/stylesheets/local/solr/tei-to-solr.xsl
+++ b/webapp/root/stylesheets/solr/tei-to-solr.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet exclude-result-prefixes="#all" version="2.0" xmlns:xd="http://www.oxygenxml.com/ns/doc/xsl"
   xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
-  <xsl:import href="../../xmod/solr/tei-to-solr.xsl" />
+  <xsl:import href="../../kiln/stylesheets/solr/tei-to-solr.xsl" />
 
   <xd:doc scope="stylesheet">
     <xd:desc>

From e711bd383595b68f4f78948d5d8d86e885d4f41c Mon Sep 17 00:00:00 2001
From: Jamie Norrish <jamie@artefact.org.nz>
Date: Fri, 18 Nov 2011 07:58:38 +1300
Subject: [PATCH 2/2] Moved _a to assets.

---
 webapp/root/{_a => assets}/c/default.css            |   0
 webapp/root/{_a => assets}/i/address_bg.png         | Bin
 webapp/root/{_a => assets}/i/banner_bg.png          | Bin
 webapp/root/{_a => assets}/i/blockquote_bg.png      | Bin
 webapp/root/{_a => assets}/i/body_bg.png            | Bin
 webapp/root/{_a => assets}/i/breadcrumb_bg.png      | Bin
 webapp/root/{_a => assets}/i/breadcrumb_s01_bg.png  | Bin
 webapp/root/{_a => assets}/i/bullet_rdquo_999.png   | Bin
 webapp/root/{_a => assets}/i/bullet_roundel_900.png | Bin
 webapp/root/{_a => assets}/i/bullet_roundel_ccc.png | Bin
 webapp/root/{_a => assets}/i/bullet_roundel_eee.png | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_069.png   | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_666.png   | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_69c.png   | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_999.png   | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_ccc.png   | Bin
 webapp/root/{_a => assets}/i/bullet_rsquo_fff.png   | Bin
 webapp/root/{_a => assets}/i/bullet_square_900.png  | Bin
 webapp/root/{_a => assets}/i/bullet_square_ccc.png  | Bin
 webapp/root/{_a => assets}/i/bullet_star_900.png    | Bin
 webapp/root/{_a => assets}/i/bullet_star_ccc.png    | Bin
 webapp/root/{_a => assets}/i/content_options_bg.png | Bin
 webapp/root/{_a => assets}/i/decalLeft_bg.png       | Bin
 webapp/root/{_a => assets}/i/decalRight_bg.png      | Bin
 webapp/root/{_a => assets}/i/favicon.ico            | Bin
 webapp/root/{_a => assets}/i/footer_options_bg.png  | Bin
 webapp/root/{_a => assets}/i/h1_accent.png          | Bin
 webapp/root/{_a => assets}/i/icon_arrowUp_666.png   | Bin
 webapp/root/{_a => assets}/i/icon_arrowUp_ccc.png   | Bin
 webapp/root/{_a => assets}/i/icon_collapse_off.png  | Bin
 webapp/root/{_a => assets}/i/icon_collapse_on.png   | Bin
 webapp/root/{_a => assets}/i/icon_expand_off.png    | Bin
 webapp/root/{_a => assets}/i/icon_expand_on.png     | Bin
 .../{_a => assets}/i/icon_linkExtNewWindow_666.png  | Bin
 .../{_a => assets}/i/icon_linkExtNewWindow_ccc.png  | Bin
 webapp/root/{_a => assets}/i/icon_linkExt_666.png   | Bin
 webapp/root/{_a => assets}/i/icon_linkExt_ccc.png   | Bin
 webapp/root/{_a => assets}/i/icon_linkFile_666.png  | Bin
 webapp/root/{_a => assets}/i/icon_linkFile_ccc.png  | Bin
 .../{_a => assets}/i/icon_linkIntNewWindow_666.png  | Bin
 .../{_a => assets}/i/icon_linkIntNewWindow_ccc.png  | Bin
 webapp/root/{_a => assets}/i/icon_linkInt_666.png   | Bin
 webapp/root/{_a => assets}/i/icon_linkInt_ccc.png   | Bin
 webapp/root/{_a => assets}/i/icon_linkMail_666.png  | Bin
 webapp/root/{_a => assets}/i/icon_linkMail_ccc.png  | Bin
 webapp/root/{_a => assets}/i/icon_zoom.png          | Bin
 webapp/root/{_a => assets}/i/pn1_bg_off.png         | Bin
 webapp/root/{_a => assets}/i/pn1_bg_on.png          | Bin
 webapp/root/{_a => assets}/i/pn2_bg_off.png         | Bin
 webapp/root/{_a => assets}/i/pn2_bg_on.png          | Bin
 webapp/root/{_a => assets}/i/pn3_bg_off.png         | Bin
 webapp/root/{_a => assets}/i/sidenav_bg.png         | Bin
 webapp/root/{_a => assets}/i/tabs_bg_left.png       | Bin
 webapp/root/{_a => assets}/i/tabs_bg_right.png      | Bin
 webapp/root/{_a => assets}/i/xMod.png               | Bin
 webapp/root/{_a => assets}/i/xModOff.png            | Bin
 webapp/root/{_a => assets}/j/jquery-1.4.2.min.js    |   0
 webapp/root/{_a => assets}/s/config.js              |   0
 webapp/root/{_a => assets}/t/tpl_basic.html         |   0
 webapp/root/{_a => assets}/t/tpl_basic_build.html   |   0
 webapp/root/{_a => assets}/t/tpl_basic_theme01.html |   0
 webapp/root/{_a => assets}/t/tpl_mod_sifr.html      |   0
 62 files changed, 0 insertions(+), 0 deletions(-)
 rename webapp/root/{_a => assets}/c/default.css (100%)
 rename webapp/root/{_a => assets}/i/address_bg.png (100%)
 rename webapp/root/{_a => assets}/i/banner_bg.png (100%)
 rename webapp/root/{_a => assets}/i/blockquote_bg.png (100%)
 rename webapp/root/{_a => assets}/i/body_bg.png (100%)
 rename webapp/root/{_a => assets}/i/breadcrumb_bg.png (100%)
 rename webapp/root/{_a => assets}/i/breadcrumb_s01_bg.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rdquo_999.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_roundel_900.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_roundel_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_roundel_eee.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_069.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_666.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_69c.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_999.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_rsquo_fff.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_square_900.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_square_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_star_900.png (100%)
 rename webapp/root/{_a => assets}/i/bullet_star_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/content_options_bg.png (100%)
 rename webapp/root/{_a => assets}/i/decalLeft_bg.png (100%)
 rename webapp/root/{_a => assets}/i/decalRight_bg.png (100%)
 rename webapp/root/{_a => assets}/i/favicon.ico (100%)
 rename webapp/root/{_a => assets}/i/footer_options_bg.png (100%)
 rename webapp/root/{_a => assets}/i/h1_accent.png (100%)
 rename webapp/root/{_a => assets}/i/icon_arrowUp_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_arrowUp_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_collapse_off.png (100%)
 rename webapp/root/{_a => assets}/i/icon_collapse_on.png (100%)
 rename webapp/root/{_a => assets}/i/icon_expand_off.png (100%)
 rename webapp/root/{_a => assets}/i/icon_expand_on.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkExtNewWindow_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkExtNewWindow_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkExt_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkExt_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkFile_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkFile_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkIntNewWindow_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkIntNewWindow_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkInt_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkInt_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkMail_666.png (100%)
 rename webapp/root/{_a => assets}/i/icon_linkMail_ccc.png (100%)
 rename webapp/root/{_a => assets}/i/icon_zoom.png (100%)
 rename webapp/root/{_a => assets}/i/pn1_bg_off.png (100%)
 rename webapp/root/{_a => assets}/i/pn1_bg_on.png (100%)
 rename webapp/root/{_a => assets}/i/pn2_bg_off.png (100%)
 rename webapp/root/{_a => assets}/i/pn2_bg_on.png (100%)
 rename webapp/root/{_a => assets}/i/pn3_bg_off.png (100%)
 rename webapp/root/{_a => assets}/i/sidenav_bg.png (100%)
 rename webapp/root/{_a => assets}/i/tabs_bg_left.png (100%)
 rename webapp/root/{_a => assets}/i/tabs_bg_right.png (100%)
 rename webapp/root/{_a => assets}/i/xMod.png (100%)
 rename webapp/root/{_a => assets}/i/xModOff.png (100%)
 rename webapp/root/{_a => assets}/j/jquery-1.4.2.min.js (100%)
 rename webapp/root/{_a => assets}/s/config.js (100%)
 rename webapp/root/{_a => assets}/t/tpl_basic.html (100%)
 rename webapp/root/{_a => assets}/t/tpl_basic_build.html (100%)
 rename webapp/root/{_a => assets}/t/tpl_basic_theme01.html (100%)
 rename webapp/root/{_a => assets}/t/tpl_mod_sifr.html (100%)

diff --git a/webapp/root/_a/c/default.css b/webapp/root/assets/c/default.css
similarity index 100%
rename from webapp/root/_a/c/default.css
rename to webapp/root/assets/c/default.css
diff --git a/webapp/root/_a/i/address_bg.png b/webapp/root/assets/i/address_bg.png
similarity index 100%
rename from webapp/root/_a/i/address_bg.png
rename to webapp/root/assets/i/address_bg.png
diff --git a/webapp/root/_a/i/banner_bg.png b/webapp/root/assets/i/banner_bg.png
similarity index 100%
rename from webapp/root/_a/i/banner_bg.png
rename to webapp/root/assets/i/banner_bg.png
diff --git a/webapp/root/_a/i/blockquote_bg.png b/webapp/root/assets/i/blockquote_bg.png
similarity index 100%
rename from webapp/root/_a/i/blockquote_bg.png
rename to webapp/root/assets/i/blockquote_bg.png
diff --git a/webapp/root/_a/i/body_bg.png b/webapp/root/assets/i/body_bg.png
similarity index 100%
rename from webapp/root/_a/i/body_bg.png
rename to webapp/root/assets/i/body_bg.png
diff --git a/webapp/root/_a/i/breadcrumb_bg.png b/webapp/root/assets/i/breadcrumb_bg.png
similarity index 100%
rename from webapp/root/_a/i/breadcrumb_bg.png
rename to webapp/root/assets/i/breadcrumb_bg.png
diff --git a/webapp/root/_a/i/breadcrumb_s01_bg.png b/webapp/root/assets/i/breadcrumb_s01_bg.png
similarity index 100%
rename from webapp/root/_a/i/breadcrumb_s01_bg.png
rename to webapp/root/assets/i/breadcrumb_s01_bg.png
diff --git a/webapp/root/_a/i/bullet_rdquo_999.png b/webapp/root/assets/i/bullet_rdquo_999.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rdquo_999.png
rename to webapp/root/assets/i/bullet_rdquo_999.png
diff --git a/webapp/root/_a/i/bullet_roundel_900.png b/webapp/root/assets/i/bullet_roundel_900.png
similarity index 100%
rename from webapp/root/_a/i/bullet_roundel_900.png
rename to webapp/root/assets/i/bullet_roundel_900.png
diff --git a/webapp/root/_a/i/bullet_roundel_ccc.png b/webapp/root/assets/i/bullet_roundel_ccc.png
similarity index 100%
rename from webapp/root/_a/i/bullet_roundel_ccc.png
rename to webapp/root/assets/i/bullet_roundel_ccc.png
diff --git a/webapp/root/_a/i/bullet_roundel_eee.png b/webapp/root/assets/i/bullet_roundel_eee.png
similarity index 100%
rename from webapp/root/_a/i/bullet_roundel_eee.png
rename to webapp/root/assets/i/bullet_roundel_eee.png
diff --git a/webapp/root/_a/i/bullet_rsquo_069.png b/webapp/root/assets/i/bullet_rsquo_069.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_069.png
rename to webapp/root/assets/i/bullet_rsquo_069.png
diff --git a/webapp/root/_a/i/bullet_rsquo_666.png b/webapp/root/assets/i/bullet_rsquo_666.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_666.png
rename to webapp/root/assets/i/bullet_rsquo_666.png
diff --git a/webapp/root/_a/i/bullet_rsquo_69c.png b/webapp/root/assets/i/bullet_rsquo_69c.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_69c.png
rename to webapp/root/assets/i/bullet_rsquo_69c.png
diff --git a/webapp/root/_a/i/bullet_rsquo_999.png b/webapp/root/assets/i/bullet_rsquo_999.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_999.png
rename to webapp/root/assets/i/bullet_rsquo_999.png
diff --git a/webapp/root/_a/i/bullet_rsquo_ccc.png b/webapp/root/assets/i/bullet_rsquo_ccc.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_ccc.png
rename to webapp/root/assets/i/bullet_rsquo_ccc.png
diff --git a/webapp/root/_a/i/bullet_rsquo_fff.png b/webapp/root/assets/i/bullet_rsquo_fff.png
similarity index 100%
rename from webapp/root/_a/i/bullet_rsquo_fff.png
rename to webapp/root/assets/i/bullet_rsquo_fff.png
diff --git a/webapp/root/_a/i/bullet_square_900.png b/webapp/root/assets/i/bullet_square_900.png
similarity index 100%
rename from webapp/root/_a/i/bullet_square_900.png
rename to webapp/root/assets/i/bullet_square_900.png
diff --git a/webapp/root/_a/i/bullet_square_ccc.png b/webapp/root/assets/i/bullet_square_ccc.png
similarity index 100%
rename from webapp/root/_a/i/bullet_square_ccc.png
rename to webapp/root/assets/i/bullet_square_ccc.png
diff --git a/webapp/root/_a/i/bullet_star_900.png b/webapp/root/assets/i/bullet_star_900.png
similarity index 100%
rename from webapp/root/_a/i/bullet_star_900.png
rename to webapp/root/assets/i/bullet_star_900.png
diff --git a/webapp/root/_a/i/bullet_star_ccc.png b/webapp/root/assets/i/bullet_star_ccc.png
similarity index 100%
rename from webapp/root/_a/i/bullet_star_ccc.png
rename to webapp/root/assets/i/bullet_star_ccc.png
diff --git a/webapp/root/_a/i/content_options_bg.png b/webapp/root/assets/i/content_options_bg.png
similarity index 100%
rename from webapp/root/_a/i/content_options_bg.png
rename to webapp/root/assets/i/content_options_bg.png
diff --git a/webapp/root/_a/i/decalLeft_bg.png b/webapp/root/assets/i/decalLeft_bg.png
similarity index 100%
rename from webapp/root/_a/i/decalLeft_bg.png
rename to webapp/root/assets/i/decalLeft_bg.png
diff --git a/webapp/root/_a/i/decalRight_bg.png b/webapp/root/assets/i/decalRight_bg.png
similarity index 100%
rename from webapp/root/_a/i/decalRight_bg.png
rename to webapp/root/assets/i/decalRight_bg.png
diff --git a/webapp/root/_a/i/favicon.ico b/webapp/root/assets/i/favicon.ico
similarity index 100%
rename from webapp/root/_a/i/favicon.ico
rename to webapp/root/assets/i/favicon.ico
diff --git a/webapp/root/_a/i/footer_options_bg.png b/webapp/root/assets/i/footer_options_bg.png
similarity index 100%
rename from webapp/root/_a/i/footer_options_bg.png
rename to webapp/root/assets/i/footer_options_bg.png
diff --git a/webapp/root/_a/i/h1_accent.png b/webapp/root/assets/i/h1_accent.png
similarity index 100%
rename from webapp/root/_a/i/h1_accent.png
rename to webapp/root/assets/i/h1_accent.png
diff --git a/webapp/root/_a/i/icon_arrowUp_666.png b/webapp/root/assets/i/icon_arrowUp_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_arrowUp_666.png
rename to webapp/root/assets/i/icon_arrowUp_666.png
diff --git a/webapp/root/_a/i/icon_arrowUp_ccc.png b/webapp/root/assets/i/icon_arrowUp_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_arrowUp_ccc.png
rename to webapp/root/assets/i/icon_arrowUp_ccc.png
diff --git a/webapp/root/_a/i/icon_collapse_off.png b/webapp/root/assets/i/icon_collapse_off.png
similarity index 100%
rename from webapp/root/_a/i/icon_collapse_off.png
rename to webapp/root/assets/i/icon_collapse_off.png
diff --git a/webapp/root/_a/i/icon_collapse_on.png b/webapp/root/assets/i/icon_collapse_on.png
similarity index 100%
rename from webapp/root/_a/i/icon_collapse_on.png
rename to webapp/root/assets/i/icon_collapse_on.png
diff --git a/webapp/root/_a/i/icon_expand_off.png b/webapp/root/assets/i/icon_expand_off.png
similarity index 100%
rename from webapp/root/_a/i/icon_expand_off.png
rename to webapp/root/assets/i/icon_expand_off.png
diff --git a/webapp/root/_a/i/icon_expand_on.png b/webapp/root/assets/i/icon_expand_on.png
similarity index 100%
rename from webapp/root/_a/i/icon_expand_on.png
rename to webapp/root/assets/i/icon_expand_on.png
diff --git a/webapp/root/_a/i/icon_linkExtNewWindow_666.png b/webapp/root/assets/i/icon_linkExtNewWindow_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkExtNewWindow_666.png
rename to webapp/root/assets/i/icon_linkExtNewWindow_666.png
diff --git a/webapp/root/_a/i/icon_linkExtNewWindow_ccc.png b/webapp/root/assets/i/icon_linkExtNewWindow_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkExtNewWindow_ccc.png
rename to webapp/root/assets/i/icon_linkExtNewWindow_ccc.png
diff --git a/webapp/root/_a/i/icon_linkExt_666.png b/webapp/root/assets/i/icon_linkExt_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkExt_666.png
rename to webapp/root/assets/i/icon_linkExt_666.png
diff --git a/webapp/root/_a/i/icon_linkExt_ccc.png b/webapp/root/assets/i/icon_linkExt_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkExt_ccc.png
rename to webapp/root/assets/i/icon_linkExt_ccc.png
diff --git a/webapp/root/_a/i/icon_linkFile_666.png b/webapp/root/assets/i/icon_linkFile_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkFile_666.png
rename to webapp/root/assets/i/icon_linkFile_666.png
diff --git a/webapp/root/_a/i/icon_linkFile_ccc.png b/webapp/root/assets/i/icon_linkFile_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkFile_ccc.png
rename to webapp/root/assets/i/icon_linkFile_ccc.png
diff --git a/webapp/root/_a/i/icon_linkIntNewWindow_666.png b/webapp/root/assets/i/icon_linkIntNewWindow_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkIntNewWindow_666.png
rename to webapp/root/assets/i/icon_linkIntNewWindow_666.png
diff --git a/webapp/root/_a/i/icon_linkIntNewWindow_ccc.png b/webapp/root/assets/i/icon_linkIntNewWindow_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkIntNewWindow_ccc.png
rename to webapp/root/assets/i/icon_linkIntNewWindow_ccc.png
diff --git a/webapp/root/_a/i/icon_linkInt_666.png b/webapp/root/assets/i/icon_linkInt_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkInt_666.png
rename to webapp/root/assets/i/icon_linkInt_666.png
diff --git a/webapp/root/_a/i/icon_linkInt_ccc.png b/webapp/root/assets/i/icon_linkInt_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkInt_ccc.png
rename to webapp/root/assets/i/icon_linkInt_ccc.png
diff --git a/webapp/root/_a/i/icon_linkMail_666.png b/webapp/root/assets/i/icon_linkMail_666.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkMail_666.png
rename to webapp/root/assets/i/icon_linkMail_666.png
diff --git a/webapp/root/_a/i/icon_linkMail_ccc.png b/webapp/root/assets/i/icon_linkMail_ccc.png
similarity index 100%
rename from webapp/root/_a/i/icon_linkMail_ccc.png
rename to webapp/root/assets/i/icon_linkMail_ccc.png
diff --git a/webapp/root/_a/i/icon_zoom.png b/webapp/root/assets/i/icon_zoom.png
similarity index 100%
rename from webapp/root/_a/i/icon_zoom.png
rename to webapp/root/assets/i/icon_zoom.png
diff --git a/webapp/root/_a/i/pn1_bg_off.png b/webapp/root/assets/i/pn1_bg_off.png
similarity index 100%
rename from webapp/root/_a/i/pn1_bg_off.png
rename to webapp/root/assets/i/pn1_bg_off.png
diff --git a/webapp/root/_a/i/pn1_bg_on.png b/webapp/root/assets/i/pn1_bg_on.png
similarity index 100%
rename from webapp/root/_a/i/pn1_bg_on.png
rename to webapp/root/assets/i/pn1_bg_on.png
diff --git a/webapp/root/_a/i/pn2_bg_off.png b/webapp/root/assets/i/pn2_bg_off.png
similarity index 100%
rename from webapp/root/_a/i/pn2_bg_off.png
rename to webapp/root/assets/i/pn2_bg_off.png
diff --git a/webapp/root/_a/i/pn2_bg_on.png b/webapp/root/assets/i/pn2_bg_on.png
similarity index 100%
rename from webapp/root/_a/i/pn2_bg_on.png
rename to webapp/root/assets/i/pn2_bg_on.png
diff --git a/webapp/root/_a/i/pn3_bg_off.png b/webapp/root/assets/i/pn3_bg_off.png
similarity index 100%
rename from webapp/root/_a/i/pn3_bg_off.png
rename to webapp/root/assets/i/pn3_bg_off.png
diff --git a/webapp/root/_a/i/sidenav_bg.png b/webapp/root/assets/i/sidenav_bg.png
similarity index 100%
rename from webapp/root/_a/i/sidenav_bg.png
rename to webapp/root/assets/i/sidenav_bg.png
diff --git a/webapp/root/_a/i/tabs_bg_left.png b/webapp/root/assets/i/tabs_bg_left.png
similarity index 100%
rename from webapp/root/_a/i/tabs_bg_left.png
rename to webapp/root/assets/i/tabs_bg_left.png
diff --git a/webapp/root/_a/i/tabs_bg_right.png b/webapp/root/assets/i/tabs_bg_right.png
similarity index 100%
rename from webapp/root/_a/i/tabs_bg_right.png
rename to webapp/root/assets/i/tabs_bg_right.png
diff --git a/webapp/root/_a/i/xMod.png b/webapp/root/assets/i/xMod.png
similarity index 100%
rename from webapp/root/_a/i/xMod.png
rename to webapp/root/assets/i/xMod.png
diff --git a/webapp/root/_a/i/xModOff.png b/webapp/root/assets/i/xModOff.png
similarity index 100%
rename from webapp/root/_a/i/xModOff.png
rename to webapp/root/assets/i/xModOff.png
diff --git a/webapp/root/_a/j/jquery-1.4.2.min.js b/webapp/root/assets/j/jquery-1.4.2.min.js
similarity index 100%
rename from webapp/root/_a/j/jquery-1.4.2.min.js
rename to webapp/root/assets/j/jquery-1.4.2.min.js
diff --git a/webapp/root/_a/s/config.js b/webapp/root/assets/s/config.js
similarity index 100%
rename from webapp/root/_a/s/config.js
rename to webapp/root/assets/s/config.js
diff --git a/webapp/root/_a/t/tpl_basic.html b/webapp/root/assets/t/tpl_basic.html
similarity index 100%
rename from webapp/root/_a/t/tpl_basic.html
rename to webapp/root/assets/t/tpl_basic.html
diff --git a/webapp/root/_a/t/tpl_basic_build.html b/webapp/root/assets/t/tpl_basic_build.html
similarity index 100%
rename from webapp/root/_a/t/tpl_basic_build.html
rename to webapp/root/assets/t/tpl_basic_build.html
diff --git a/webapp/root/_a/t/tpl_basic_theme01.html b/webapp/root/assets/t/tpl_basic_theme01.html
similarity index 100%
rename from webapp/root/_a/t/tpl_basic_theme01.html
rename to webapp/root/assets/t/tpl_basic_theme01.html
diff --git a/webapp/root/_a/t/tpl_mod_sifr.html b/webapp/root/assets/t/tpl_mod_sifr.html
similarity index 100%
rename from webapp/root/_a/t/tpl_mod_sifr.html
rename to webapp/root/assets/t/tpl_mod_sifr.html