new uxf code structure