diff --git a/build.xml b/build.xml
index b448e9e..b25da1f 100644
--- a/build.xml
+++ b/build.xml
@@ -185,6 +185,11 @@
         <type type="file"/>
       </fileset>
     </copy>
+    <copy todir="${org.dita-community.i18n.output.dir}/org/ditacommunity/i18n/saxon">
+      <fileset dir="${basedir}">
+        <include name="version.properties"/>
+      </fileset>
+    </copy>
   </target>
   
   <target name="compile.module.org.dita-community.i18n.tests" depends="compile.module.org.dita-community.i18n.production" description="compile module org.dita-community.i18n; test classes" unless="skip.tests"/>
@@ -218,7 +223,6 @@
       <fileset dir="${basedir}/src/main/java">
         <include name="**/resources/**.*" />
       </fileset>
-
     </jar>
   </target>
   
diff --git a/plugin/conf/grouping-and-sorting/ar/ar.xml b/plugin/conf/grouping-and-sorting/ar/ar.xml
index 6163537..5858589 100755
--- a/plugin/conf/grouping-and-sorting/ar/ar.xml
+++ b/plugin/conf/grouping-and-sorting/ar/ar.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added. 2007-09-24 -->
         <java_collation_spec>
-            <include_collation_spec>ar-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>ar/ar-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/bg/bg.xml b/plugin/conf/grouping-and-sorting/bg/bg.xml
index 34655e7..6ebd444 100755
--- a/plugin/conf/grouping-and-sorting/bg/bg.xml
+++ b/plugin/conf/grouping-and-sorting/bg/bg.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>bg-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>bg/bg-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/ca/ca.xml b/plugin/conf/grouping-and-sorting/ca/ca.xml
index c7dd2c8..10b68c9 100755
--- a/plugin/conf/grouping-and-sorting/ca/ca.xml
+++ b/plugin/conf/grouping-and-sorting/ca/ca.xml
@@ -11,7 +11,7 @@
         <!-- Added to place "ch" order properly. ICU default "ca" rule seems to treat "ch" as one character. 2006-05-18 -->
         <replace_rules/>
         <java_collation_spec>
-            <include_collation_spec>ca-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>ca/ca-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/cs/cs.xml b/plugin/conf/grouping-and-sorting/cs/cs.xml
index c3f878a..2f24c4a 100755
--- a/plugin/conf/grouping-and-sorting/cs/cs.xml
+++ b/plugin/conf/grouping-and-sorting/cs/cs.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added 2006/03/28 -->
         <java_collation_spec>
-            <include_collation_spec>cs-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>cs/cs-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/el/el.xml b/plugin/conf/grouping-and-sorting/el/el.xml
index 45dc0a0..0f80785 100755
--- a/plugin/conf/grouping-and-sorting/el/el.xml
+++ b/plugin/conf/grouping-and-sorting/el/el.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>el-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>el/el-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/en/en.xml b/plugin/conf/grouping-and-sorting/en/en.xml
index 9d1c54c..2833a14 100755
--- a/plugin/conf/grouping-and-sorting/en/en.xml
+++ b/plugin/conf/grouping-and-sorting/en/en.xml
@@ -9,7 +9,7 @@
     <collation_spec>
         <!-- Added. 2006-05-18 -->
         <!-- java_collation_spec>
-		        <include_collation_spec>en-sort-rules.txt</include_collation_spec>
+		        <include_collation_spec>en/en-sort-rules.txt</include_collation_spec>
 	        </java_collation_spec -->
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/es/es.xml b/plugin/conf/grouping-and-sorting/es/es.xml
index f10ff6d..b235230 100755
--- a/plugin/conf/grouping-and-sorting/es/es.xml
+++ b/plugin/conf/grouping-and-sorting/es/es.xml
@@ -10,7 +10,7 @@
     <collation_spec>
         <!-- Added. 2007-03-16 -->
         <java_collation_spec>
-            <include_collation_spec>es-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>es/es-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/et/et.xml b/plugin/conf/grouping-and-sorting/et/et.xml
index 8f1b77b..dbe4935 100755
--- a/plugin/conf/grouping-and-sorting/et/et.xml
+++ b/plugin/conf/grouping-and-sorting/et/et.xml
@@ -8,7 +8,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>et-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>et/et-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/fa/fa.xml b/plugin/conf/grouping-and-sorting/fa/fa.xml
index 72587ed..7e2686e 100755
--- a/plugin/conf/grouping-and-sorting/fa/fa.xml
+++ b/plugin/conf/grouping-and-sorting/fa/fa.xml
@@ -8,7 +8,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>fa-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>fa/fa-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/fi/fi.xml b/plugin/conf/grouping-and-sorting/fi/fi.xml
index 4ec20e1..e463ed0 100755
--- a/plugin/conf/grouping-and-sorting/fi/fi.xml
+++ b/plugin/conf/grouping-and-sorting/fi/fi.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added. 2006-10-07 -->
         <java_collation_spec>
