Move JsonProtocol imports again slightly