Rearrange PXF paths