Reorganize variables into HHQ Baseline and Final