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

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