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

This reverts commit 7ef78cf9bbade75a4e2c020218f64c50fb1f3dd9.
Rebase from 'upstream'
Trimmed the branch to only the effort_controllers sub directory