restructed XPL to meet new MVC organization