diff --git a/ciform/trunk/LICENSE.txt b/ciform/LICENSE.txt
similarity index 100%
rename from ciform/trunk/LICENSE.txt
rename to ciform/LICENSE.txt
diff --git a/ciform/trunk/Makefile b/ciform/Makefile
similarity index 100%
rename from ciform/trunk/Makefile
rename to ciform/Makefile
diff --git a/ciform/trunk/README.txt b/ciform/README.txt
similarity index 100%
rename from ciform/trunk/README.txt
rename to ciform/README.txt
diff --git a/ciform/trunk/common.properties b/ciform/common.properties
similarity index 100%
rename from ciform/trunk/common.properties
rename to ciform/common.properties
diff --git a/ciform/trunk/src/main/javascript/ivy.xml b/ciform/src/main/javascript/ivy.xml
similarity index 100%
rename from ciform/trunk/src/main/javascript/ivy.xml
rename to ciform/src/main/javascript/ivy.xml
diff --git a/ciform/trunk/src/main/javascript/src/main/javascript/ciform.js b/ciform/src/main/javascript/src/main/javascript/ciform.js
similarity index 100%
rename from ciform/trunk/src/main/javascript/src/main/javascript/ciform.js
rename to ciform/src/main/javascript/src/main/javascript/ciform.js
diff --git a/ciform/trunk/src/main/javascript/src/main/javascript/minilib.js b/ciform/src/main/javascript/src/main/javascript/minilib.js
similarity index 100%
rename from ciform/trunk/src/main/javascript/src/main/javascript/minilib.js
rename to ciform/src/main/javascript/src/main/javascript/minilib.js
diff --git a/ciform/trunk/src/main/javascript/test/javascript/ciform.css b/ciform/src/main/javascript/test/javascript/ciform.css
similarity index 100%
rename from ciform/trunk/src/main/javascript/test/javascript/ciform.css
rename to ciform/src/main/javascript/test/javascript/ciform.css
diff --git a/ciform/trunk/src/main/javascript/test/javascript/ciform.html b/ciform/src/main/javascript/test/javascript/ciform.html
similarity index 100%
rename from ciform/trunk/src/main/javascript/test/javascript/ciform.html
rename to ciform/src/main/javascript/test/javascript/ciform.html
diff --git a/ciform/trunk/src/main/javascript/test/javascript/scrapbook.html b/ciform/src/main/javascript/test/javascript/scrapbook.html
similarity index 100%
rename from ciform/trunk/src/main/javascript/test/javascript/scrapbook.html
rename to ciform/src/main/javascript/test/javascript/scrapbook.html
diff --git a/ciform/trunk/src/main/php/build.php b/ciform/src/main/php/build.php
similarity index 100%
rename from ciform/trunk/src/main/php/build.php
rename to ciform/src/main/php/build.php
diff --git a/ciform/trunk/src/main/php/build.xml b/ciform/src/main/php/build.xml
similarity index 100%
rename from ciform/trunk/src/main/php/build.xml
rename to ciform/src/main/php/build.xml
diff --git a/ciform/trunk/src/main/php/src/main/php/ciform/ciform.php b/ciform/src/main/php/src/main/php/ciform/ciform.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/ciform/ciform.php
rename to ciform/src/main/php/src/main/php/ciform/ciform.php
diff --git a/ciform/trunk/src/main/php/src/main/php/ciform/schemes/core.php b/ciform/src/main/php/src/main/php/ciform/schemes/core.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/ciform/schemes/core.php
rename to ciform/src/main/php/src/main/php/ciform/schemes/core.php
diff --git a/ciform/trunk/src/main/php/src/main/php/crypto/Cipher.class.php b/ciform/src/main/php/src/main/php/crypto/Cipher.class.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/crypto/Cipher.class.php
rename to ciform/src/main/php/src/main/php/crypto/Cipher.class.php
diff --git a/ciform/trunk/src/main/php/src/main/php/crypto/ciphers/core.php b/ciform/src/main/php/src/main/php/crypto/ciphers/core.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/crypto/ciphers/core.php
rename to ciform/src/main/php/src/main/php/crypto/ciphers/core.php
diff --git a/ciform/trunk/src/main/php/src/main/php/crypto/ciphers/pgp.php b/ciform/src/main/php/src/main/php/crypto/ciphers/pgp.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/crypto/ciphers/pgp.php
rename to ciform/src/main/php/src/main/php/crypto/ciphers/pgp.php
diff --git a/ciform/trunk/src/main/php/src/main/php/crypto/ciphers/rsa.php b/ciform/src/main/php/src/main/php/crypto/ciphers/rsa.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/crypto/ciphers/rsa.php
rename to ciform/src/main/php/src/main/php/crypto/ciphers/rsa.php
diff --git a/ciform/trunk/src/main/php/src/main/php/demo.php b/ciform/src/main/php/src/main/php/demo.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/demo.php
rename to ciform/src/main/php/src/main/php/demo.php
diff --git a/ciform/trunk/src/main/php/src/main/php/rsatool.php b/ciform/src/main/php/src/main/php/rsatool.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/main/php/rsatool.php
rename to ciform/src/main/php/src/main/php/rsatool.php
diff --git a/ciform/trunk/src/main/php/src/test/php/CiformTest.php b/ciform/src/main/php/src/test/php/CiformTest.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/test/php/CiformTest.php
rename to ciform/src/main/php/src/test/php/CiformTest.php
diff --git a/ciform/trunk/src/main/php/src/test/php/sandbox.php b/ciform/src/main/php/src/test/php/sandbox.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/test/php/sandbox.php
rename to ciform/src/main/php/src/test/php/sandbox.php
diff --git a/ciform/trunk/src/main/php/src/test/php/schemesTest.php b/ciform/src/main/php/src/test/php/schemesTest.php
similarity index 100%
rename from ciform/trunk/src/main/php/src/test/php/schemesTest.php
rename to ciform/src/main/php/src/test/php/schemesTest.php
diff --git a/ciform/trunk/src/main/php/src/test/resources/keys/qrcode-pgp-elg-pub.html b/ciform/src/main/php/src/test/resources/keys/qrcode-pgp-elg-pub.html
similarity index 100%
rename from ciform/trunk/src/main/php/src/test/resources/keys/qrcode-pgp-elg-pub.html
rename to ciform/src/main/php/src/test/resources/keys/qrcode-pgp-elg-pub.html
diff --git a/ciform/trunk/src/main/php/version_generator.php b/ciform/src/main/php/version_generator.php
similarity index 100%
rename from ciform/trunk/src/main/php/version_generator.php
rename to ciform/src/main/php/version_generator.php
diff --git a/ciform/trunk/src/main/pix/ciform-14x14.gif b/ciform/src/main/pix/ciform-14x14.gif
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-14x14.gif
rename to ciform/src/main/pix/ciform-14x14.gif
diff --git a/ciform/trunk/src/main/pix/ciform-14x14.xcf b/ciform/src/main/pix/ciform-14x14.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-14x14.xcf
rename to ciform/src/main/pix/ciform-14x14.xcf
diff --git a/ciform/trunk/src/main/pix/ciform-16x16.gif b/ciform/src/main/pix/ciform-16x16.gif
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-16x16.gif
rename to ciform/src/main/pix/ciform-16x16.gif
diff --git a/ciform/trunk/src/main/pix/ciform-16x16.ico b/ciform/src/main/pix/ciform-16x16.ico
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-16x16.ico
rename to ciform/src/main/pix/ciform-16x16.ico
diff --git a/ciform/trunk/src/main/pix/ciform-18x18.xcf b/ciform/src/main/pix/ciform-18x18.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-18x18.xcf
rename to ciform/src/main/pix/ciform-18x18.xcf
diff --git a/ciform/trunk/src/main/pix/ciform-80x15.gif b/ciform/src/main/pix/ciform-80x15.gif
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-80x15.gif
rename to ciform/src/main/pix/ciform-80x15.gif
diff --git a/ciform/trunk/src/main/pix/ciform-button-48x48.png b/ciform/src/main/pix/ciform-button-48x48.png
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-button-48x48.png
rename to ciform/src/main/pix/ciform-button-48x48.png
diff --git a/ciform/trunk/src/main/pix/ciform-button-48x48.xcf b/ciform/src/main/pix/ciform-button-48x48.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-button-48x48.xcf
rename to ciform/src/main/pix/ciform-button-48x48.xcf
diff --git a/ciform/trunk/src/main/pix/ciform-flat-48x48.png b/ciform/src/main/pix/ciform-flat-48x48.png
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-flat-48x48.png
rename to ciform/src/main/pix/ciform-flat-48x48.png
diff --git a/ciform/trunk/src/main/pix/ciform-title-186x80.png b/ciform/src/main/pix/ciform-title-186x80.png
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-title-186x80.png
rename to ciform/src/main/pix/ciform-title-186x80.png
diff --git a/ciform/trunk/src/main/pix/ciform-title-186x80.xcf b/ciform/src/main/pix/ciform-title-186x80.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-title-186x80.xcf
rename to ciform/src/main/pix/ciform-title-186x80.xcf
diff --git a/ciform/trunk/src/main/pix/ciform-working-14x14.gif b/ciform/src/main/pix/ciform-working-14x14.gif
similarity index 100%
rename from ciform/trunk/src/main/pix/ciform-working-14x14.gif
rename to ciform/src/main/pix/ciform-working-14x14.gif
diff --git a/ciform/trunk/src/main/pix/deprecated/lock-panel.xcf b/ciform/src/main/pix/deprecated/lock-panel.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/deprecated/lock-panel.xcf
rename to ciform/src/main/pix/deprecated/lock-panel.xcf
diff --git a/ciform/trunk/src/main/pix/deprecated/lock-shadow.xcf b/ciform/src/main/pix/deprecated/lock-shadow.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/deprecated/lock-shadow.xcf
rename to ciform/src/main/pix/deprecated/lock-shadow.xcf
diff --git a/ciform/trunk/src/main/pix/deprecated/minikey.xcf b/ciform/src/main/pix/deprecated/minikey.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/deprecated/minikey.xcf
rename to ciform/src/main/pix/deprecated/minikey.xcf
diff --git a/ciform/trunk/src/main/pix/stb-80x15.xcf b/ciform/src/main/pix/stb-80x15.xcf
similarity index 100%
rename from ciform/trunk/src/main/pix/stb-80x15.xcf
rename to ciform/src/main/pix/stb-80x15.xcf
diff --git a/ciform/trunk/crypto/rsa/ivy.xml b/ciform/trunk/crypto/rsa/ivy.xml
deleted file mode 100644
index 24361f5..0000000
--- a/ciform/trunk/crypto/rsa/ivy.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<ivy-module version="2.0">
-    <info organisation="crypto" module="rsa" revision="1.0" status="integration">
-        <license name="Copyright 2000 by John M Hanna" url="http://sourceforge.net/projects/shop-js" />
-        <license name="GNU General Public License (GPL)" url="http://www.gnu.org/copyleft/gpl.html" />
-        <ivyauthor name="Nicolas BONARDELLE" url="http://nicobo.net/contact?subject=crypto+rsa+ivy" />
-        <repository name="plugnauth@sourceforge" url="http://plugnauth.sourceforge.net/ivy" ivys="true" artifacts="true" />
-        <description homepage="http://plugnauth.sourceforge.net/crypto">
-            This library provides an implementation of the RSA cipher.
-        </description>
-    </info>
-    <publications>
-        <!-- The source script as plain text, including all inner informations and comments. -->
-        <artifact name="rsa" type="javascript" ext="js" />
-        <!-- An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. -->
-        <artifact name="rsa-compressed" type="javascript" ext="js" />
-    </publications>
-    <dependencies>
-        <!-- no dependency required -->
-    </dependencies>
-</ivy-module>
\ No newline at end of file
diff --git a/ciform/trunk/crypto/base64/src/main/javascript/base64.js b/codecs/base64/src/main/javascript/base64.js
similarity index 100%
rename from ciform/trunk/crypto/base64/src/main/javascript/base64.js
rename to codecs/base64/src/main/javascript/base64.js
diff --git a/ciform/trunk/crypto/hex/src/main/javascript/hex.js b/codecs/hex/src/main/javascript/hex.js
similarity index 100%
rename from ciform/trunk/crypto/hex/src/main/javascript/hex.js
rename to codecs/hex/src/main/javascript/hex.js
diff --git a/ciform/trunk/crypto/rsa/build.properties b/codecs/rsa/build.properties
similarity index 60%
rename from ciform/trunk/crypto/rsa/build.properties
rename to codecs/rsa/build.properties
index cbc7969..d45294b 100644
--- a/ciform/trunk/crypto/rsa/build.properties
+++ b/codecs/rsa/build.properties
@@ -35,3 +35,31 @@ lib.dir=${target.dir}/lib
 
 # Where to copy the api documentation
 doc.dir=${target.dir}/api
