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

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