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

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