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

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