reorganized files for mvc