file restructure to include MVC