-            <include_collation_spec>fi-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>fi/fi-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/fr/fr.xml b/plugin/conf/grouping-and-sorting/fr/fr.xml
index 8bba8ba..4fe1cdf 100755
--- a/plugin/conf/grouping-and-sorting/fr/fr.xml
+++ b/plugin/conf/grouping-and-sorting/fr/fr.xml
@@ -11,7 +11,7 @@
     <collation_spec>
         <!-- Added to support U+0153, U+0152, U+00FC, U+00DC. 2006-10-10 -->
         <java_collation_spec>
-            <include_collation_spec>fr-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>fr/fr-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/he/he.xml b/plugin/conf/grouping-and-sorting/he/he.xml
index 8c36be9..88c6903 100755
--- a/plugin/conf/grouping-and-sorting/he/he.xml
+++ b/plugin/conf/grouping-and-sorting/he/he.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>he-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>he/he-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/hi/hi.xml b/plugin/conf/grouping-and-sorting/hi/hi.xml
index caebb36..2f09af5 100755
--- a/plugin/conf/grouping-and-sorting/hi/hi.xml
+++ b/plugin/conf/grouping-and-sorting/hi/hi.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>hi-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>hi/hi-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/hr/hr.xml b/plugin/conf/grouping-and-sorting/hr/hr.xml
index 63ad97c..9f8c447 100755
--- a/plugin/conf/grouping-and-sorting/hr/hr.xml
+++ b/plugin/conf/grouping-and-sorting/hr/hr.xml
@@ -9,7 +9,7 @@
     </description>
     <collation_spec>
         <!-- java_collation_spec>
-		    <include_collation_spec>hr-sort-rules.txt</include_collation_spec>
+		    <include_collation_spec>hr/hr-sort-rules.txt</include_collation_spec>
         </java_collation_spec -->
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/is/is.xml b/plugin/conf/grouping-and-sorting/is/is.xml
index 9a1a4db..b9308e6 100755
--- a/plugin/conf/grouping-and-sorting/is/is.xml
+++ b/plugin/conf/grouping-and-sorting/is/is.xml
@@ -10,7 +10,7 @@
     </description>
     <collation_spec>
         <!-- java_collation_spec>
-	        <include_collation_spec>is-sort-rules.txt</include_collation_spec>
+	        <include_collation_spec>is/is-sort-rules.txt</include_collation_spec>
         </java_collation_spec -->
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/ja/ja.xml b/plugin/conf/grouping-and-sorting/ja/ja.xml
index bcb99c9..8901914 100755
--- a/plugin/conf/grouping-and-sorting/ja/ja.xml
+++ b/plugin/conf/grouping-and-sorting/ja/ja.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <use_java_collator/>
         <java_collation_spec>
