Refactored from single file to MVC compliance
Refactored from single file to MVC compliance