Changed structure
Changed made on mediator.js
Worked on structure