Renamed packages to reflect ownership change.
Minimal work on revamping Lobbies.
Merge remote-tracking branch 'origin/rewrite' into rewrite
Merge remote-tracking branch 'origin/rewrite' into rewrite