More rearrangement

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1037@1629092 13f79535-47bb-0310-9956-ffa450edef68
Fix build.xml

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-1037@1629093 13f79535-47bb-0310-9956-ffa450edef68