diff --git a/projectfiles/VC12/wesnoth.vcxproj b/projectfiles/VC12/wesnoth.vcxproj
index ded7a2be2cc9..4d3232a031a1 100644
--- a/projectfiles/VC12/wesnoth.vcxproj
+++ b/projectfiles/VC12/wesnoth.vcxproj
@@ -1748,20 +1748,6 @@
$(IntDir)Gui\Dialogs\
$(IntDir)Gui\Dialogs\
-
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
-
-
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
- $(IntDir)Gui\Dialogs\Lobby\
-
$(IntDir)Gui\Dialogs\
$(IntDir)Gui\Dialogs\
@@ -1804,6 +1790,7 @@
$(IntDir)Gui\Dialogs\Multiplayer\
$(IntDir)Gui\Dialogs\Multiplayer\
+
$(IntDir)Gui\Dialogs\Multiplayer\
$(IntDir)Gui\Dialogs\Multiplayer\
@@ -1888,6 +1875,7 @@
$(IntDir)Gui\Dialogs\Multiplayer\
$(IntDir)Gui\Dialogs\Multiplayer\
+
$(IntDir)Gui\Dialogs\Multiplayer\
$(IntDir)Gui\Dialogs\Multiplayer\
@@ -3743,14 +3731,13 @@
-
-
+
@@ -3763,6 +3750,7 @@
+
diff --git a/projectfiles/VC12/wesnoth.vcxproj.filters b/projectfiles/VC12/wesnoth.vcxproj.filters
index 75add958f423..52a084082996 100644
--- a/projectfiles/VC12/wesnoth.vcxproj.filters
+++ b/projectfiles/VC12/wesnoth.vcxproj.filters
@@ -56,9 +56,6 @@
{006b82d3-7b2b-41ef-bfd8-8f98867cab7b}
-
- {7c98108b-ad5b-4712-8824-40ac9b734ff4}
-
{994675eb-e9db-4699-a08a-d29248d169e7}
@@ -701,12 +698,6 @@
Gui\Dialogs
-
- Gui\Dialogs\Lobby
-
-
- Gui\Dialogs\Lobby
-
Gui\Dialogs\Addon
@@ -1547,6 +1538,12 @@
Preferences
+
+ Gui\Dialogs\Multiplayer
+
+
+ Gui\Dialogs\Multiplayer
+
@@ -2107,12 +2104,6 @@
Gui\Dialogs
-
- Gui\Dialogs\Lobby
-
-
- Gui\Dialogs\Lobby
-
Gui\Dialogs\Addon
@@ -3003,6 +2994,12 @@
Preferences
+
+ Gui\Dialogs\Multiplayer
+
+
+ Gui\Dialogs\Multiplayer
+
diff --git a/source_lists/wesnoth b/source_lists/wesnoth
index e3b81798e6e2..937a2f6e3fb6 100644
--- a/source_lists/wesnoth
+++ b/source_lists/wesnoth
@@ -202,14 +202,13 @@ gui/dialogs/hotkey_bind.cpp
gui/dialogs/label_settings.cpp
gui/dialogs/language_selection.cpp
gui/dialogs/loading_screen.cpp
-gui/dialogs/lobby/lobby.cpp
-gui/dialogs/lobby/player_info.cpp
gui/dialogs/log_settings.cpp
gui/dialogs/lua_interpreter.cpp
gui/dialogs/message.cpp
gui/dialogs/modal_dialog.cpp
gui/dialogs/modeless_dialog.cpp
gui/dialogs/multiplayer/faction_select.cpp
+gui/dialogs/multiplayer/lobby.cpp
gui/dialogs/multiplayer/mp_alerts_options.cpp
gui/dialogs/multiplayer/mp_change_control.cpp
gui/dialogs/multiplayer/mp_cmd_wrapper.cpp
@@ -222,6 +221,7 @@ gui/dialogs/multiplayer/mp_login.cpp
gui/dialogs/multiplayer/mp_method_selection.cpp
gui/dialogs/multiplayer/mp_options_helper.cpp
gui/dialogs/multiplayer/mp_staging.cpp
+gui/dialogs/multiplayer/player_info.cpp
gui/dialogs/multiplayer/synced_choice_wait.cpp
gui/dialogs/network_transmission.cpp
gui/dialogs/outro.cpp
diff --git a/src/game_initialization/multiplayer.cpp b/src/game_initialization/multiplayer.cpp
index b7d2bbf42361..b46bbef5f199 100644
--- a/src/game_initialization/multiplayer.cpp
+++ b/src/game_initialization/multiplayer.cpp
@@ -22,8 +22,8 @@
#include "preferences/credentials.hpp"
#include "preferences/game.hpp"
#include "gettext.hpp"
-#include "gui/dialogs/lobby/lobby.hpp"
#include "gui/dialogs/message.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
#include "gui/dialogs/multiplayer/mp_connect.hpp"
#include "gui/dialogs/multiplayer/mp_create_game.hpp"
#include "gui/dialogs/multiplayer/mp_join_game.hpp"
diff --git a/src/gui/dialogs/lobby/lobby.cpp b/src/gui/dialogs/multiplayer/lobby.cpp
similarity index 99%
rename from src/gui/dialogs/lobby/lobby.cpp
rename to src/gui/dialogs/multiplayer/lobby.cpp
index f31916787db8..b96306fcfa8c 100644
--- a/src/gui/dialogs/lobby/lobby.cpp
+++ b/src/gui/dialogs/multiplayer/lobby.cpp
@@ -13,12 +13,12 @@
*/
#define GETTEXT_DOMAIN "wesnoth-lib"
-#include "gui/dialogs/lobby/lobby.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
#include "gui/auxiliary/find_widget.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
+#include "gui/dialogs/multiplayer/player_info.hpp"
#include "gui/dialogs/preferences_dialog.hpp"
#include "gui/dialogs/helper.hpp"
diff --git a/src/gui/dialogs/lobby/lobby.hpp b/src/gui/dialogs/multiplayer/lobby.hpp
similarity index 100%
rename from src/gui/dialogs/lobby/lobby.hpp
rename to src/gui/dialogs/multiplayer/lobby.hpp
diff --git a/src/gui/dialogs/lobby/player_info.cpp b/src/gui/dialogs/multiplayer/player_info.cpp
similarity index 99%
rename from src/gui/dialogs/lobby/player_info.cpp
rename to src/gui/dialogs/multiplayer/player_info.cpp
index 254939b73db5..0556f2c86ed1 100644
--- a/src/gui/dialogs/lobby/player_info.cpp
+++ b/src/gui/dialogs/multiplayer/player_info.cpp
@@ -12,9 +12,10 @@
See the COPYING file for more details.
*/
+#include "gui/dialogs/multiplayer/player_info.hpp"
+
#include "gui/auxiliary/find_widget.hpp"
#include "gui/dialogs/helper.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
#include "gui/widgets/button.hpp"
#include "gui/widgets/label.hpp"
#include "gui/widgets/settings.hpp"
diff --git a/src/gui/dialogs/lobby/player_info.hpp b/src/gui/dialogs/multiplayer/player_info.hpp
similarity index 100%
rename from src/gui/dialogs/lobby/player_info.hpp
rename to src/gui/dialogs/multiplayer/player_info.hpp
diff --git a/src/tests/gui/test_gui2.cpp b/src/tests/gui/test_gui2.cpp
index fc02b4772695..41b6ca78b78b 100644
--- a/src/tests/gui/test_gui2.cpp
+++ b/src/tests/gui/test_gui2.cpp
@@ -68,12 +68,11 @@
#include "gui/dialogs/label_settings.hpp"
#include "gui/dialogs/language_selection.hpp"
#include "gui/dialogs/loading_screen.hpp"
-#include "gui/dialogs/lobby/lobby.hpp"
-#include "gui/dialogs/lobby/player_info.hpp"
#include "gui/dialogs/log_settings.hpp"
#include "gui/dialogs/lua_interpreter.hpp"
#include "gui/dialogs/message.hpp"
#include "gui/dialogs/multiplayer/faction_select.hpp"
+#include "gui/dialogs/multiplayer/lobby.hpp"
#include "gui/dialogs/multiplayer/mp_alerts_options.hpp"
#include "gui/dialogs/multiplayer/mp_change_control.hpp"
#include "gui/dialogs/multiplayer/mp_cmd_wrapper.hpp"
@@ -82,6 +81,7 @@
#include "gui/dialogs/multiplayer/mp_join_game.hpp"
#include "gui/dialogs/multiplayer/mp_join_game_password_prompt.hpp"
#include "gui/dialogs/multiplayer/mp_staging.hpp"
+#include "gui/dialogs/multiplayer/player_info.hpp"
#include "gui/dialogs/outro.hpp"
#include "gui/dialogs/depcheck_confirm_change.hpp"
#include "gui/dialogs/depcheck_select_new.hpp"