Moved p2 into it's own directory