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

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