[Fixup] To be squashed - Make control point API a struct

Signed-off-by: Regis Merlino <regis.merlino@intel.com>