Switched to MVC format
Cleaning up what I found