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

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