Bayshore Update

Moved Cavanaugh links to industry link layer (since Cavanaugh now
exists and is within yard limits)