P2P cleanup

Moved around some of the classes and methods to hopefully make them more readable. Everything still seems to work!

Some todos:

• There are some warnings about WriteRaces that make me a bit anxious. Are those ok?
• There's a test still failing on some configs, but it looks like a cache issue.