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

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