Finalizing file renaming.

2017-03-04 13:23:56 +03:00 · 2017-03-04 13:23:56 +03:00 · 83720d8789
parent b0dbe9d353
commit 83720d8789
95 changed files with 123 additions and 124 deletions
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "historywidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "auth_session.h"
 #include "boxes/confirmbox.h"
 #include "window/themes/window_theme.h"
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@ -38,10 +38,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "inline_bots/inline_bot_layout_item.h"
 #include "messenger.h"
 #include "application.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "apiwrap.h"
 #include "numbers.h"
 #include "observer_peer.h"
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@ -20,10 +20,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "application.h"

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "autoupdater.h"
 #include "window/notifications_manager.h"
 #include "core/task_queue.h"
--- a/Telegram/SourceFiles/autoupdater.cpp
+++ b/Telegram/SourceFiles/autoupdater.cpp
@ -33,7 +33,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #endif // else of Q_OS_WIN

 #include "application.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"

 #ifndef TDESKTOP_DISABLE_AUTOUPDATE

--- a/Telegram/SourceFiles/boxes/abstractbox.cpp
+++ b/Telegram/SourceFiles/boxes/abstractbox.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/abstractbox.h"

 #include "styles/style_boxes.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "lang.h"
 #include "ui/effects/widget_fade_wrap.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/boxes/autolockbox.cpp
+++ b/Telegram/SourceFiles/boxes/autolockbox.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/autolockbox.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
--- a/Telegram/SourceFiles/boxes/confirmbox.cpp
+++ b/Telegram/SourceFiles/boxes/confirmbox.cpp
@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/labels.h"
 #include "ui/toast/toast.h"
 #include "core/click_handler_types.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 TextParseOptions _confirmBoxTextOptions = {
 	TextParseLinks | TextParseMultiline | TextParseRichText, // flags
--- a/Telegram/SourceFiles/boxes/connectionbox.cpp
+++ b/Telegram/SourceFiles/boxes/connectionbox.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/connectionbox.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "ui/widgets/checkbox.h"
--- a/Telegram/SourceFiles/boxes/downloadpathbox.cpp
+++ b/Telegram/SourceFiles/boxes/downloadpathbox.cpp
@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/downloadpathbox.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "core/file_utilities.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "styles/style_boxes.h"

 DownloadPathBox::DownloadPathBox(QWidget *parent)
--- a/Telegram/SourceFiles/boxes/languagebox.cpp
+++ b/Telegram/SourceFiles/boxes/languagebox.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
--- a/Telegram/SourceFiles/boxes/localstoragebox.cpp
+++ b/Telegram/SourceFiles/boxes/localstoragebox.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"

--- a/Telegram/SourceFiles/boxes/notifications_box.cpp
+++ b/Telegram/SourceFiles/boxes/notifications_box.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_dialogs.h"
 #include "styles/style_window.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 namespace {

--- a/Telegram/SourceFiles/boxes/passcodebox.cpp
+++ b/Telegram/SourceFiles/boxes/passcodebox.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "confirmbox.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
--- a/Telegram/SourceFiles/boxes/photocropbox.cpp
+++ b/Telegram/SourceFiles/boxes/photocropbox.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "messenger.h"
 #include "mainwidget.h"
 #include "photocropbox.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "ui/widgets/buttons.h"
 #include "styles/style_boxes.h"

--- a/Telegram/SourceFiles/boxes/send_files_box.cpp
+++ b/Telegram/SourceFiles/boxes/send_files_box.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/send_files_box.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "history/history_media_types.h"
 #include "core/file_utilities.h"
--- a/Telegram/SourceFiles/boxes/send_files_box.h
+++ b/Telegram/SourceFiles/boxes/send_files_box.h
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once

 #include "boxes/abstractbox.h"
