Move p1 and p2 into a separate folder