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

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