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

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