-            <include_collation_spec>ja-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>ja/ja-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/kk/kk.xml b/plugin/conf/grouping-and-sorting/kk/kk.xml
index 06311fd..3480c78 100755
--- a/plugin/conf/grouping-and-sorting/kk/kk.xml
+++ b/plugin/conf/grouping-and-sorting/kk/kk.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>kk-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>kk/kk-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/km/km.xml b/plugin/conf/grouping-and-sorting/km/km.xml
index c544f1f..aa80cff 100755
--- a/plugin/conf/grouping-and-sorting/km/km.xml
+++ b/plugin/conf/grouping-and-sorting/km/km.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-	        <include_collation_spec>km-sort-rules.txt</include_collation_spec>
+	        <include_collation_spec>km/km-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/kn/kn.xml b/plugin/conf/grouping-and-sorting/kn/kn.xml
index f884349..545c40a 100755
--- a/plugin/conf/grouping-and-sorting/kn/kn.xml
+++ b/plugin/conf/grouping-and-sorting/kn/kn.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>kn-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>kn/kn-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/ko/ko.xml b/plugin/conf/grouping-and-sorting/ko/ko.xml
index a59d525..f2cd04c 100755
--- a/plugin/conf/grouping-and-sorting/ko/ko.xml
+++ b/plugin/conf/grouping-and-sorting/ko/ko.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>ko-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>ko/ko-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/lo/lo.xml b/plugin/conf/grouping-and-sorting/lo/lo.xml
index d1e8245..b5801dd 100755
--- a/plugin/conf/grouping-and-sorting/lo/lo.xml
+++ b/plugin/conf/grouping-and-sorting/lo/lo.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>lo-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>lo/lo-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/lt/lt.xml b/plugin/conf/grouping-and-sorting/lt/lt.xml
index fc22dfa..a9f4137 100755
--- a/plugin/conf/grouping-and-sorting/lt/lt.xml
+++ b/plugin/conf/grouping-and-sorting/lt/lt.xml
@@ -9,7 +9,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>lt-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>lt/lt-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/lv/lv.xml b/plugin/conf/grouping-and-sorting/lv/lv.xml
index 4d46e34..f22e165 100755
--- a/plugin/conf/grouping-and-sorting/lv/lv.xml
+++ b/plugin/conf/grouping-and-sorting/lv/lv.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>lv-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>lv/lv-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/my/my.xml b/plugin/conf/grouping-and-sorting/my/my.xml
index 6272528..cda1211 100755
--- a/plugin/conf/grouping-and-sorting/my/my.xml
+++ b/plugin/conf/grouping-and-sorting/my/my.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>my-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>my/my-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/nl/nl.xml b/plugin/conf/grouping-and-sorting/nl/nl.xml
index a1e4988..4befcd1 100755
--- a/plugin/conf/grouping-and-sorting/nl/nl.xml
+++ b/plugin/conf/grouping-and-sorting/nl/nl.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added to place 'IJ' to after 'Y'. 2006-05-18 -->
         <java_collation_spec>
-            <include_collation_spec>nl-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>nl/nl-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/no/no.xml b/plugin/conf/grouping-and-sorting/no/no.xml
index dfff07d..08bb80e 100755
--- a/plugin/conf/grouping-and-sorting/no/no.xml
+++ b/plugin/conf/grouping-and-sorting/no/no.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added temporaray to place U+00C6, U+00D8, U+00C5 after 'Z'. 2006-05-18 -->
         <java_collation_spec>
-            <include_collation_spec>no-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>no/no-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/pl/pl.xml b/plugin/conf/grouping-and-sorting/pl/pl.xml
index 99c998f..0aec911 100755
--- a/plugin/conf/grouping-and-sorting/pl/pl.xml
+++ b/plugin/conf/grouping-and-sorting/pl/pl.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added to implement upper case to lower case sort sequence. 2006-05-18 -->
         <java_collation_spec>
-            <include_collation_spec>pl-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>pl/pl-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/pt/pt.xml b/plugin/conf/grouping-and-sorting/pt/pt.xml
index 1fffdcc..0f117dc 100755
--- a/plugin/conf/grouping-and-sorting/pt/pt.xml
+++ b/plugin/conf/grouping-and-sorting/pt/pt.xml
@@ -9,7 +9,7 @@
     <collation_spec>
         <!-- Added. 2006-05-18 -->
         <java_collation_spec>
-            <include_collation_spec>pt-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>pt/pt-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/ru/ru.xml b/plugin/conf/grouping-and-sorting/ru/ru.xml
index 6774f10..def714a 100755
--- a/plugin/conf/grouping-and-sorting/ru/ru.xml
+++ b/plugin/conf/grouping-and-sorting/ru/ru.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <java_collation_spec>
                <!-- ADDED 2009-04-17 -->
-	        <include_collation_spec>ru-sort-rules.txt</include_collation_spec>
+	        <include_collation_spec>ru/ru-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/si/si.xml b/plugin/conf/grouping-and-sorting/si/si.xml
index 72579de..354d85f 100755
--- a/plugin/conf/grouping-and-sorting/si/si.xml
+++ b/plugin/conf/grouping-and-sorting/si/si.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-	        <include_collation_spec>si-sort-rules.txt</include_collation_spec>
+	        <include_collation_spec>si/si-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/sk/sk.xml b/plugin/conf/grouping-and-sorting/sk/sk.xml
index 2f9bf29..7005206 100755
--- a/plugin/conf/grouping-and-sorting/sk/sk.xml
+++ b/plugin/conf/grouping-and-sorting/sk/sk.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>sk-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>sk/sk-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/sv/sv.xml b/plugin/conf/grouping-and-sorting/sv/sv.xml
index bc99af0..760542c 100755
--- a/plugin/conf/grouping-and-sorting/sv/sv.xml
+++ b/plugin/conf/grouping-and-sorting/sv/sv.xml
@@ -8,7 +8,7 @@
     <collation_spec>
         <!-- Added to avoid ICU bugs(?) about 'V' and 'W'sorting. 2006-05-18 -->
         <java_collation_spec>
