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

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