Decoupling - MVC

Keeping MVC pattern