Move 1.7 remappers to 1.7 protocol package