Re-structure code to prepare for the Lobby-Server merge