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

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