reorganizing paje dependancies