+
+# name of the ivy configurations
+target.conf.min=min
+
+########################################
+#
+# External programs
+#
+########################################
+
+# JsUnit files
+#jsunit.dir=/opt/jsunit
+jsunit.coreJs=${jsunit.dir}/app/jsUnitCore.js
+#jsunit.build=${jsunit.dir}/build.xml
+jsunit.testRunner=${jsunit.dir}/testRunner.html
+#jsunit.browsers=/usr/bin/firefox,/usr/bin/konqueror
+
+# Ivy settings
+#ivy.file = ${basedir}/ivy.xml
+#repository.dir=${target}/ivy
+
+# (required) -> define this property in your "local.properties" file
+# Full path to the jar of the YUI compressor (http://developer.yahoo.com/yui/compressor)
+#yuicompressor.jar=/opt/yuicompressor/yuicompressor.jar
+
+# (required) -> define this property in your "local.properties" file
+# Command line to execute JSDoc (http://jsdoc.sourceforge.net)
+#jsdoc=/opt/JSDoc/jsdoc.pl
\ No newline at end of file
diff --git a/ciform/trunk/crypto/rsa/build.xml b/codecs/rsa/build.xml
similarity index 85%
rename from ciform/trunk/crypto/rsa/build.xml
rename to codecs/rsa/build.xml
index f0869d8..9be7427 100644
--- a/ciform/trunk/crypto/rsa/build.xml
+++ b/codecs/rsa/build.xml
@@ -13,9 +13,6 @@
     <!-- default properties, specific to this project -->
     <property file="local.properties"/>
     <property file="build.properties"/>
