some cleanup and corrections
diff --git a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
index c27ce21..bfaa970 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -192,7 +192,7 @@
newDir=${newBaseDir}
copyAndRemove $oldDir $newDir
-oldBaseDir=${oldcvsdir}/wst/components
+oldBaseDir=${oldcvsdir}/wst/components/common
newBaseDir=${newcvsdir}/common
wtpmodule=features
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
index 2dc6c55..4aea2c2 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveejb.sh
@@ -33,7 +33,7 @@
newDir=${newcvsdir}/ejbtools/tests
copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/doc/plugins/org.eclipse.jst.ejb.doc.user
+oldDir=${oldcvsdir}/jst/components/doc/plugins/org.eclipse.jst.ejb.doc.user
newDir=${newcvsdir}/ejbtools/docs
copyAndRemove $oldDir $newDir
@@ -41,7 +41,7 @@
newDir=${newcvsdir}/ejbtools/plugins
copyAndRemove $oldDir $newDir
-oldDir=${oldcvsdir}/jst/components/org.eclipse.jst.jee.ejb
+oldDir=${oldcvsdir}/jst/components/j2ee/plugins/org.eclipse.jst.jee.ejb
newDir=${newcvsdir}/ejbtools/plugins
copyAndRemove $oldDir $newDir
diff --git a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
index 4bff6fc..e2c0ad3 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/moveservertools.sh
@@ -44,13 +44,6 @@
newDir=${newBaseDir}
copyAndRemove $oldDir $newDir
-newBaseDir=${newcvsdir}/servertools/docs
-wtpmodule=org.eclipse.jst.server.ui.infopop
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir
-
-newBaseDir=${newcvsdir}/servertools/docs
wtpmodule=org.eclipse.jst.server.ui.infopop
oldDir=${oldBaseDir}/${wtpmodule}
newDir=${newBaseDir}