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

This reverts commit 66cccad751ab5abf7d09a0d030aa59406f7e61cc.
Rebase from 'upstream'
Trimmed the branch to only the controller_interface sub directory