-#include "localimageloader.h"
+#include "storage/localimageloader.h"

 namespace Ui {
 class Checkbox;
--- a/Telegram/SourceFiles/boxes/sessionsbox.cpp
+++ b/Telegram/SourceFiles/boxes/sessionsbox.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/sessionsbox.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "countries.h"
--- a/Telegram/SourceFiles/boxes/sharebox.cpp
+++ b/Telegram/SourceFiles/boxes/sharebox.cpp
@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "core/qthelp_url.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "apiwrap.h"
 #include "ui/toast/toast.h"
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/confirmbox.h"
 #include "boxes/stickersetbox.h"
 #include "apiwrap.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "dialogs/dialogs_layout.h"
 #include "styles/style_boxes.h"
 #include "styles/style_stickers.h"
--- a/Telegram/SourceFiles/boxes/stickersetbox.cpp
+++ b/Telegram/SourceFiles/boxes/stickersetbox.cpp
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "stickers/stickers.h"
 #include "boxes/confirmbox.h"
 #include "apiwrap.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "dialogs/dialogs_layout.h"
 #include "styles/style_boxes.h"
 #include "styles/style_stickers.h"
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/click_handler_types.h"

 #include "lang.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "boxes/confirmbox.h"
 #include "core/qthelp_regex.h"
 #include "core/qthelp_url.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "ui/widgets/tooltip.h"
 #include "core/file_utilities.h"

--- a/Telegram/SourceFiles/core/file_utilities.cpp
+++ b/Telegram/SourceFiles/core/file_utilities.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/file_utilities.h"

 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "platform/platform_file_utilities.h"
 #include "core/task_queue.h"

--- a/Telegram/SourceFiles/core/utils.cpp
+++ b/Telegram/SourceFiles/core/utils.cpp
@ -34,7 +34,7 @@ extern "C" {
 }

 #include "application.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"

 uint64 _SharedMemoryLocation[4] = { 0x00, 0x01, 0x02, 0x03 };

--- a/Telegram/SourceFiles/data/data_drafts.cpp
+++ b/Telegram/SourceFiles/data/data_drafts.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/input_fields.h"
 #include "historywidget.h"
 #include "mainwidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 namespace Data {
 namespace {
--- a/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
+++ b/Telegram/SourceFiles/dialogs/dialogs_layout.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "data/data_drafts.h"
 #include "dialogs/dialogs_list.h"
 #include "styles/style_dialogs.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "lang.h"

 namespace Dialogs {
--- a/Telegram/SourceFiles/dialogswidget.cpp
+++ b/Telegram/SourceFiles/dialogswidget.cpp
@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/contactsbox.h"
 #include "boxes/confirmbox.h"
 #include "boxes/aboutbox.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "apiwrap.h"
 #include "ui/widgets/dropdown_menu.h"
 #include "ui/widgets/input_fields.h"
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "apiwrap.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "window/top_bar_widget.h"
 #include "observer_peer.h"
 #include "auth_session.h"
--- a/Telegram/SourceFiles/history/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/history/field_autocomplete.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "mainwindow.h"
 #include "apiwrap.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "ui/widgets/scroll_area.h"
 #include "styles/style_history.h"
 #include "styles/style_widgets.h"
--- a/Telegram/SourceFiles/history/history_drag_area.cpp
+++ b/Telegram/SourceFiles/history/history_drag_area.cpp
@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "inline_bots/inline_bot_layout_item.h"
 #include "dialogs/dialogs_layout.h"
 #include "historywidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"
 #include "apiwrap.h"
--- a/Telegram/SourceFiles/history/history_item.cpp
+++ b/Telegram/SourceFiles/history/history_item.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_dialogs.h"
 #include "styles/style_history.h"
 #include "ui/effects/ripple_animation.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "auth_session.h"

 namespace {
--- a/Telegram/SourceFiles/history/history_location_manager.cpp
+++ b/Telegram/SourceFiles/history/history_location_manager.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "mainwidget.h"
 #include "lang.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"

 namespace {

--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@ -49,10 +49,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "passcodewidget.h"
 #include "mainwindow.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "media/media_audio.h"
 #include "media/media_audio_capture.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "apiwrap.h"
 #include "window/top_bar_widget.h"
 #include "window/themes/window_theme.h"
--- a/Telegram/SourceFiles/historywidget.h
+++ b/Telegram/SourceFiles/historywidget.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "localimageloader.h"
+#include "storage/localimageloader.h"
 #include "ui/widgets/tooltip.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
 #include "history/history_location_manager.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "lang.h"

--- a/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/click_handler_types.h"
 #include "inline_bots/inline_bot_result.h"
 #include "inline_bots/inline_bot_layout_internal.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"

 namespace InlineBots {
--- a/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_result.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "inline_bots/inline_bot_layout_item.h"
 #include "inline_bots/inline_bot_send_data.h"
-#include "mtproto/file_download.h"
+#include "storage/file_download.h"
 #include "core/file_utilities.h"
 #include "mainwidget.h"

--- a/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_bot_send_data.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "inline_bots/inline_bot_send_data.h"

 #include "inline_bots/inline_bot_result.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 namespace InlineBots {
 namespace internal {
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "intro/introwidget.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "langloaderplain.h"
 #include "intro/introstart.h"
 #include "intro/introphone.h"
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@ -23,13 +23,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "mainwidget.h"
 #include "application.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "core/file_utilities.h"
 #include "boxes/addcontactbox.h"
 #include "boxes/confirmbox.h"
 #include "media/media_audio.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 TextParseOptions _textNameOptions = {
 	0, // flags
--- a/Telegram/SourceFiles/logs.cpp
+++ b/Telegram/SourceFiles/logs.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <signal.h>
 #include <new>

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "mtproto/connection.h"

 #ifndef TDESKTOP_DISABLE_CRASH_REPORTS
--- a/Telegram/SourceFiles/main.cpp
+++ b/Telegram/SourceFiles/main.cpp
@ -19,9 +19,8 @@ Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "application.h"
-#include "pspecific.h"
-
-#include "localstorage.h"
+#include "platform/platform_specific.h"
+#include "storage/localstorage.h"

 int main(int argc, char *argv[]) {
 #ifndef Q_OS_MAC // Retina display support is working fine, others are not.
--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "overviewwidget.h"
 #include "lang.h"
 #include "boxes/addcontactbox.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "messenger.h"
 #include "application.h"
 #include "mainwindow.h"
@ -48,7 +48,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/downloadpathbox.h"
 #include "boxes/confirmphonebox.h"
 #include "boxes/sharebox.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "shortcuts.h"
 #include "media/media_audio.h"
 #include "media/player/media_player_panel.h"
--- a/Telegram/SourceFiles/mainwidget.h
+++ b/Telegram/SourceFiles/mainwidget.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "localimageloader.h"
+#include "storage/localimageloader.h"
 #include "history/history_common.h"
 #include "core/single_timer.h"

--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "shortcuts.h"
 #include "messenger.h"
 #include "application.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "passcodewidget.h"
 #include "intro/introwidget.h"
 #include "mainwidget.h"
@ -42,7 +42,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "observer_peer.h"
 #include "autoupdater.h"
 #include "mediaview.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "apiwrap.h"
 #include "settings/settings_widget.h"
 #include "platform/platform_notifications_manager.h"
--- a/Telegram/SourceFiles/mainwindow.h
+++ b/Telegram/SourceFiles/mainwindow.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "platform/platform_main_window.h"
 #include "core/single_timer.h"

--- a/Telegram/SourceFiles/messenger.cpp
+++ b/Telegram/SourceFiles/messenger.cpp
@ -20,15 +20,15 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "messenger.h"

-#include "localstorage.h"
-#include "pspecific.h"
+#include "storage/localstorage.h"
+#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "application.h"
 #include "shortcuts.h"
 #include "auth_session.h"
 #include "langloaderplain.h"
 #include "observer_peer.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "mainwidget.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/mtp_instance.h"
@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/themes/window_theme.h"
 #include "history/history_location_manager.h"
 #include "ui/widgets/tooltip.h"
-#include "serialize/serialize_common.h"
+#include "storage/serialize_common.h"

 namespace {

--- a/Telegram/SourceFiles/mtproto/dcenter.cpp
+++ b/Telegram/SourceFiles/mtproto/dcenter.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mtproto/facade.h"
 #include "mtproto/dc_options.h"
 #include "mtproto/mtp_instance.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 namespace MTP {
 namespace internal {
--- a/Telegram/SourceFiles/mtproto/facade.cpp
+++ b/Telegram/SourceFiles/mtproto/facade.cpp
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "mtproto/facade.h"

-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "messenger.h"

 namespace MTP {
--- a/Telegram/SourceFiles/mtproto/mtp_instance.cpp
+++ b/Telegram/SourceFiles/mtproto/mtp_instance.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mtproto/mtp_instance.h"

 #include "mtproto/dc_options.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "auth_session.h"
 #include "messenger.h"
 #include "mtproto/connection.h"
--- a/Telegram/SourceFiles/overview/overview_layout.cpp
+++ b/Telegram/SourceFiles/overview/overview_layout.cpp
@ -28,11 +28,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "mainwidget.h"
 #include "application.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "media/media_audio.h"
 #include "media/player/media_player_instance.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "history/history_media_types.h"
 #include "ui/effects/round_checkbox.h"

--- a/Telegram/SourceFiles/passcodewidget.cpp
+++ b/Telegram/SourceFiles/passcodewidget.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "passcodewidget.h"

 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "messenger.h"
 #include "ui/text/text.h"
--- a/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/file_utilities_linux.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "platform/linux/linux_libs.h"
 #include "platform/linux/linux_gdk_helper.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 QStringList qt_make_filter_list(const QString &filter);

--- a/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/main_window_linux.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "application.h"
 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 namespace Platform {
 namespace {
--- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp
+++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp
@ -15,7 +15,7 @@ GNU General Public License for more details.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "pspecific.h"
+#include "platform/linux/platform_specific_linux.h"

 #include "platform/linux/linux_libs.h"
 #include "lang.h"
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "platform/linux/file_utilities_linux.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"

 #include <sys/stat.h>
 #include <sys/types.h>
--- a/Telegram/SourceFiles/platform/mac/main_window_mac.h
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once

 #include "platform/platform_main_window.h"
-#include "pspecific_mac_p.h"
+#include "platform/mac/specific_mac_p.h"

 namespace Platform {

--- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwidget.h"
 #include "application.h"
 #include "historywidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "window/notifications_manager_default.h"
 #include "platform/platform_notifications_manager.h"
 #include "boxes/contactsbox.h"
--- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/mac/notifications_manager_mac.h"

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "platform/mac/mac_utilities.h"
 #include "styles/style_window.h"

--- a/Telegram/SourceFiles/platform/mac/specific_mac.cpp
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.cpp
@ -15,14 +15,14 @@ GNU General Public License for more details.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "pspecific.h"
+#include "platform/mac/specific_mac.h"

 #include "lang.h"
 #include "application.h"
 #include "mainwidget.h"
 #include "historywidget.h"

-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "passcodewidget.h"
 #include "mainwindow.h"
 #include "history/history_location_manager.h"
--- a/Telegram/SourceFiles/platform/mac/specific_mac.h
+++ b/Telegram/SourceFiles/platform/mac/specific_mac.h
@ -17,7 +17,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "pspecific_mac_p.h"
+#include "platform/mac/specific_mac_p.h"

 inline QString psServerPrefix() {
 #ifndef OS_MAC_STORE
--- a/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
+++ b/Telegram/SourceFiles/platform/mac/specific_mac_p.mm
@ -15,12 +15,12 @@ GNU General Public License for more details.
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE
 Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
-#include "pspecific_mac_p.h"
+#include "platform/mac/specific_mac_p.h"

 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "messenger.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "media/player/media_player_instance.h"
 #include "media/media_audio.h"
 #include "platform/mac/mac_utilities.h"
--- a/Telegram/SourceFiles/platform/platform_specific.h
+++ b/Telegram/SourceFiles/platform/platform_specific.h
@ -21,11 +21,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #pragma once

 #ifdef Q_OS_MAC
-#include "pspecific_mac.h"
+#include "platform/mac/specific_mac.h"
 #elif defined Q_OS_LINUX // Q_OS_MAC
-#include "pspecific_linux.h"
+#include "platform/linux/specific_linux.h"
 #elif defined Q_OS_WIN // Q_OS_MAC || Q_OS_LINUX
-#include "pspecific_win.h"
+#include "platform/win/specific_win.h"
 #endif // Q_OS_MAC || Q_OS_LINUX || Q_OS_WIN

 namespace Platform {
--- a/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
+++ b/Telegram/SourceFiles/platform/win/file_utilities_win.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "platform/win/file_utilities_win.h"

 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "platform/win/windows_dlls.h"
 #include "lang.h"

--- a/Telegram/SourceFiles/platform/win/main_window_win.cpp
+++ b/Telegram/SourceFiles/platform/win/main_window_win.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "application.h"
 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "ui/widgets/popup_menu.h"
 #include "window/themes/window_theme.h"

--- a/Telegram/SourceFiles/platform/win/specific_win.cpp
+++ b/Telegram/SourceFiles/platform/win/specific_win.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 "pspecific.h"
+#include "platform/win/specific_win.h"

 #include "platform/win/main_window_win.h"
 #include "platform/win/notifications_manager_win.h"
@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "history/history_location_manager.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "passcodewidget.h"
 #include "core/task_queue.h"

--- a/Telegram/SourceFiles/profile/profile_userpic_button.cpp
+++ b/Telegram/SourceFiles/profile/profile_userpic_button.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "styles/style_profile.h"
 #include "observer_peer.h"
-#include "mtproto/file_download.h"
+#include "storage/file_download.h"

 namespace Profile {

--- a/Telegram/SourceFiles/settings.cpp
+++ b/Telegram/SourceFiles/settings.cpp
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "settings.h"

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "lang.h"

 bool gRtl = false;
--- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp
@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "ui/widgets/buttons.h"
 #include "ui/effects/widget_slide_wrap.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "window/themes/window_theme.h"

 namespace Settings {
--- a/Telegram/SourceFiles/settings/settings_background_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_background_widget.cpp
@ -27,7 +27,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/effects/widget_slide_wrap.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_editor.h"
--- a/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_chat_settings_widget.cpp
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "boxes/emojibox.h"
--- a/Telegram/SourceFiles/settings/settings_general_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_general_widget.cpp
@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/effects/widget_slide_wrap.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
-#include "localstorage.h"
-#include "pspecific.h"
+#include "storage/localstorage.h"
+#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "application.h"
 #include "boxes/languagebox.h"
--- a/Telegram/SourceFiles/settings/settings_layer.cpp
+++ b/Telegram/SourceFiles/settings/settings_layer.cpp
@ -30,7 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/buttons.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "application.h"
 #include "core/file_utilities.h"
--- a/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_notifications_widget.cpp
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "styles/style_settings.h"
 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "ui/effects/widget_slide_wrap.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_privacy_widget.cpp
@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/sessionsbox.h"
 #include "boxes/passcodebox.h"
 #include "boxes/autolockbox.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"

 namespace Settings {

--- a/Telegram/SourceFiles/settings/settings_scale_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_scale_widget.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_settings.h"
 #include "ui/widgets/checkbox.h"
 #include "lang.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwindow.h"
 #include "boxes/confirmbox.h"
 #include "application.h"
--- a/Telegram/SourceFiles/settings/settings_widget.cpp
+++ b/Telegram/SourceFiles/settings/settings_widget.cpp
@ -30,7 +30,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/buttons.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "lang.h"
 #include "messenger.h"
--- a/Telegram/SourceFiles/shortcuts.cpp
+++ b/Telegram/SourceFiles/shortcuts.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "passcodewidget.h"
 #include "mainwidget.h"
 #include "media/player/media_player_instance.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "core/parse_helper.h"

 namespace ShortcutCommands {
--- a/Telegram/SourceFiles/stickers/emoji_pan.cpp
+++ b/Telegram/SourceFiles/stickers/emoji_pan.cpp
@ -32,7 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "dialogs/dialogs_layout.h"
 #include "stickers/stickers.h"
 #include "historywidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"
 #include "apiwrap.h"
--- a/Telegram/SourceFiles/stickers/stickers.cpp
+++ b/Telegram/SourceFiles/stickers/stickers.cpp
@ -24,7 +24,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "boxes/confirmbox.h"
 #include "lang.h"
 #include "apiwrap.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "ui/toast/toast.h"
--- a/Telegram/SourceFiles/storage/file_download.cpp
+++ b/Telegram/SourceFiles/storage/file_download.cpp
@ -18,12 +18,12 @@ 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 "mtproto/file_download.h"
+#include "storage/file_download.h"

 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "messenger.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "platform/platform_file_utilities.h"

 namespace {
--- a/Telegram/SourceFiles/storage/file_upload.cpp
+++ b/Telegram/SourceFiles/storage/file_upload.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 "fileuploader.h"
+#include "storage/file_upload.h"

 FileUploader::FileUploader() : sentSize(0) {
 	memset(sentSizes, 0, sizeof(sentSizes));
--- a/Telegram/SourceFiles/storage/file_upload.h
+++ b/Telegram/SourceFiles/storage/file_upload.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "localimageloader.h"
+#include "storage/localimageloader.h"

 class FileUploader : public QObject, public RPCSender {
 	Q_OBJECT
--- a/Telegram/SourceFiles/storage/localimageloader.cpp
+++ b/Telegram/SourceFiles/storage/localimageloader.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 "localimageloader.h"
+#include "storage/localimageloader.h"

 #include "core/file_utilities.h"
 #include "media/media_audio.h"
--- a/Telegram/SourceFiles/storage/localstorage.cpp
+++ b/Telegram/SourceFiles/storage/localstorage.cpp
@ -18,12 +18,10 @@ 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 "localstorage.h"
+#include "storage/localstorage.h"

-#include <openssl/evp.h>
-
-#include "serialize/serialize_document.h"
-#include "serialize/serialize_common.h"
+#include "storage/serialize_document.h"
+#include "storage/serialize_common.h"
 #include "data/data_drafts.h"
 #include "window/themes/window_theme.h"
 #include "observer_peer.h"
@ -38,6 +36,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "apiwrap.h"
 #include "auth_session.h"

+#include <openssl/evp.h>
+
 namespace Local {
 namespace {

--- a/Telegram/SourceFiles/storage/serialize_common.cpp
+++ b/Telegram/SourceFiles/storage/serialize_common.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 "serialize/serialize_common.h"
+#include "storage/serialize_common.h"

 namespace Serialize {

--- a/Telegram/SourceFiles/storage/serialize_document.cpp
+++ b/Telegram/SourceFiles/storage/serialize_document.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 "serialize/serialize_document.h"
+#include "storage/serialize_document.h"

-#include "serialize/serialize_common.h"
+#include "storage/serialize_common.h"

 namespace {

--- a/Telegram/SourceFiles/structs.cpp
+++ b/Telegram/SourceFiles/structs.cpp
@ -25,13 +25,13 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "observer_peer.h"
 #include "mainwidget.h"
 #include "application.h"
-#include "fileuploader.h"
+#include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "core/file_utilities.h"
 #include "apiwrap.h"
 #include "boxes/confirmbox.h"
 #include "media/media_audio.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "history/history_media_types.h"
 #include "styles/style_history.h"
 #include "window/themes/window_theme.h"
--- a/Telegram/SourceFiles/ui/images.cpp
+++ b/Telegram/SourceFiles/ui/images.cpp
@ -21,8 +21,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/images.h"

 #include "mainwidget.h"
-#include "localstorage.h"
-#include "pspecific.h"
+#include "storage/localstorage.h"
+#include "platform/platform_specific.h"
 #include "messenger.h"

 namespace Images {
--- a/Telegram/SourceFiles/ui/images.h
+++ b/Telegram/SourceFiles/ui/images.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "mtproto/file_download.h"
+#include "storage/file_download.h"

 enum class ImageRoundRadius {
 	None,
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/click_handler_types.h"
 #include "ui/text/text_block.h"
 #include "lang.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "boxes/confirmbox.h"
 #include "mainwindow.h"

--- a/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
+++ b/Telegram/SourceFiles/ui/widgets/popup_menu.cpp
@ -18,7 +18,7 @@
 #include "ui/widgets/popup_menu.h"

 #include "ui/widgets/shadow.h"
-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "application.h"
 #include "mainwindow.h"
 #include "lang.h"
--- a/Telegram/SourceFiles/window/main_window.cpp
+++ b/Telegram/SourceFiles/window/main_window.cpp
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/main_window.h"

-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "styles/style_window.h"
 #include "platform/platform_window_title.h"
 #include "window/themes/window_theme.h"
--- a/Telegram/SourceFiles/window/notifications_utilities.cpp
+++ b/Telegram/SourceFiles/window/notifications_utilities.cpp
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "window/notifications_utilities.h"

-#include "pspecific.h"
+#include "platform/platform_specific.h"
 #include "mainwindow.h"
 #include "styles/style_window.h"

--- a/Telegram/SourceFiles/window/themes/window_theme.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/themes/window_theme.h"

 #include "mainwidget.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "core/parse_helper.h"
 #include "core/zlib_help.h"
 #include "styles/style_widgets.h"
--- a/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
+++ b/Telegram/SourceFiles/window/themes/window_theme_editor.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_editor_block.h"
 #include "mainwindow.h"
-#include "localstorage.h"
+#include "storage/localstorage.h"
 #include "boxes/confirmbox.h"
 #include "styles/style_window.h"
 #include "styles/style_settings.h"