update: refactoring, removed unnecessary Session interface, classes