consumer/provider restructure

Change-Id: Ib3611b00862a21aaeb1ece4aad231404921594be
Signed-off-by: Thomas Kee <xsited@yahoo.com>