Move Protocol consolidation up to the Protocol module