Move to 2 header implementation, to hide implementation specific changes

Signed-off-by: Brian McGillion <brian.mcgillion@intel.com>