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

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