Broken commit, please ignore.

Completed large amounts of restructuring, multiplayer broken for now.