Update and rename p2pbase to p2p