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

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