another round of edits for serverGitRoot and serverTodeRoot changes