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

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