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

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