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

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