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 bfaa970..8dace6a 100755
--- a/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
+++ b/plugins/org.eclipse.wtp.releng.utilities/movecommon.sh
@@ -20,8 +20,12 @@
 newDir=${newcvsdir}/common/features
 copyAndRemove $oldDir $newDir
 
-oldDir=${oldcvsdir}/wst/components/common/features
-newDir=${newcvsdir}/common
+
+oldBaseDir=${oldcvsdir}/wst/components/common
+newBaseDir=${newcvsdir}/common
+wtpmodule=features
+oldDir=${oldBaseDir}/${wtpmodule}
+newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
 
@@ -192,13 +196,7 @@
 newDir=${newBaseDir}
 copyAndRemove $oldDir $newDir
 
-oldBaseDir=${oldcvsdir}/wst/components/common
-newBaseDir=${newcvsdir}/common
 
-wtpmodule=features
-oldDir=${oldBaseDir}/${wtpmodule}
-newDir=${newBaseDir}
-copyAndRemove $oldDir $newDir