MediatorMap added

other changes includes folder clean up + IDisplay as interface