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

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