Update and rename .cpp to p2d.cpp