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

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