Minor restructure to remove duplicate code

Move MatchParams to flow_table.h