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

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