restructured XPL into models and serializations