changed dir structure, added to mediator pattern