Add files from project P2PTest and modify package path