updated to latest p2 repo layout