reorginized pxd files