App Refactoring

[Live demo](http://gdetracking.gweb.io/hist/mauro/clientApi)

See commit comments for detail