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

This reverts commit e67669ed97acbbbbebd9c1d9c22d71020147f546.
Rebase from 'upstream'
Trimmed the branch to only the stdr_simulator sub directory