diff --git a/Telegram/SourceFiles/apiwrap.cpp b/Telegram/SourceFiles/apiwrap.cpp
index 3017dbf6e..767da73f6 100644
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@@ -40,8 +40,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
 #include "storage/storage_user_photos.h"
-#include "history/history_sparse_ids.h"
-#include "history/history_search_controller.h"
+#include "data/data_sparse_ids.h"
+#include "data/data_search_controller.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/history/history_search_controller.cpp b/Telegram/SourceFiles/data/data_search_controller.cpp
similarity index 99%
rename from Telegram/SourceFiles/history/history_search_controller.cpp
rename to Telegram/SourceFiles/data/data_search_controller.cpp
index 55ebea5b1..66a944196 100644
--- a/Telegram/SourceFiles/history/history_search_controller.cpp
+++ b/Telegram/SourceFiles/data/data_search_controller.cpp
@@ -18,7 +18,7 @@ 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 "history/history_search_controller.h"
+#include "data/data_search_controller.h"
 
 #include "auth_session.h"
 
diff --git a/Telegram/SourceFiles/history/history_search_controller.h b/Telegram/SourceFiles/data/data_search_controller.h
similarity index 99%
rename from Telegram/SourceFiles/history/history_search_controller.h
rename to Telegram/SourceFiles/data/data_search_controller.h
index e366e7253..7577f1124 100644
--- a/Telegram/SourceFiles/history/history_search_controller.h
+++ b/Telegram/SourceFiles/data/data_search_controller.h
@@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include "mtproto/sender.h"
-#include "history/history_sparse_ids.h"
+#include "data/data_sparse_ids.h"
 #include "storage/storage_sparse_ids_list.h"
 #include "storage/storage_shared_media.h"
 #include "base/value_ordering.h"
diff --git a/Telegram/SourceFiles/history/history_shared_media.cpp b/Telegram/SourceFiles/data/data_shared_media.cpp
similarity index 99%
rename from Telegram/SourceFiles/history/history_shared_media.cpp
rename to Telegram/SourceFiles/data/data_shared_media.cpp
index d200bf9ee..d7720318c 100644
--- a/Telegram/SourceFiles/history/history_shared_media.cpp
+++ b/Telegram/SourceFiles/data/data_shared_media.cpp
@@ -18,7 +18,7 @@ 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 "history/history_shared_media.h"
+#include "data/data_shared_media.h"
 
 #include <rpl/combine.h>
 #include "auth_session.h"
@@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "storage/storage_facade.h"
 #include "storage/storage_shared_media.h"
 #include "history/history_media_types.h"
