Decoupling - MVC

Keeping MVC pattern
Merge branch 'igor' of https://github.com/ddspog/codespecok into dennis