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

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