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

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