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

This reverts commit fd71ed1f7eecafb4bcbb826194a020d3a495f692.
Rebase from 'upstream'
Trimmed the branch to only the rocon_interactions sub directory