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

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