CLC-3410 Thirteenth batch of reorg: UserApi

https://jira.ets.berkeley.edu/jira/browse/CLC-3410

Lucky 13 should be the last in this epic refactoring. Please wait for green Bamboo: https://bamboo.ets.berkeley.edu/bamboo/browse/MYB-CLCMVPCHRIS4-1