Delete empty file (Mediator.cpp), refactoring of few files

[re mediator]
Merge branch 'mediator'