Moved sources around to better illustrate MVC design