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

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