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

This reverts commit 9cac62175938b5dbe2a6270c658e5362765046d2.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the uwsim sub directory