PortalKit: prepare refactor fw of client part