unit project; refactored worktree tools