Rearrange classes so it fits MVC better