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

This reverts commit 0c254f462b66d0162233e98d1898b85b2906b2bd.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the effort_controllers sub directory