Moved the p2p fields to their own module.