Renamed apiauth -> accounts
Merge branch 'api-auth'