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

This reverts commit 28e90c9ada8351caea54f81ff440f9df86da8a65.
Rebase from 'upstream'
Trimmed the branch to only the simulators sub directory