Move protocol package back to old spot in path. Update code.