finish reorg into ant and maven subtrees