change: ease Mediator use, remove packages folders