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

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