Move src back to trunk, remove old branches