Reorganizes dependencies in order to fix issue with pax-provision