Moved to a real MVC project