Changed file groupings to match MVC format