-            <include_collation_spec>sv-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>sv/sv-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/sw/sw.xml b/plugin/conf/grouping-and-sorting/sw/sw.xml
index 2c672ac..bb888b0 100755
--- a/plugin/conf/grouping-and-sorting/sw/sw.xml
+++ b/plugin/conf/grouping-and-sorting/sw/sw.xml
@@ -12,7 +12,7 @@
     </description>
     <collation_spec>
         <!-- java_collation_spec>
-		        <include_collation_spec>sw-sort-rules.txt</include_collation_spec>
+		        <include_collation_spec>sw/sw-sort-rules.txt</include_collation_spec>
 	        </java_collation_spec -->
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/ta/ta.xml b/plugin/conf/grouping-and-sorting/ta/ta.xml
index 09cd2fc..74bdf59 100755
--- a/plugin/conf/grouping-and-sorting/ta/ta.xml
+++ b/plugin/conf/grouping-and-sorting/ta/ta.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>ta-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>ta/ta-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/te/te.xml b/plugin/conf/grouping-and-sorting/te/te.xml
index e57d81d..adba6df 100755
--- a/plugin/conf/grouping-and-sorting/te/te.xml
+++ b/plugin/conf/grouping-and-sorting/te/te.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>te-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>te/te-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/th/th.xml b/plugin/conf/grouping-and-sorting/th/th.xml
index 8b69747..8c6deed 100755
--- a/plugin/conf/grouping-and-sorting/th/th.xml
+++ b/plugin/conf/grouping-and-sorting/th/th.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>th-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>th/th-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/tl/tl.xml b/plugin/conf/grouping-and-sorting/tl/tl.xml
index 49ce28f..3d2036f 100755
--- a/plugin/conf/grouping-and-sorting/tl/tl.xml
+++ b/plugin/conf/grouping-and-sorting/tl/tl.xml
@@ -9,7 +9,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-		        <include_collation_spec>tl-sort-rules.txt</include_collation_spec>
+		        <include_collation_spec>tl/tl-sort-rules.txt</include_collation_spec>
 	    </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/uk/uk.xml b/plugin/conf/grouping-and-sorting/uk/uk.xml
index b4d92e3..df6eb49 100755
--- a/plugin/conf/grouping-and-sorting/uk/uk.xml
+++ b/plugin/conf/grouping-and-sorting/uk/uk.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>uk-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>uk/uk-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/vi/vi.xml b/plugin/conf/grouping-and-sorting/vi/vi.xml
index 25c61dd..f6cace7 100755
--- a/plugin/conf/grouping-and-sorting/vi/vi.xml
+++ b/plugin/conf/grouping-and-sorting/vi/vi.xml
@@ -7,7 +7,7 @@
     </description>
     <collation_spec>
         <java_collation_spec>
-            <include_collation_spec>vi-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>vi/vi-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/plugin/conf/grouping-and-sorting/zh-TW/zh-TW.xml b/plugin/conf/grouping-and-sorting/zh-TW/zh-TW.xml
index b4ad9e0..53f2dd5 100755
--- a/plugin/conf/grouping-and-sorting/zh-TW/zh-TW.xml
+++ b/plugin/conf/grouping-and-sorting/zh-TW/zh-TW.xml
@@ -11,7 +11,7 @@
         <!--use_java_collator/-->
         <!--replace_rules/-->
         <java_collation_spec>
-            <include_collation_spec>zh-TW-sort-rules.txt</include_collation_spec>
+            <include_collation_spec>zh-TW/zh-TW-sort-rules.txt</include_collation_spec>
         </java_collation_spec>
     </collation_spec>
     <sort_method>
