code review feedback: move and reformat code as appropriate
Merge branch 'feature/environment-scaffold' of github.com:rstudio/rstudio into feature/environment-scaffold