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

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