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

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