CLC-3410 Fifth batch of proxy reorg: FinAid

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