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

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