restructuring files into MVC