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

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