modified directory structure to MVC pattern