Change over to MVC-model