Stuff that should wait until after the restructure has been applied to the multiplayer branch.

Updated to include stuff needed before the first unstable build (merge to "develop" branch), other stuff can go later