Revert "Trimmed the branch to only the utexas_gdc sub directory"

This reverts commit 8466178875ce13481120e26f6657612d6e0ba1ec.
Rebase from 'upstream'
Trimmed the branch to only the utexas_gdc sub directory