Started adding up everything to get a working MVC mode.
Changed the layout to remove one level of directories.