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

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