diff --git a/Tools/Install/build.xml b/Tools/Install/build.xml
index d4dc9ad45..64ed04831 100644
--- a/Tools/Install/build.xml
+++ b/Tools/Install/build.xml
@@ -24,14 +24,10 @@
-
+
-
-
-
-
-
-
+
+
diff --git a/Tools/Jars/ant-apache-bsf-1.7.0.jar b/Tools/Utilities/ant-apache-bsf-1.7.0.jar
similarity index 100%
rename from Tools/Jars/ant-apache-bsf-1.7.0.jar
rename to Tools/Utilities/ant-apache-bsf-1.7.0.jar
diff --git a/Tools/Jars/bsf.jar b/Tools/Utilities/bsf.jar
similarity index 100%
rename from Tools/Jars/bsf.jar
rename to Tools/Utilities/bsf.jar
diff --git a/Tools/Utilities/build.xml b/Tools/Utilities/build.xml
index 5e790434e..ee2864b37 100644
--- a/Tools/Utilities/build.xml
+++ b/Tools/Utilities/build.xml
@@ -13,8 +13,12 @@
-
+
+
+
+
+
diff --git a/Tools/Jars/commons-logging-1.1.jar b/Tools/Utilities/commons-logging-1.1.jar
similarity index 100%
rename from Tools/Jars/commons-logging-1.1.jar
rename to Tools/Utilities/commons-logging-1.1.jar
diff --git a/Tools/Jars/js.jar b/Tools/Utilities/js.jar
similarity index 100%
rename from Tools/Jars/js.jar
rename to Tools/Utilities/js.jar
diff --git a/Tools/build.xml b/Tools/build.xml
index a363ec65b..1ee910bd1 100644
--- a/Tools/build.xml
+++ b/Tools/build.xml
@@ -33,10 +33,6 @@
-
-
-
-
diff --git a/common.xml b/common.xml
index a6c340149..e28c94b79 100644
--- a/common.xml
+++ b/common.xml
@@ -11,15 +11,14 @@
-
-
+
-
-
-
+
+
+
@@ -34,7 +33,6 @@
-