Reorganized files to fit MVC architecture