GWTII-50: refactoring to new package proposal, todo: check api