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

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