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

This reverts commit b312d0c832f5115f3f09246d16adc0ac65fb52dc.
Rebase from 'upstream'
Trimmed the branch to only the simple_message sub directory