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

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