Moved p1 into it's own directory