CLC-3410 Second batch of proxy reorg: CalLink

https://jira.ets.berkeley.edu/jira/browse/CLC-3410