-    <!-- properties common to all projects -->
-    <property file="../../local.properties"/>
-    <property file="../../common.properties"/>
 
 
     <!-- ==================== -->
@@ -37,7 +34,7 @@
         <!-- nothing to do -->
     </target>
     
-    <target name="package" depends="test, doc, build-default, build-compressed" description="Takes the compiled code and package it in its distributable format, such as a JAR.">
+    <target name="package" depends="test, doc, build-default, build-min" description="Takes the compiled code and package it in its distributable format, such as a JAR.">
         <!-- nothing more to do -->
     </target>
     
@@ -80,8 +77,8 @@
         <copy file="${src.dir}/rsa.js" tofile="${lib.dir}/rsa-${ivy.revision}.js" />
     </target>
 
-    <target name="build-compressed" depends="validate" description="Builds the compressed version of the package.">
-        <java jar="${yuicompressor.jar}" fork="true" output="${lib.dir}/rsa-compressed-${ivy.revision}.js" failonerror="true">
+    <target name="build-min" depends="validate" description="Builds the minified version of the package.">
+        <java jar="${yuicompressor.jar}" fork="true" output="${lib.dir}/rsa-${target.conf.min}-${ivy.revision}.js" failonerror="true">
             <arg line="--type js" />
             <arg file="${src.dir}/rsa.js"/>
         </java>
