app.m => app.model, app.s => app.service, app.v => app.view
Merge remote-tracking branch 'origin/v3'