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

This reverts commit db624a5d188619e0396a7afadc31cb4dac2303ae.
Rebase from 'upstream'
Trimmed the branch to only the rosemacs sub directory