diff --git a/osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapDetailAreaPlaylistTabItem.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapDetailAreaPlaylistTabItem.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTitle.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTitle.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTitle.cs
diff --git a/osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/BeatmapTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/BeatmapTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/DisableableTabControl.cs b/osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DisableableTabControl.cs
rename to osu.Game/Screens/OnlinePlay/Components/DisableableTabControl.cs
diff --git a/osu.Game/Screens/Multi/Components/DrawableGameType.cs b/osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/DrawableGameType.cs
rename to osu.Game/Screens/OnlinePlay/Components/DrawableGameType.cs
diff --git a/osu.Game/Screens/Multi/Components/ListingPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ListingPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/ListingPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs b/osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MatchBeatmapDetailArea.cs
rename to osu.Game/Screens/OnlinePlay/Components/MatchBeatmapDetailArea.cs
diff --git a/osu.Game/Screens/Multi/Components/ModeTypeInfo.cs b/osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ModeTypeInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/ModeTypeInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs b/osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/MultiplayerBackgroundSprite.cs
rename to osu.Game/Screens/OnlinePlay/Components/MultiplayerBackgroundSprite.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs b/osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/OverlinedPlaylistHeader.cs
rename to osu.Game/Screens/OnlinePlay/Components/OverlinedPlaylistHeader.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantCountDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantCountDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsDisplay.cs
diff --git a/osu.Game/Screens/Multi/Components/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Components/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Components/ReadyButton.cs b/osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/ReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Components/ReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomManager.cs b/osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomManager.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/RoomStatusInfo.cs b/osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/RoomStatusInfo.cs
rename to osu.Game/Screens/OnlinePlay/Components/RoomStatusInfo.cs
diff --git a/osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs b/osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/SelectionPollingComponent.cs
rename to osu.Game/Screens/OnlinePlay/Components/SelectionPollingComponent.cs
diff --git a/osu.Game/Screens/Multi/Components/StatusColouredContainer.cs b/osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Components/StatusColouredContainer.cs
rename to osu.Game/Screens/OnlinePlay/Components/StatusColouredContainer.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylist.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylist.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylist.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistItem.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistItem.cs
diff --git a/osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs b/osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
similarity index 100%
rename from osu.Game/Screens/Multi/DrawableRoomPlaylistWithResults.cs
rename to osu.Game/Screens/OnlinePlay/DrawableRoomPlaylistWithResults.cs
diff --git a/osu.Game/Screens/Multi/Header.cs b/osu.Game/Screens/OnlinePlay/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Header.cs
rename to osu.Game/Screens/OnlinePlay/Header.cs
diff --git a/osu.Game/Screens/Multi/IMultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IMultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/IMultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/IRoomManager.cs b/osu.Game/Screens/OnlinePlay/IRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/IRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/IRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/DrawableRoom.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/FilterCriteria.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/FilterCriteria.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/ParticipantInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/ParticipantInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/PlaylistsFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/PlaylistsFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInfo.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInfo.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomInspector.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomInspector.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomStatusFilter.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomStatusFilter.cs
diff --git a/osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs b/osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/Components/RoomsContainer.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/Components/RoomsContainer.cs
diff --git a/osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Footer.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Footer.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Footer.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/GameTypePicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/GameTypePicker.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/Header.cs b/osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/Header.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/Header.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchChatDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchChatDisplay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboard.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboard.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchLeaderboardScore.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchLeaderboardScore.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/MatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs b/osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/PurpleTriangleButton.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/PurpleTriangleButton.cs
diff --git a/osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs b/osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/Components/RoomAvailabilityPicker.cs
rename to osu.Game/Screens/OnlinePlay/Match/Components/RoomAvailabilityPicker.cs
diff --git a/osu.Game/Screens/Multi/Match/RoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Match/RoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Match/RoomSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/CreateMultiplayerMatchButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/CreateMultiplayerMatchButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/BeatmapSelectionControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/BeatmapSelectionControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchFooter.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchFooter.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Match/MultiplayerReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Match/MultiplayerReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Multiplayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Multiplayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerFilterControl.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerFilterControl.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSongSelect.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSongSelect.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerMatchSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerMatchSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerPlayer.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomComposite.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomComposite.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/MultiplayerRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/MultiplayerRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantPanel.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantPanel.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsList.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsList.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/ParticipantsListHeader.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/ParticipantsListHeader.cs
diff --git a/osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs b/osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Multiplayer/Participants/StateDisplay.cs
rename to osu.Game/Screens/OnlinePlay/Multiplayer/Participants/StateDisplay.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerComposite.cs b/osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerComposite.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerComposite.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreen.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreen.cs
diff --git a/osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs b/osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
similarity index 100%
rename from osu.Game/Screens/Multi/MultiplayerSubScreenStack.cs
rename to osu.Game/Screens/OnlinePlay/MultiplayerSubScreenStack.cs
diff --git a/osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/CreatePlaylistsRoomButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/CreatePlaylistsRoomButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/Playlists.cs b/osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/Playlists.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/Playlists.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsLoungeSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsLoungeSubScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsMatchSettingsOverlay.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsMatchSettingsOverlay.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsPlayer.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsPlayer.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsReadyButton.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsReadyButton.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsResultsScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsResultsScreen.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomManager.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomManager.cs
diff --git a/osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs b/osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs
similarity index 100%
rename from osu.Game/Screens/Multi/Playlists/PlaylistsRoomSubScreen.cs
rename to osu.Game/Screens/OnlinePlay/Playlists/PlaylistsRoomSubScreen.cs