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

This reverts commit b366368d36cce87859b924a0911fb096ae619e33.
Rebase from 'upstream'
Trimmed the branch to only the uwsim sub directory