rearrange use of local dependencies p2
2 files changed