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

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