diff --git a/src/main/java/org/ditacommunity/i18n/collation/ZhCnAwareCollator.java b/src/main/java/org/ditacommunity/i18n/collation/ZhCnAwareCollator.java
index 553e227..49631e3 100644
--- a/src/main/java/org/ditacommunity/i18n/collation/ZhCnAwareCollator.java
+++ b/src/main/java/org/ditacommunity/i18n/collation/ZhCnAwareCollator.java
@@ -51,7 +51,7 @@ private RuleBasedCollator getConfiguredICUCollator(Locale locale) {
         // resolution catalog to resolve it.
         final File myJarFile = new File(ZhCnAwareCollator.class.getProtectionDomain().getCodeSource().getLocation().getPath());
         final File configFile =
-                new File(myJarFile.getParent(),
+                new File(myJarFile.getParentFile().getParentFile(),
                          CONF_GROUPING_AND_SORTING_GROUPING_AND_SORTING_RULES_XML);
         RuleBasedCollator collator;
         GroupingAndSortingHelper helper = null;
@@ -67,6 +67,7 @@ private RuleBasedCollator getConfiguredICUCollator(Locale locale) {
 
     @Override
     public int compareStrings(String source, String target) {
+
         return this.compare(source, target);
     }
 
@@ -113,7 +114,9 @@ public int compare(String source, String target) {
                 result = delegate.compare(source, target);
             }
         } else {
+//            System.out.println("+ [DEBUG] ZhCnAwareCollator.compare(): Using delegate comparator on \"" + source + "\", \"" + target + "\"");
             result = delegate.compare(source, target);
+//            System.out.println("+ [DEBUG] ZhCnAwareCollator.compare(): Returning \"" + result + "\"");
         }
         return result;
     }
diff --git a/src/main/java/org/ditacommunity/i18n/saxon/DCI18nCollationUriResolver91.java b/src/main/java/org/ditacommunity/i18n/saxon/DCI18nCollationUriResolver91.java
index 309417d..2fb5688 100644
--- a/src/main/java/org/ditacommunity/i18n/saxon/DCI18nCollationUriResolver91.java
+++ b/src/main/java/org/ditacommunity/i18n/saxon/DCI18nCollationUriResolver91.java
@@ -6,6 +6,10 @@
 import net.sf.saxon.sort.StringCollator;
 import org.ditacommunity.i18n.collation.ZhCnAwareCollator;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
 /**
  * Resolves references to the DITA Community zh-CN URI resolver, setting the
  * properties specified on the URI.
@@ -15,12 +19,27 @@ public class DCI18nCollationUriResolver91 extends DCI18nCollationUriResolverBase
 
     private final StandardCollationURIResolver defaultResolver;
 
+    private static final Properties versionProps = new Properties();
+
+    static {
+        try {
+            InputStream inStream = DCI18nCollationUriResolver91.class.getResourceAsStream("version.properties");
+            if (null != inStream) {
+                versionProps.load(inStream);
+            }
+        } catch (Exception e) {
+            System.err.println("Failed to load version.properties resource from jar file. This should not happen.");
+        }
+
+    }
+
     public DCI18nCollationUriResolver91() {
         super();
         defaultResolver = StandardCollationURIResolver.getInstance();
     }
 
     public StringCollator resolve(String uri, String base, Configuration configuration) {
+        System.out.println("DCI18nCollationUriResolver91 version " + DCI18nCollationUriResolver91.getVersion());
         System.out.println("+ [DEBUG] DCI18nCollationUriResolver91.resolve(): Collation URI=\"" + uri + "\"");
         ZhCnAwareCollator collator = resolveToZhCnAwareCollator(uri);
         if (null == collator) {
@@ -31,4 +50,8 @@ public StringCollator resolve(String uri, String base, Configuration configurati
         return (StringCollator)collator;
     }
 
+    private static String getVersion() {
+        return versionProps.getProperty("version", "Version not set");
+    }
+
 }
diff --git a/src/test/java/org/ditacommunity/i18n/saxon/TestSaxonFactorySetup.java b/src/test/java/org/ditacommunity/i18n/saxon/TestSaxonFactorySetup.java
index aecac92..bd7e104 100644
--- a/src/test/java/org/ditacommunity/i18n/saxon/TestSaxonFactorySetup.java
+++ b/src/test/java/org/ditacommunity/i18n/saxon/TestSaxonFactorySetup.java
@@ -43,6 +43,9 @@ public void testSaxonSetup91() throws Exception {
         assertTrue("Not an ICU collator", collator instanceof ZhCnAwareCollator);
         RuleBasedCollator delegate = ((ZhCnAwareCollator)collator).getBackingCollator();
         assertNotNull(delegate);
+        collator = resolver.resolve(DCI18nCollationUriResolver91.DITA_COMMUNITY_I18N_ZH_CNAWARE_COLLATOR + "?lang=es-ES", "", null);
+        assertNotNull(collator);
+        delegate = ((ZhCnAwareCollator)collator).getBackingCollator();
 
     }
 
diff --git a/version.properties b/version.properties
index a646c94..33aa3f7 100644
--- a/version.properties
+++ b/version.properties
@@ -1 +1 @@
-version=0.1.1
\ No newline at end of file
+version=0.1.2