restructured XPL folder into models and views