@@ -91,12 +88,4 @@
         <delete includeemptydirs="true" dir="${target.dir}"/>
     </target>
 
-
-    <!-- ==================== -->
-    <!-- CruiseControl targets -->
-    <!-- ==================== -->
-    
-    <target name="cruisecontrol-build" depends="verify">
-    </target>
-
 </project>
diff --git a/codecs/rsa/ivy.xml b/codecs/rsa/ivy.xml
new file mode 100644
index 0000000..c5ecc6e
--- /dev/null
+++ b/codecs/rsa/ivy.xml
@@ -0,0 +1,26 @@
+<ivy-module version="2.0">
+    <info organisation="crypto" module="rsa" revision="1.0" status="integration">
+        <license name="Copyright 2000 by John M Hanna" url="http://sourceforge.net/projects/shop-js" />
+        <license name="GNU General Public License (GPL)" url="http://www.gnu.org/copyleft/gpl.html" />
+        <ivyauthor name="Nicolas BONARDELLE" url="http://nicobo.net/contact?subject=crypto+rsa+ivy" />
+        <repository name="nicobo.net" url="http://code.google.com/p/ciform/files" ivys="true" artifacts="true" />
+        <description homepage="http://code.google.com/p/ciform">
+            This library provides a Javascript implementation of the RSA cipher.
+        </description>
+    </info>
+    <configurations>
+      <conf name="src"/>
+      <conf name="min"/>
+    </configurations>
+    <publications>
+        <artifact name="rsa" type="javascript" ext="js">
+            <!-- The source script as plain text, including all inner informations and comments. -->
+            <conf name="src" />
+            <!-- An obfuscated, size-reduced version of the script. Use to speed up loading time in final environment. -->
+            <conf name="min" />
+        </artifact>
+    </publications>
+    <dependencies>
+        <!-- no dependency required -->
+    </dependencies>
+</ivy-module>
\ No newline at end of file
diff --git a/codecs/rsa/local.properties b/codecs/rsa/local.properties
new file mode 100644
index 0000000..353f045
--- /dev/null
+++ b/codecs/rsa/local.properties
@@ -0,0 +1,19 @@
+# JsUnit files
+#jsunit.dir=/opt/jsunit
+jsunit.coreJs=${jsunit.dir}/app/jsUnitCore.js
+#jsunit.build=${jsunit.dir}/build.xml
+jsunit.testRunner=${jsunit.dir}/testRunner.html
+#jsunit.browsers=/usr/bin/firefox,/usr/bin/konqueror
+
+# Ivy settings
+ant.ivytask.path=C:/IBM/SDPShared/plugins/org.apache.ant_1.7.0.v200803061910/lib/ivy.jar
+#ivy.file = ${basedir}/ivy.xml
+#repository.dir=${target}/ivy
+
+# (required) -> define this property in your "local.properties" file
+# Full path to the jar of the YUI compressor (http://developer.yahoo.com/yui/compressor)
+yuicompressor.jar=../tools/yuicompressor-2.4.7.jar
+
+# (required) -> define this property in your "local.properties" file
+# Command line to execute JSDoc (http://jsdoc.sourceforge.net)
+jsdoc=../tools/JSDoc/jsdoc.pl
\ No newline at end of file
diff --git a/ciform/trunk/crypto/rsa/src/main/javascript/rsa.js b/codecs/rsa/src/main/javascript/rsa.js
similarity index 90%
rename from ciform/trunk/crypto/rsa/src/main/javascript/rsa.js
rename to codecs/rsa/src/main/javascript/rsa.js
index 314bcc8..21c1180 100644
--- a/ciform/trunk/crypto/rsa/src/main/javascript/rsa.js
+++ b/codecs/rsa/src/main/javascript/rsa.js
@@ -1,3 +1,12 @@
+//
+// NOTE : The original code is wrapped so that the defined functions don't collide with existing ones.
+// See http://michaux.ca/articles/javascript-namespacing.
+//
+Crypto_RSA = (function() {
+
+//
+// START OF ORIGINAL CODE
+//
 
 /* RSA public key encryption/decryption
  * The following functions are (c) 2000 by John M Hanna and are
@@ -392,3 +401,13 @@ function b2mpi(b)
  return rr;
 }
 
+//
+// END OF ORIGINAL CODE
+//
+
+return {
+ encrypt: RSAencrypt,
+ decrypt: RSAdecrypt
+};
+
+})();
\ No newline at end of file
diff --git a/ciform/trunk/crypto/sha1/build.properties b/codecs/sha1/build.properties
similarity index 100%
rename from ciform/trunk/crypto/sha1/build.properties
rename to codecs/sha1/build.properties
diff --git a/ciform/trunk/crypto/sha1/build.xml b/codecs/sha1/build.xml
similarity index 100%
rename from ciform/trunk/crypto/sha1/build.xml
rename to codecs/sha1/build.xml
diff --git a/ciform/trunk/crypto/sha1/ivy.xml b/codecs/sha1/ivy.xml
similarity index 100%
rename from ciform/trunk/crypto/sha1/ivy.xml
rename to codecs/sha1/ivy.xml
diff --git a/ciform/trunk/crypto/sha1/src/main/javascript/sha1.js b/codecs/sha1/src/main/javascript/sha1.js
similarity index 100%
rename from ciform/trunk/crypto/sha1/src/main/javascript/sha1.js
rename to codecs/sha1/src/main/javascript/sha1.js
diff --git a/ciform/trunk/crypto/sha1/src/test/javascript/sha1-test.js b/codecs/sha1/src/test/javascript/sha1-test.js
similarity index 100%
rename from ciform/trunk/crypto/sha1/src/test/javascript/sha1-test.js
rename to codecs/sha1/src/test/javascript/sha1-test.js
diff --git a/ciform/trunk/tools/ant-jsunit/lib/ant-junit.jar b/tools/ant-jsunit/lib/ant-junit.jar
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/lib/ant-junit.jar
rename to tools/ant-jsunit/lib/ant-junit.jar
diff --git a/ciform/trunk/tools/ant-jsunit/lib/ant.jar b/tools/ant-jsunit/lib/ant.jar
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/lib/ant.jar
rename to tools/ant-jsunit/lib/ant.jar
diff --git a/ciform/trunk/tools/ant-jsunit/lib/apache-ant-1.7.1-src.zip b/tools/ant-jsunit/lib/apache-ant-1.7.1-src.zip
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/lib/apache-ant-1.7.1-src.zip
rename to tools/ant-jsunit/lib/apache-ant-1.7.1-src.zip
diff --git a/ciform/trunk/tools/ant-jsunit/lib/jsunit.jar b/tools/ant-jsunit/lib/jsunit.jar
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/lib/jsunit.jar
rename to tools/ant-jsunit/lib/jsunit.jar
diff --git a/ciform/trunk/tools/ant-jsunit/lib/junit.jar b/tools/ant-jsunit/lib/junit.jar
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/lib/junit.jar
rename to tools/ant-jsunit/lib/junit.jar
diff --git a/ciform/trunk/tools/ant-jsunit/src/main/java/net/jsunit/ant/JsUnitTestTask.java b/tools/ant-jsunit/src/main/java/net/jsunit/ant/JsUnitTestTask.java
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/src/main/java/net/jsunit/ant/JsUnitTestTask.java
rename to tools/ant-jsunit/src/main/java/net/jsunit/ant/JsUnitTestTask.java
diff --git a/ciform/trunk/tools/ant-jsunit/src/main/java/net/jsunit/ant/StandaloneTestTask.java b/tools/ant-jsunit/src/main/java/net/jsunit/ant/StandaloneTestTask.java
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/src/main/java/net/jsunit/ant/StandaloneTestTask.java
rename to tools/ant-jsunit/src/main/java/net/jsunit/ant/StandaloneTestTask.java
diff --git a/ciform/trunk/tools/ant-jsunit/src/main/resources/net/jsunit/ant/TestSuite.html b/tools/ant-jsunit/src/main/resources/net/jsunit/ant/TestSuite.html
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/src/main/resources/net/jsunit/ant/TestSuite.html
rename to tools/ant-jsunit/src/main/resources/net/jsunit/ant/TestSuite.html
diff --git a/ciform/trunk/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedConfigurationSource.java b/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedConfigurationSource.java
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedConfigurationSource.java
rename to tools/ant-jsunit/src/test/java/net/jsunit/GeneratedConfigurationSource.java
diff --git a/ciform/trunk/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedStandaloneTest.java b/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedStandaloneTest.java
similarity index 100%
rename from ciform/trunk/tools/ant-jsunit/src/test/java/net/jsunit/GeneratedStandaloneTest.java
rename to tools/ant-jsunit/src/test/java/net/jsunit/GeneratedStandaloneTest.java
diff --git a/tools/jsdoc_toolkit-2.4.0.zip b/tools/jsdoc_toolkit-2.4.0.zip
new file mode 100644
index 0000000..c5d2800
Binary files /dev/null and b/tools/jsdoc_toolkit-2.4.0.zip differ
diff --git a/ciform/trunk/tools/build/kde/runMiniFox.sh b/tools/kde/runMiniFox.sh
similarity index 100%
rename from ciform/trunk/tools/build/kde/runMiniFox.sh
rename to tools/kde/runMiniFox.sh
diff --git a/ciform/trunk/tools/build/kde/runMiniKonqi.sh b/tools/kde/runMiniKonqi.sh
similarity index 100%
rename from ciform/trunk/tools/build/kde/runMiniKonqi.sh
rename to tools/kde/runMiniKonqi.sh
diff --git a/tools/yuicompressor-2.4.7.zip b/tools/yuicompressor-2.4.7.zip
new file mode 100644
index 0000000..61e8653
Binary files /dev/null and b/tools/yuicompressor-2.4.7.zip differ