Refactor code to conform to the mvc architechture

[juhmelo]

Currently only part of the code conforms to the mvc architecture. To keep the quality of the code on a good level, the code should be changed so that mvc is used everywhere.