Work on Radigost-XJAF integration (ongoing). Code restructuring.