Merge "Fix p2p package paths"