-#include "history/history_sparse_ids.h"
+#include "data/data_sparse_ids.h"
 
 namespace {
 
diff --git a/Telegram/SourceFiles/history/history_shared_media.h b/Telegram/SourceFiles/data/data_shared_media.h
similarity index 99%
rename from Telegram/SourceFiles/history/history_shared_media.h
rename to Telegram/SourceFiles/data/data_shared_media.h
index 38af544ab..7a59ade30 100644
--- a/Telegram/SourceFiles/history/history_shared_media.h
+++ b/Telegram/SourceFiles/data/data_shared_media.h
@@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "storage/storage_shared_media.h"
 #include "base/weak_unique_ptr.h"
-#include "history/history_sparse_ids.h"
+#include "data/data_sparse_ids.h"
 
 base::optional<Storage::SharedMediaType> SharedMediaOverviewType(
 	Storage::SharedMediaType type);
diff --git a/Telegram/SourceFiles/history/history_sparse_ids.cpp b/Telegram/SourceFiles/data/data_sparse_ids.cpp
similarity index 99%
rename from Telegram/SourceFiles/history/history_sparse_ids.cpp
rename to Telegram/SourceFiles/data/data_sparse_ids.cpp
index a997664ac..86a759bc3 100644
--- a/Telegram/SourceFiles/history/history_sparse_ids.cpp
+++ b/Telegram/SourceFiles/data/data_sparse_ids.cpp
@@ -18,7 +18,7 @@ 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 "history/history_sparse_ids.h"
+#include "data/data_sparse_ids.h"
 
 #include <rpl/combine.h>
 #include "storage/storage_sparse_ids_list.h"
diff --git a/Telegram/SourceFiles/history/history_sparse_ids.h b/Telegram/SourceFiles/data/data_sparse_ids.h
similarity index 100%
rename from Telegram/SourceFiles/history/history_sparse_ids.h
rename to Telegram/SourceFiles/data/data_sparse_ids.h
diff --git a/Telegram/SourceFiles/history/history_user_photos.cpp b/Telegram/SourceFiles/data/data_user_photos.cpp
similarity index 99%
rename from Telegram/SourceFiles/history/history_user_photos.cpp
rename to Telegram/SourceFiles/data/data_user_photos.cpp
index 6837ceb11..232bf1b79 100644
--- a/Telegram/SourceFiles/history/history_user_photos.cpp
+++ b/Telegram/SourceFiles/data/data_user_photos.cpp
@@ -18,7 +18,7 @@ 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 "history/history_user_photos.h"
+#include "data/data_user_photos.h"
 
 #include "auth_session.h"
 #include "apiwrap.h"
diff --git a/Telegram/SourceFiles/history/history_user_photos.h b/Telegram/SourceFiles/data/data_user_photos.h
similarity index 100%
rename from Telegram/SourceFiles/history/history_user_photos.h
rename to Telegram/SourceFiles/data/data_user_photos.h
diff --git a/Telegram/SourceFiles/info/info_controller.cpp b/Telegram/SourceFiles/info/info_controller.cpp
index 4c8129255..d59b02519 100644
--- a/Telegram/SourceFiles/info/info_controller.cpp
+++ b/Telegram/SourceFiles/info/info_controller.cpp
@@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "info/info_controller.h"
 
 #include "ui/search_field_controller.h"
-#include "history/history_shared_media.h"
+#include "data/data_shared_media.h"
 #include "info/info_content_widget.h"
 #include "info/info_memento.h"
 #include "info/media/info_media_widget.h"
diff --git a/Telegram/SourceFiles/info/info_controller.h b/Telegram/SourceFiles/info/info_controller.h
index 2ae7d070d..e825f557e 100644
--- a/Telegram/SourceFiles/info/info_controller.h
+++ b/Telegram/SourceFiles/info/info_controller.h
@@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once
 
 #include <rpl/variable.h>
-#include "history/history_search_controller.h"
+#include "data/data_search_controller.h"
 
 namespace Ui {
 class SearchFieldController;
diff --git a/Telegram/SourceFiles/info/media/info_media_list_widget.h b/Telegram/SourceFiles/info/media/info_media_list_widget.h
index 3a71ccc61..d8ba8b860 100644
--- a/Telegram/SourceFiles/info/media/info_media_list_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_list_widget.h
@@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "ui/rp_widget.h"
 #include "info/media/info_media_widget.h"
-#include "history/history_shared_media.h"
+#include "data/data_shared_media.h"
 
 namespace Ui {
 class PopupMenu;
diff --git a/Telegram/SourceFiles/info/media/info_media_widget.h b/Telegram/SourceFiles/info/media/info_media_widget.h
index 4041a2349..dabd2a27b 100644
--- a/Telegram/SourceFiles/info/media/info_media_widget.h
+++ b/Telegram/SourceFiles/info/media/info_media_widget.h
@@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <rpl/producer.h>
 #include "info/info_content_widget.h"
 #include "storage/storage_shared_media.h"
-#include "history/history_search_controller.h"
+#include "data/data_search_controller.h"
 
 namespace Ui {
 class SearchFieldController;
diff --git a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
index b5fb6e3d9..bf1cccf5d 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_inner_widget.cpp
@@ -52,7 +52,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/shadow.h"
 #include "ui/wrap/slide_wrap.h"
 #include "ui/wrap/vertical_layout.h"
-#include "history/history_shared_media.h"
+#include "data/data_shared_media.h"
 #include "profile/profile_common_groups_section.h"
 
 namespace Info {
diff --git a/Telegram/SourceFiles/info/profile/info_profile_values.cpp b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
index 133b18ee2..b60320f48 100644
--- a/Telegram/SourceFiles/info/profile/info_profile_values.cpp
+++ b/Telegram/SourceFiles/info/profile/info_profile_values.cpp
@@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "messenger.h"
 #include "ui/wrap/slide_wrap.h"
 #include "data/data_peer_values.h"
-#include "history/history_shared_media.h"
+#include "data/data_shared_media.h"
 
 namespace Info {
 namespace Profile {
diff --git a/Telegram/SourceFiles/mediaview.h b/Telegram/SourceFiles/mediaview.h
index 532475867..78901d619 100644
--- a/Telegram/SourceFiles/mediaview.h
+++ b/Telegram/SourceFiles/mediaview.h
@@ -22,8 +22,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/effects/radial_animation.h"
-#include "history/history_shared_media.h"
-#include "history/history_user_photos.h"
+#include "data/data_shared_media.h"
+#include "data/data_user_photos.h"
 
 namespace Media {
 namespace Player {
diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt
index 2dbaa767d..d7ce287f1 100644
--- a/Telegram/gyp/telegram_sources.txt
+++ b/Telegram/gyp/telegram_sources.txt
@@ -156,8 +156,16 @@
 <(src_loc)/data/data_peer_values.h
 <(src_loc)/data/data_photo.cpp
 <(src_loc)/data/data_photo.h
+<(src_loc)/data/data_search_controller.cpp
+<(src_loc)/data/data_search_controller.h
+<(src_loc)/data/data_shared_media.cpp
+<(src_loc)/data/data_shared_media.h
+<(src_loc)/data/data_sparse_ids.cpp
+<(src_loc)/data/data_sparse_ids.h
 <(src_loc)/data/data_types.cpp
 <(src_loc)/data/data_types.h
+<(src_loc)/data/data_user_photos.cpp
+<(src_loc)/data/data_user_photos.h
 <(src_loc)/data/data_web_page.h
 <(src_loc)/dialogs/dialogs_common.h
 <(src_loc)/dialogs/dialogs_indexed_list.cpp
@@ -199,18 +207,10 @@
 <(src_loc)/history/history_media_types.h
 <(src_loc)/history/history_message.cpp
 <(src_loc)/history/history_message.h
-<(src_loc)/history/history_search_controller.cpp
-<(src_loc)/history/history_search_controller.h
 <(src_loc)/history/history_service.cpp
 <(src_loc)/history/history_service.h
 <(src_loc)/history/history_service_layout.cpp
 <(src_loc)/history/history_service_layout.h
-<(src_loc)/history/history_shared_media.cpp
-<(src_loc)/history/history_shared_media.h
-<(src_loc)/history/history_sparse_ids.cpp
-<(src_loc)/history/history_sparse_ids.h
-<(src_loc)/history/history_user_photos.cpp
-<(src_loc)/history/history_user_photos.h
 <(src_loc)/history/history_widget.cpp
 <(src_loc)/history/history_widget.h
 <(src_loc)/info/info_content_widget.cpp