STEP3: Consolidate CC / Address into 1 column

Signed-off-by: PATRICK IWANICKI <patrick@screengroove.com>