diff --git a/Telegram/SourceFiles/info/info_common_groups_inner_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
similarity index 97%
rename from Telegram/SourceFiles/info/info_common_groups_inner_widget.cpp
rename to Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
index d93c826be..edd8676ed 100644
--- a/Telegram/SourceFiles/info/info_common_groups_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.cpp
@@ -18,9 +18,9 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "info/info_common_groups_inner_widget.h"
+#include "info/common_groups/info_common_groups_inner_widget.h"
 
-#include "info/info_common_groups_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
 #include "info/info_controller.h"
 #include "lang/lang_keys.h"
 #include "styles/style_info.h"
diff --git a/Telegram/SourceFiles/info/info_common_groups_inner_widget.h b/Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
similarity index 100%
rename from Telegram/SourceFiles/info/info_common_groups_inner_widget.h
rename to Telegram/SourceFiles/info/common_groups/info_common_groups_inner_widget.h
diff --git a/Telegram/SourceFiles/info/info_common_groups_widget.cpp b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
similarity index 95%
rename from Telegram/SourceFiles/info/info_common_groups_widget.cpp
rename to Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
index 3ca536822..d1dfaa32b 100644
--- a/Telegram/SourceFiles/info/info_common_groups_widget.cpp
+++ b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.cpp
@@ -18,9 +18,9 @@ to link the code of portions of this program with the OpenSSL library.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "info/info_common_groups_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
 
-#include "info/info_common_groups_inner_widget.h"
+#include "info/common_groups/info_common_groups_inner_widget.h"
 #include "info/info_controller.h"
 #include "ui/widgets/scroll_area.h"
 
diff --git a/Telegram/SourceFiles/info/info_common_groups_widget.h b/Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h
similarity index 100%
rename from Telegram/SourceFiles/info/info_common_groups_widget.h
rename to Telegram/SourceFiles/info/common_groups/info_common_groups_widget.h
diff --git a/Telegram/SourceFiles/info/info_content_widget.cpp b/Telegram/SourceFiles/info/info_content_widget.cpp
index b9242ed9c..401958cac 100644
--- a/Telegram/SourceFiles/info/info_content_widget.cpp
+++ b/Telegram/SourceFiles/info/info_content_widget.cpp
@@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang/lang_keys.h"
 #include "info/profile/info_profile_widget.h"
 #include "info/media/info_media_widget.h"
-#include "info/info_common_groups_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
 #include "info/info_layer_widget.h"
 #include "info/info_section_widget.h"
 #include "info/info_controller.h"
diff --git a/Telegram/SourceFiles/info/info_memento.cpp b/Telegram/SourceFiles/info/info_memento.cpp
index ef718e65b..7313ca73d 100644
--- a/Telegram/SourceFiles/info/info_memento.cpp
+++ b/Telegram/SourceFiles/info/info_memento.cpp
@@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "info/profile/info_profile_widget.h"
 #include "info/media/info_media_widget.h"
-#include "info/info_common_groups_widget.h"
+#include "info/common_groups/info_common_groups_widget.h"
 #include "info/info_section_widget.h"
 #include "info/info_layer_widget.h"
 #include "info/info_controller.h"
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index abcbe4a82..2dbaa767d 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -213,10 +213,6 @@
 <(src_loc)/history/history_user_photos.h
 <(src_loc)/history/history_widget.cpp
 <(src_loc)/history/history_widget.h
-<(src_loc)/info/info_common_groups_inner_widget.cpp
-<(src_loc)/info/info_common_groups_inner_widget.h
-<(src_loc)/info/info_common_groups_widget.cpp
-<(src_loc)/info/info_common_groups_widget.h
 <(src_loc)/info/info_content_widget.cpp
 <(src_loc)/info/info_content_widget.h
 <(src_loc)/info/info_controller.cpp
@@ -233,6 +229,10 @@
 <(src_loc)/info/info_top_bar_override.h
 <(src_loc)/info/info_wrap_widget.cpp
 <(src_loc)/info/info_wrap_widget.h
+<(src_loc)/info/common_groups/info_common_groups_inner_widget.cpp
+<(src_loc)/info/common_groups/info_common_groups_inner_widget.h
+<(src_loc)/info/common_groups/info_common_groups_widget.cpp
+<(src_loc)/info/common_groups/info_common_groups_widget.h
 <(src_loc)/info/media/info_media_buttons.h
 <(src_loc)/info/media/info_media_inner_widget.cpp
 <(src_loc)/info/media/info_media_inner_widget.h