diff --git a/downloadsites/committers/README.txt b/downloadsites/webtools/committers/README.txt
similarity index 100%
rename from downloadsites/committers/README.txt
rename to downloadsites/webtools/committers/README.txt
diff --git a/downloadsites/committers/access_err.gif b/downloadsites/webtools/committers/access_err.gif
similarity index 100%
rename from downloadsites/committers/access_err.gif
rename to downloadsites/webtools/committers/access_err.gif
diff --git a/downloadsites/committers/access_warn.gif b/downloadsites/webtools/committers/access_warn.gif
similarity index 100%
rename from downloadsites/committers/access_warn.gif
rename to downloadsites/webtools/committers/access_warn.gif
diff --git a/downloadsites/committers/api_err.gif b/downloadsites/webtools/committers/api_err.gif
similarity index 100%
rename from downloadsites/committers/api_err.gif
rename to downloadsites/webtools/committers/api_err.gif
diff --git a/downloadsites/committers/api_junit.gif b/downloadsites/webtools/committers/api_junit.gif
similarity index 100%
rename from downloadsites/committers/api_junit.gif
rename to downloadsites/webtools/committers/api_junit.gif
diff --git a/downloadsites/committers/api_removed.gif b/downloadsites/webtools/committers/api_removed.gif
similarity index 100%
rename from downloadsites/committers/api_removed.gif
rename to downloadsites/webtools/committers/api_removed.gif
diff --git a/downloadsites/committers/cleanup.sh b/downloadsites/webtools/committers/cleanup.sh
similarity index 96%
rename from downloadsites/committers/cleanup.sh
rename to downloadsites/webtools/committers/cleanup.sh
index 54cf1b8d3fd4dd0c1ad9133c831489c04b8437ee..3832f38b81b009718ba3e7b1b30181b308164f31 100644
--- a/downloadsites/committers/cleanup.sh
+++ b/downloadsites/webtools/committers/cleanup.sh
@@ -1,33 +1,33 @@
-#!/bin/sh
-# script to delete warm-up builds, except the one promoted
-# the promoted on is left just for safety
-
-
-declaredStream=$1
-declaredDir=$2
-# make sure directories to delete start with same 3 chars as target
-pattern=${declaredDir:0:5}
-
-
-echo restrict to directory names that match $pattern
-echo act on directories older than $declaredDir
-
-
-# example of full form from command line
-# find ./drops -maxdepth 1 -type d -name I-I* -not -cnewer drops/I-I200603180020-200603180020  -exec rm -fr {} \;
-
-
-if [ "$3" != "-doit" ] ; then
-   echo "    This is a dry run. Add -doit to actually remove"
-   thisCommand=" echo " 
-else 
-   thisCommand=" rm -fr "
-fi 
-
-
-
-find ./drops -maxdepth 2 -type d -name "$pattern*" -not -newer "./drops/$declaredStream/$declaredDir" -exec $thisCommand  {} \; 
-
-
-
-
+#!/bin/sh
+# script to delete warm-up builds, except the one promoted
+# the promoted on is left just for safety
+
+
+declaredStream=$1
+declaredDir=$2
+# make sure directories to delete start with same 3 chars as target
+pattern=${declaredDir:0:5}
+
+
+echo restrict to directory names that match $pattern
+echo act on directories older than $declaredDir
+
+
+# example of full form from command line
+# find ./drops -maxdepth 1 -type d -name I-I* -not -cnewer drops/I-I200603180020-200603180020  -exec rm -fr {} \;
+
+
+if [ "$3" != "-doit" ] ; then
+   echo "    This is a dry run. Add -doit to actually remove"
+   thisCommand=" echo " 
+else 
+   thisCommand=" rm -fr "
+fi 
+
+
+
+find ./drops -maxdepth 2 -type d -name "$pattern*" -not -newer "./drops/$declaredStream/$declaredDir" -exec $thisCommand  {} \; 
+
+
+
+
diff --git a/downloadsites/committers/compile_err.gif b/downloadsites/webtools/committers/compile_err.gif
similarity index 100%
rename from downloadsites/committers/compile_err.gif
rename to downloadsites/webtools/committers/compile_err.gif
diff --git a/downloadsites/committers/compile_warn.gif b/downloadsites/webtools/committers/compile_warn.gif
similarity index 100%
rename from downloadsites/committers/compile_warn.gif
rename to downloadsites/webtools/committers/compile_warn.gif
diff --git a/downloadsites/committers/declare.sh b/downloadsites/webtools/committers/declare.sh
similarity index 97%
rename from downloadsites/committers/declare.sh
rename to downloadsites/webtools/committers/declare.sh
index fa8b52c8b0bae1fe7088f68f7817f86a42902b29..c80e14df089f6b83efd9027085ffe3d3efd90c5a 100644
--- a/downloadsites/committers/declare.sh
+++ b/downloadsites/webtools/committers/declare.sh
@@ -1,24 +1,24 @@
-echo $1 $2
-
-declaredStream=$1
-declaredDir=$2
-
-FROMDIR=../committers/drops
-TODIR=../downloads/drops/${declaredStream}
-FROMDIR=$FROMDIR/${declaredStream}/${declaredDir}
-echo  "declaring build ${declaredDir} on buildstream  ${declaredStream}"
-echo  "   into ${TODIR}"
-echo  "   using the build from ${FROMDIR}"
-
-
-cp -R ${FROMDIR} ${TODIR}
-
-fromString="committers/drops/${declaredStream}/"
-toString="downloads/drops/${declaredStream}/"
-replaceCommand="s!${fromString}!${toString}!g"
-
-perl -w -pi -e ${replaceCommand} ${TODIR}/${declaredDir}/*.php
-
-#       update the update site
-#cp -ruv $HOME/downloads/webtools/committers/drops/$1/updateSite/features/   $HOME/downloads/webtools/milestones/
-#cp -ruv $HOME/downloads/webtools/committers/drops/$1/updateSite/plugins/   $HOME/downloads/webtools/milestones/
+echo $1 $2
+
+declaredStream=$1
+declaredDir=$2
+
+FROMDIR=../committers/drops
+TODIR=../downloads/drops/${declaredStream}
+FROMDIR=$FROMDIR/${declaredStream}/${declaredDir}
+echo  "declaring build ${declaredDir} on buildstream  ${declaredStream}"
+echo  "   into ${TODIR}"
+echo  "   using the build from ${FROMDIR}"
+
+
+cp -R ${FROMDIR} ${TODIR}
+
+fromString="committers/drops/${declaredStream}/"
+toString="downloads/drops/${declaredStream}/"
+replaceCommand="s!${fromString}!${toString}!g"
+
+perl -w -pi -e ${replaceCommand} ${TODIR}/${declaredDir}/*.php
+
+#       update the update site
+#cp -ruv $HOME/downloads/webtools/committers/drops/$1/updateSite/features/   $HOME/downloads/webtools/milestones/
+#cp -ruv $HOME/downloads/webtools/committers/drops/$1/updateSite/plugins/   $HOME/downloads/webtools/milestones/
diff --git a/downloadsites/committers/declareUpdates.sh b/downloadsites/webtools/committers/declareUpdates.sh
similarity index 96%
rename from downloadsites/committers/declareUpdates.sh
rename to downloadsites/webtools/committers/declareUpdates.sh
index 0095491044ad72ecdb3faf2716114ca024bd6102..e49cdf067bbac0ed6ec06bc69e372b2bdc845264 100644
--- a/downloadsites/committers/declareUpdates.sh
+++ b/downloadsites/webtools/committers/declareUpdates.sh
@@ -1,17 +1,17 @@
-
-declaredStream=$1
-declaredDir=$2
-
-FROMDIR=$HOME/downloads/webtools/committers/drops
-FROMDIR=$FROMDIR/${declaredStream}/${declaredDir}/updateSite
-
-TODIR=$HOME/downloads/webtools/declaredUpdates
-
-echo  "declaring update ${declaredDir} on buildstream  ${declaredStream}"
-echo  "   into ${TODIR}"
-echo  "   using the build from ${FROMDIR}"
-
-
-# update the update site with changes only
-rsync --ignore-existing -rv $FROMDIR/features $TODIR
-rsync --ignore-existing -rv $FROMDIR/plugins $TODIR
+
+declaredStream=$1
+declaredDir=$2
+
+FROMDIR=$HOME/downloads/webtools/committers/drops
+FROMDIR=$FROMDIR/${declaredStream}/${declaredDir}/updateSite
+
+TODIR=$HOME/downloads/webtools/declaredUpdates
+
+echo  "declaring update ${declaredDir} on buildstream  ${declaredStream}"
+echo  "   into ${TODIR}"
+echo  "   using the build from ${FROMDIR}"
+
+
+# update the update site with changes only
+rsync --ignore-existing -rv $FROMDIR/features $TODIR
+rsync --ignore-existing -rv $FROMDIR/plugins $TODIR
diff --git a/downloadsites/committers/dlconfig.txt b/downloadsites/webtools/committers/dlconfig.txt
similarity index 100%
rename from downloadsites/committers/dlconfig.txt
rename to downloadsites/webtools/committers/dlconfig.txt
diff --git a/downloadsites/committers/editedindex.php b/downloadsites/webtools/committers/editedindex.php
similarity index 100%
rename from downloadsites/committers/editedindex.php
rename to downloadsites/webtools/committers/editedindex.php
diff --git a/downloadsites/committers/fixPendingHack.sh b/downloadsites/webtools/committers/fixPendingHack.sh
similarity index 96%
rename from downloadsites/committers/fixPendingHack.sh
rename to downloadsites/webtools/committers/fixPendingHack.sh
index 27e88f595a13d764413d19c092a4f2b940e194b9..e9701be1e9e5695db94f82430410c2905d986083 100644
--- a/downloadsites/committers/fixPendingHack.sh
+++ b/downloadsites/webtools/committers/fixPendingHack.sh
@@ -1,10 +1,10 @@
-#!/bin/sh
-
-
-
-fromString="\<font size=\"-1\" color=\"#FF0000\"\>pending\</font\>"
-toString="\<img src = \"OK.gif\" width=19 height=23\>"
-replaceCommand="s!${fromString}!${toString}!g"
-echo "replaceCommand: ${replaceCommand}"
-perl -w -pi -e "${replaceCommand}" index.php
- 
+#!/bin/sh
+
+
+
+fromString="\<font size=\"-1\" color=\"#FF0000\"\>pending\</font\>"
+toString="\<img src = \"OK.gif\" width=19 height=23\>"
+replaceCommand="s!${fromString}!${toString}!g"
+echo "replaceCommand: ${replaceCommand}"
+perl -w -pi -e "${replaceCommand}" index.php
+ 
diff --git a/downloadsites/committers/index.php b/downloadsites/webtools/committers/index.php
similarity index 100%
rename from downloadsites/committers/index.php
rename to downloadsites/webtools/committers/index.php
diff --git a/downloadsites/committers/junit_err.gif b/downloadsites/webtools/committers/junit_err.gif
similarity index 100%
rename from downloadsites/committers/junit_err.gif
rename to downloadsites/webtools/committers/junit_err.gif
diff --git a/downloadsites/committers/pending.gif b/downloadsites/webtools/committers/pending.gif
similarity index 100%
rename from downloadsites/committers/pending.gif
rename to downloadsites/webtools/committers/pending.gif
diff --git a/downloadsites/committers/pending1.gif b/downloadsites/webtools/committers/pending1.gif
similarity index 100%
rename from downloadsites/committers/pending1.gif
rename to downloadsites/webtools/committers/pending1.gif
diff --git a/downloadsites/committers/report.php b/downloadsites/webtools/committers/report.php
similarity index 100%
rename from downloadsites/committers/report.php
rename to downloadsites/webtools/committers/report.php
diff --git a/downloadsites/committers/report2.php b/downloadsites/webtools/committers/report2.php
similarity index 100%
rename from downloadsites/committers/report2.php
rename to downloadsites/webtools/committers/report2.php
diff --git a/downloadsites/committers/wtplogonarrow.jpg b/downloadsites/webtools/committers/wtplogonarrow.jpg
similarity index 100%
rename from downloadsites/committers/wtplogonarrow.jpg
rename to downloadsites/webtools/committers/wtplogonarrow.jpg
diff --git a/downloadsites/downloads/README.txt b/downloadsites/webtools/downloads/README.txt
similarity index 100%
rename from downloadsites/downloads/README.txt
rename to downloadsites/webtools/downloads/README.txt
diff --git a/downloadsites/downloads/access_err.gif b/downloadsites/webtools/downloads/access_err.gif
similarity index 100%
rename from downloadsites/downloads/access_err.gif
rename to downloadsites/webtools/downloads/access_err.gif
diff --git a/downloadsites/downloads/access_warn.gif b/downloadsites/webtools/downloads/access_warn.gif
similarity index 100%
rename from downloadsites/downloads/access_warn.gif
rename to downloadsites/webtools/downloads/access_warn.gif
diff --git a/downloadsites/downloads/api_err.gif b/downloadsites/webtools/downloads/api_err.gif
similarity index 100%
rename from downloadsites/downloads/api_err.gif
rename to downloadsites/webtools/downloads/api_err.gif
diff --git a/downloadsites/downloads/api_junit.gif b/downloadsites/webtools/downloads/api_junit.gif
similarity index 100%
rename from downloadsites/downloads/api_junit.gif
rename to downloadsites/webtools/downloads/api_junit.gif
diff --git a/downloadsites/downloads/api_removed.gif b/downloadsites/webtools/downloads/api_removed.gif
similarity index 100%
rename from downloadsites/downloads/api_removed.gif
rename to downloadsites/webtools/downloads/api_removed.gif
diff --git a/downloadsites/downloads/compile_err.gif b/downloadsites/webtools/downloads/compile_err.gif
similarity index 100%
rename from downloadsites/downloads/compile_err.gif
rename to downloadsites/webtools/downloads/compile_err.gif
diff --git a/downloadsites/downloads/compile_warn.gif b/downloadsites/webtools/downloads/compile_warn.gif
similarity index 100%
rename from downloadsites/downloads/compile_warn.gif
rename to downloadsites/webtools/downloads/compile_warn.gif
diff --git a/downloadsites/downloads/dlconfig.txt b/downloadsites/webtools/downloads/dlconfig.txt
similarity index 100%
rename from downloadsites/downloads/dlconfig.txt
rename to downloadsites/webtools/downloads/dlconfig.txt
diff --git a/downloadsites/downloads/index.php b/downloadsites/webtools/downloads/index.php
similarity index 100%
rename from downloadsites/downloads/index.php
rename to downloadsites/webtools/downloads/index.php
diff --git a/downloadsites/downloads/junit_err.gif b/downloadsites/webtools/downloads/junit_err.gif
similarity index 100%
rename from downloadsites/downloads/junit_err.gif
rename to downloadsites/webtools/downloads/junit_err.gif
diff --git a/downloadsites/downloads/pending.gif b/downloadsites/webtools/downloads/pending.gif
similarity index 100%
rename from downloadsites/downloads/pending.gif
rename to downloadsites/webtools/downloads/pending.gif
diff --git a/downloadsites/downloads/pending1.gif b/downloadsites/webtools/downloads/pending1.gif
similarity index 100%
rename from downloadsites/downloads/pending1.gif
rename to downloadsites/webtools/downloads/pending1.gif
diff --git a/downloadsites/downloads/report.php b/downloadsites/webtools/downloads/report.php
similarity index 100%
rename from downloadsites/downloads/report.php
rename to downloadsites/webtools/downloads/report.php
diff --git a/downloadsites/downloads/report2.php b/downloadsites/webtools/downloads/report2.php
similarity index 100%
rename from downloadsites/downloads/report2.php
rename to downloadsites/webtools/downloads/report2.php
diff --git a/downloadsites/downloads/wtplogonarrow.jpg b/downloadsites/webtools/downloads/wtplogonarrow.jpg
similarity index 100%
rename from downloadsites/downloads/wtplogonarrow.jpg
rename to downloadsites/webtools/downloads/wtplogonarrow.jpg