Moving to presenters

Model-presenter-proxy pattern