Finalize rename / move of files.

2025-04-16 06:07:06 +02:00 · 2017-04-06 17:38:10 +03:00 · 2017-04-06 17:38:10 +03:00 · 5444b8166c
commit 5444b8166c
parent c94a88e154
152 changed files with 325 additions and 326 deletions
--- a/Telegram/SourceFiles/apiwrap.cpp
+++ b/Telegram/SourceFiles/apiwrap.cpp
@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "historywidget.h"
 #include "storage/localstorage.h"
 #include "auth_session.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "window/themes/window_theme.h"
 #include "window/notifications_manager.h"

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

 #include "styles/style_overview.h"
 #include "styles/style_mediaview.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_history.h"
 #include "styles/style_boxes.h"
 #include "lang.h"
--- a/Telegram/SourceFiles/application.cpp
+++ b/Telegram/SourceFiles/application.cpp
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "storage/localstorage.h"
 #include "autoupdater.h"
 #include "window/notifications_manager.h"
-#include "core/task_queue.h"
+#include "base/task_queue.h"
 #include "messenger.h"

 namespace {
--- a/Telegram/SourceFiles/base/build_config.h
+++ b/Telegram/SourceFiles/base/build_config.h
@ -31,7 +31,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #elif defined(_WIN32) // __APPLE__ || __linux__
 #define OS_WIN 1
 #else // __APPLE__ || __linux__ || _WIN32
-#error Please add support for your platform in core/build_config.h
+#error Please add support for your platform in base/build_config.h
 #endif // else for __APPLE__ || __linux__ || _WIN32

 // For access to standard POSIXish features, use OS_POSIX instead of a
@ -48,7 +48,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #elif defined(_MSC_VER) // __clang__ || __GNUC__
 #define COMPILER_MSVC 1
 #else // _MSC_VER || __clang__ || __GNUC__
-#error Please add support for your compiler in core/build_config.h
+#error Please add support for your compiler in base/build_config.h
 #endif // else for _MSC_VER || __clang__ || __GNUC__

 // Processor architecture detection.
@ -61,7 +61,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #define ARCH_CPU_X86 1
 #define ARCH_CPU_32_BITS 1
 #else
-#error Please add support for your architecture in core/build_config.h
+#error Please add support for your architecture in base/build_config.h
 #endif

 #if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
--- a/Telegram/SourceFiles/base/observer.cpp
+++ b/Telegram/SourceFiles/base/observer.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 "core/observer.h"
+#include "base/observer.h"

 namespace base {
 namespace internal {
--- a/Telegram/SourceFiles/base/observer.h
+++ b/Telegram/SourceFiles/base/observer.h
@ -22,7 +22,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include <vector>
 #include <deque>
-#include "core/type_traits.h"
+#include "base/type_traits.h"

 namespace base {
 namespace internal {
--- a/Telegram/SourceFiles/base/parse_helper.cpp
+++ b/Telegram/SourceFiles/base/parse_helper.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 "core/parse_helper.h"
+#include "base/parse_helper.h"

 namespace base {
 namespace parse {
--- a/Telegram/SourceFiles/base/qthelp_url.cpp
+++ b/Telegram/SourceFiles/base/qthelp_url.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 "core/qthelp_url.h"
+#include "base/qthelp_url.h"

 namespace qthelp {

--- a/Telegram/SourceFiles/base/runtime_composer.cpp
+++ b/Telegram/SourceFiles/base/runtime_composer.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 "core/runtime_composer.h"
+#include "base/runtime_composer.h"

 struct RuntimeComposerMetadatasMap {
 	QMap<uint64, RuntimeComposerMetadata*> data;
--- a/Telegram/SourceFiles/base/task_queue.cpp
+++ b/Telegram/SourceFiles/base/task_queue.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 "core/task_queue.h"
+#include "base/task_queue.h"

 #include <thread>
 #include <condition_variable>
--- a/Telegram/SourceFiles/boxes/about_box.cpp
+++ b/Telegram/SourceFiles/boxes/about_box.cpp
@ -18,13 +18,13 @@ 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 "boxes/aboutbox.h"
+#include "boxes/about_box.h"

 #include "lang.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "autoupdater.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "application.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
--- a/Telegram/SourceFiles/boxes/about_box.h
+++ b/Telegram/SourceFiles/boxes/about_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class LinkButton;
--- a/Telegram/SourceFiles/boxes/abstract_box.cpp
+++ b/Telegram/SourceFiles/boxes/abstract_box.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 "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 #include "styles/style_boxes.h"
 #include "storage/localstorage.h"
--- a/Telegram/SourceFiles/boxes/add_contact_box.cpp
+++ b/Telegram/SourceFiles/boxes/add_contact_box.cpp
@ -18,15 +18,15 @@ 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 "boxes/addcontactbox.h"
+#include "boxes/add_contact_box.h"

 #include "styles/style_boxes.h"
 #include "styles/style_dialogs.h"
 #include "lang.h"
 #include "messenger.h"
-#include "boxes/contactsbox.h"
-#include "boxes/confirmbox.h"
-#include "boxes/photocropbox.h"
+#include "boxes/contacts_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/photo_crop_box.h"
 #include "core/file_utilities.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/boxes/add_contact_box.h
+++ b/Telegram/SourceFiles/boxes/add_contact_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class ConfirmBox;

--- a/Telegram/SourceFiles/boxes/autolock_box.cpp
+++ b/Telegram/SourceFiles/boxes/autolock_box.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 "boxes/autolockbox.h"
+#include "boxes/autolock_box.h"

 #include "lang.h"
 #include "storage/localstorage.h"
--- a/Telegram/SourceFiles/boxes/autolock_box.h
+++ b/Telegram/SourceFiles/boxes/autolock_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class Radiobutton;
--- a/Telegram/SourceFiles/boxes/background_box.cpp
+++ b/Telegram/SourceFiles/boxes/background_box.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 "boxes/backgroundbox.h"
+#include "boxes/background_box.h"

 #include "lang.h"
 #include "mainwidget.h"
--- a/Telegram/SourceFiles/boxes/background_box.h
+++ b/Telegram/SourceFiles/boxes/background_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class RoundCheckbox;
--- a/Telegram/SourceFiles/boxes/calendar_box.cpp
+++ b/Telegram/SourceFiles/boxes/calendar_box.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 "boxes/calendarbox.h"
+#include "boxes/calendar_box.h"

 #include "ui/widgets/buttons.h"
 #include "styles/style_boxes.h"
--- a/Telegram/SourceFiles/boxes/calendar_box.h
+++ b/Telegram/SourceFiles/boxes/calendar_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "abstractbox.h"
+#include "abstract_box.h"

 namespace Ui {
 class IconButton;
--- a/Telegram/SourceFiles/boxes/change_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/change_phone_box.cpp
@ -25,9 +25,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/labels.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/effects/widget_fade_wrap.h"
-#include "boxes/confirmphonebox.h"
+#include "boxes/confirm_phone_box.h"
 #include "ui/toast/toast.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"

 namespace {

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

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class ChangePhoneBox : public BoxContent {
 public:
--- a/Telegram/SourceFiles/boxes/confirm_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_box.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 "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"

 #include "styles/style_boxes.h"
 #include "lang.h"
--- a/Telegram/SourceFiles/boxes/confirm_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class Checkbox;
--- a/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
+++ b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
@ -18,10 +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 "boxes/confirmphonebox.h"
+#include "boxes/confirm_phone_box.h"

 #include "styles/style_boxes.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/labels.h"
--- a/Telegram/SourceFiles/boxes/confirm_phone_box.h
+++ b/Telegram/SourceFiles/boxes/confirm_phone_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "ui/widgets/input_fields.h"

 namespace Ui {
--- a/Telegram/SourceFiles/boxes/connection_box.cpp
+++ b/Telegram/SourceFiles/boxes/connection_box.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 "boxes/connectionbox.h"
+#include "boxes/connection_box.h"

 #include "lang.h"
 #include "storage/localstorage.h"
--- a/Telegram/SourceFiles/boxes/connection_box.h
+++ b/Telegram/SourceFiles/boxes/connection_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class InputField;
--- a/Telegram/SourceFiles/boxes/contacts_box.cpp
+++ b/Telegram/SourceFiles/boxes/contacts_box.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 "boxes/contactsbox.h"
+#include "boxes/contacts_box.h"

 #include "dialogs/dialogs_indexed_list.h"
 #include "styles/style_boxes.h"
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_history.h"
 #include "styles/style_profile.h"
 #include "lang.h"
-#include "boxes/addcontactbox.h"
+#include "boxes/add_contact_box.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "messenger.h"
@ -37,8 +37,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/scroll_area.h"
 #include "ui/effects/widget_slide_wrap.h"
 #include "ui/effects/ripple_animation.h"
-#include "boxes/photocropbox.h"
-#include "boxes/confirmbox.h"
+#include "boxes/photo_crop_box.h"
+#include "boxes/confirm_box.h"
 #include "window/themes/window_theme.h"
 #include "observer_peer.h"
 #include "apiwrap.h"
--- a/Telegram/SourceFiles/boxes/contacts_box.h
+++ b/Telegram/SourceFiles/boxes/contacts_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "core/single_timer.h"
 #include "ui/effects/round_checkbox.h"
 #include "boxes/members_box.h"
--- a/Telegram/SourceFiles/boxes/download_path_box.cpp
+++ b/Telegram/SourceFiles/boxes/download_path_box.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 "boxes/downloadpathbox.h"
+#include "boxes/download_path_box.h"

 #include "lang.h"
 #include "storage/localstorage.h"
--- a/Telegram/SourceFiles/boxes/download_path_box.h
+++ b/Telegram/SourceFiles/boxes/download_path_box.h
@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
-#include "core/observer.h"
+#include "boxes/abstract_box.h"
+#include "base/observer.h"

 namespace Ui {
 template <typename Enum>
--- a/Telegram/SourceFiles/boxes/edit_color_box.cpp
+++ b/Telegram/SourceFiles/boxes/edit_color_box.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 "boxes/editcolorbox.h"
+#include "boxes/edit_color_box.h"

 #include "lang.h"
 #include "styles/style_boxes.h"
--- a/Telegram/SourceFiles/boxes/edit_color_box.h
+++ b/Telegram/SourceFiles/boxes/edit_color_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class EditColorBox : public BoxContent {
 	Q_OBJECT
--- a/Telegram/SourceFiles/boxes/edit_privacy_box.h
+++ b/Telegram/SourceFiles/boxes/edit_privacy_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "mtproto/sender.h"

 namespace Ui {
--- a/Telegram/SourceFiles/boxes/emoji_box.cpp
+++ b/Telegram/SourceFiles/boxes/emoji_box.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 "boxes/emojibox.h"
+#include "boxes/emoji_box.h"

 #include "lang.h"
 #include "mainwidget.h"
--- a/Telegram/SourceFiles/boxes/emoji_box.h
+++ b/Telegram/SourceFiles/boxes/emoji_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class EmojiBox : public BoxContent {
 public:
--- a/Telegram/SourceFiles/boxes/language_box.cpp
+++ b/Telegram/SourceFiles/boxes/language_box.cpp
@ -18,13 +18,13 @@ 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 "boxes/languagebox.h"
+#include "boxes/language_box.h"

 #include "lang.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "storage/localstorage.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "langloaderplain.h"
--- a/Telegram/SourceFiles/boxes/language_box.h
+++ b/Telegram/SourceFiles/boxes/language_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class RadiobuttonGroup;
--- a/Telegram/SourceFiles/boxes/local_storage_box.cpp
+++ b/Telegram/SourceFiles/boxes/local_storage_box.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 "boxes/localstoragebox.h"
+#include "boxes/local_storage_box.h"

 #include "styles/style_boxes.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/boxes/local_storage_box.h
+++ b/Telegram/SourceFiles/boxes/local_storage_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class LinkButton;
--- a/Telegram/SourceFiles/boxes/members_box.cpp
+++ b/Telegram/SourceFiles/boxes/members_box.cpp
@ -25,8 +25,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "boxes/contactsbox.h"
-#include "boxes/confirmbox.h"
+#include "boxes/contacts_box.h"
+#include "boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/effects/ripple_animation.h"
--- a/Telegram/SourceFiles/boxes/members_box.h
+++ b/Telegram/SourceFiles/boxes/members_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "core/single_timer.h"
 #include "ui/effects/round_checkbox.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/boxes/notifications_box.h
+++ b/Telegram/SourceFiles/boxes/notifications_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class LinkButton;
--- a/Telegram/SourceFiles/boxes/passcode_box.cpp
+++ b/Telegram/SourceFiles/boxes/passcode_box.cpp
@ -18,10 +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 "boxes/passcodebox.h"
+#include "boxes/passcode_box.h"

 #include "lang.h"
-#include "confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "mainwindow.h"
 #include "storage/localstorage.h"
 #include "styles/style_boxes.h"
--- a/Telegram/SourceFiles/boxes/passcode_box.h
+++ b/Telegram/SourceFiles/boxes/passcode_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class InputField;
--- a/Telegram/SourceFiles/boxes/peer_list_box.cpp
+++ b/Telegram/SourceFiles/boxes/peer_list_box.cpp
@ -34,7 +34,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/effects/widget_slide_wrap.h"
 #include "lang.h"
 #include "ui/effects/round_checkbox.h"
-#include "boxes/contactsbox.h"
+#include "boxes/contacts_box.h"
 #include "window/themes/window_theme.h"

 PeerListBox::PeerListBox(QWidget*, std::unique_ptr<Controller> controller)
--- a/Telegram/SourceFiles/boxes/peer_list_box.h
+++ b/Telegram/SourceFiles/boxes/peer_list_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class RippleAnimation;
--- a/Telegram/SourceFiles/boxes/photo_crop_box.cpp
+++ b/Telegram/SourceFiles/boxes/photo_crop_box.cpp
@ -18,12 +18,11 @@ 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 "boxes/photocropbox.h"
+#include "boxes/photo_crop_box.h"

 #include "lang.h"
 #include "messenger.h"
 #include "mainwidget.h"
-#include "photocropbox.h"
 #include "storage/file_upload.h"
 #include "ui/widgets/buttons.h"
 #include "styles/style_boxes.h"
--- a/Telegram/SourceFiles/boxes/photo_crop_box.h
+++ b/Telegram/SourceFiles/boxes/photo_crop_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class PhotoCropBox : public BoxContent {
 	Q_OBJECT
--- a/Telegram/SourceFiles/boxes/report_box.cpp
+++ b/Telegram/SourceFiles/boxes/report_box.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "ui/widgets/checkbox.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
--- a/Telegram/SourceFiles/boxes/report_box.h
+++ b/Telegram/SourceFiles/boxes/report_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 template <typename Enum>
--- a/Telegram/SourceFiles/boxes/self_destruction_box.h
+++ b/Telegram/SourceFiles/boxes/self_destruction_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "mtproto/sender.h"

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

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

 namespace Ui {
--- a/Telegram/SourceFiles/boxes/sessions_box.cpp
+++ b/Telegram/SourceFiles/boxes/sessions_box.cpp
@ -18,14 +18,14 @@ 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 "boxes/sessionsbox.h"
+#include "boxes/sessions_box.h"

 #include "lang.h"
 #include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "countries.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "styles/style_boxes.h"
--- a/Telegram/SourceFiles/boxes/sessions_box.h
+++ b/Telegram/SourceFiles/boxes/sessions_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "core/single_timer.h"

 class ConfirmBox;
--- a/Telegram/SourceFiles/boxes/share_box.cpp
+++ b/Telegram/SourceFiles/boxes/share_box.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 "boxes/sharebox.h"
+#include "boxes/share_box.h"

 #include "dialogs/dialogs_indexed_list.h"
 #include "styles/style_boxes.h"
@ -27,9 +27,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"
 #include "mainwindow.h"
 #include "mainwidget.h"
-#include "core/qthelp_url.h"
+#include "base/qthelp_url.h"
 #include "storage/localstorage.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "apiwrap.h"
 #include "ui/toast/toast.h"
 #include "ui/widgets/multi_select.h"
@ -37,7 +37,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "window/themes/window_theme.h"
-#include "boxes/contactsbox.h"
+#include "boxes/contacts_box.h"
 #include "auth_session.h"
 #include "messenger.h"

--- a/Telegram/SourceFiles/boxes/share_box.h
+++ b/Telegram/SourceFiles/boxes/share_box.h
@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
-#include "core/observer.h"
+#include "boxes/abstract_box.h"
+#include "base/observer.h"
 #include "ui/effects/round_checkbox.h"

 namespace Dialogs {
--- a/Telegram/SourceFiles/boxes/sticker_set_box.cpp
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
@ -18,18 +18,18 @@ 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 "boxes/stickersetbox.h"
+#include "boxes/sticker_set_box.h"

 #include "lang.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
-#include "stickers/stickers.h"
-#include "boxes/confirmbox.h"
+#include "chat_helpers/stickers.h"
+#include "boxes/confirm_box.h"
 #include "apiwrap.h"
 #include "storage/localstorage.h"
 #include "dialogs/dialogs_layout.h"
 #include "styles/style_boxes.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "auth_session.h"
--- a/Telegram/SourceFiles/boxes/sticker_set_box.h
+++ b/Telegram/SourceFiles/boxes/sticker_set_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include <vector>

 class ConfirmBox;
--- a/Telegram/SourceFiles/boxes/stickers_box.cpp
+++ b/Telegram/SourceFiles/boxes/stickers_box.cpp
@ -22,14 +22,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "lang.h"
 #include "mainwidget.h"
-#include "stickers/stickers.h"
-#include "boxes/confirmbox.h"
-#include "boxes/stickersetbox.h"
+#include "chat_helpers/stickers.h"
+#include "boxes/confirm_box.h"
+#include "boxes/sticker_set_box.h"
 #include "apiwrap.h"
 #include "storage/localstorage.h"
 #include "dialogs/dialogs_layout.h"
 #include "styles/style_boxes.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/scroll_area.h"
 #include "ui/effects/ripple_animation.h"
--- a/Telegram/SourceFiles/boxes/stickers_box.h
+++ b/Telegram/SourceFiles/boxes/stickers_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 class ConfirmBox;

--- a/Telegram/SourceFiles/boxes/username_box.cpp
+++ b/Telegram/SourceFiles/boxes/username_box.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 "boxes/usernamebox.h"
+#include "boxes/username_box.h"

 #include "lang.h"
 #include "application.h"
--- a/Telegram/SourceFiles/boxes/username_box.h
+++ b/Telegram/SourceFiles/boxes/username_box.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"

 namespace Ui {
 class UsernameInput;
--- a/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
@ -18,10 +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 "stickers/emoji_list_widget.h"
+#include "chat_helpers/emoji_list_widget.h"

 #include "ui/widgets/buttons.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/shadow.h"
 #include "lang.h"

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

-#include "stickers/emoji_panel.h"
+#include "chat_helpers/emoji_panel.h"

 namespace ChatHelpers {

--- a/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp
+++ b/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp
@ -18,17 +18,17 @@ 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 "stickers/emoji_panel.h"
+#include "chat_helpers/emoji_panel.h"

-#include "stickers/emoji_list_widget.h"
-#include "stickers/stickers_list_widget.h"
-#include "stickers/gifs_list_widget.h"
-#include "styles/style_stickers.h"
+#include "chat_helpers/emoji_list_widget.h"
+#include "chat_helpers/stickers_list_widget.h"
+#include "chat_helpers/gifs_list_widget.h"
+#include "chat_helpers/stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "ui/widgets/discrete_sliders.h"
 #include "ui/widgets/scroll_area.h"
-#include "stickers/stickers.h"
 #include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"
--- a/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
+++ b/Telegram/SourceFiles/chat_helpers/field_autocomplete.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/field_autocomplete.h"
+#include "chat_helpers/field_autocomplete.h"

 #include "mainwindow.h"
 #include "apiwrap.h"
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/scroll_area.h"
 #include "styles/style_history.h"
 #include "styles/style_widgets.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "auth_session.h"

 FieldAutocomplete::FieldAutocomplete(QWidget *parent) : TWidget(parent)
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
@ -18,15 +18,15 @@ 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 "stickers/gifs_list_widget.h"
+#include "chat_helpers/gifs_list_widget.h"

-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/input_fields.h"
 #include "ui/effects/ripple_animation.h"
 #include "boxes/stickers_box.h"
 #include "inline_bots/inline_bot_result.h"
-#include "stickers/stickers.h"
+#include "chat_helpers/stickers.h"
 #include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"
--- a/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "stickers/emoji_panel.h"
+#include "chat_helpers/emoji_panel.h"
 #include "inline_bots/inline_bot_layout_item.h"

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

 #include "boxes/stickers_box.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "lang.h"
 #include "apiwrap.h"
 #include "storage/localstorage.h"
 #include "mainwidget.h"
 #include "mainwindow.h"
 #include "ui/toast/toast.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"

 namespace Stickers {
 namespace {
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
@ -18,21 +18,21 @@ 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 "stickers/stickers_list_widget.h"
+#include "chat_helpers/stickers_list_widget.h"

-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/effects/ripple_animation.h"
 #include "boxes/stickers_box.h"
 #include "inline_bots/inline_bot_result.h"
-#include "stickers/stickers.h"
+#include "chat_helpers/stickers.h"
 #include "storage/localstorage.h"
 #include "lang.h"
 #include "mainwindow.h"
 #include "dialogs/dialogs_layout.h"
-#include "boxes/stickersetbox.h"
+#include "boxes/sticker_set_box.h"
 #include "boxes/stickers_box.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"

 namespace ChatHelpers {
 namespace {
--- a/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
+++ b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "stickers/emoji_panel.h"
-#include "core/variant.h"
+#include "chat_helpers/emoji_panel.h"
+#include "base/variant.h"

 namespace Ui {
 class LinkButton;
--- a/Telegram/SourceFiles/codegen/emoji/data.cpp
+++ b/Telegram/SourceFiles/codegen/emoji/data.cpp
@ -39,7 +39,7 @@ using std::end;
 using InputId = vector<uint32>;
 using InputCategory = vector<InputId>;

-// copied from emojibox.cpp
+// copied from emoji_box.cpp
 struct Replace {
 	InputId code;
 	const char *replace;
--- a/Telegram/SourceFiles/core/basic_types.h
+++ b/Telegram/SourceFiles/core/basic_types.h
@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include <memory>
 #include <ctime>

-#include "core/build_config.h"
+#include "base/build_config.h"

 // Custom libc++ build used for old OS X versions already has this.
 #ifndef OS_MAC_OLD
@ -46,7 +46,7 @@ void as_const(const T&&) = delete;

 #endif // OS_MAC_OLD

-#include "core/ordered_set.h"
+#include "base/ordered_set.h"

 //using uchar = unsigned char; // Qt has uchar
 using int16 = qint16;
--- a/Telegram/SourceFiles/core/click_handler_types.cpp
+++ b/Telegram/SourceFiles/core/click_handler_types.cpp
@ -22,9 +22,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org

 #include "lang.h"
 #include "platform/platform_specific.h"
-#include "boxes/confirmbox.h"
-#include "core/qthelp_regex.h"
-#include "core/qthelp_url.h"
+#include "boxes/confirm_box.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.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
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "storage/localstorage.h"
 #include "platform/platform_file_utilities.h"
-#include "core/task_queue.h"
+#include "base/task_queue.h"

 bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath) {
 	QStringList files;
--- a/Telegram/SourceFiles/core/file_utilities.h
+++ b/Telegram/SourceFiles/core/file_utilities.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "core/observer.h"
+#include "base/observer.h"

 // legacy
 bool filedialogGetSaveFile(QString &file, const QString &caption, const QString &filter, const QString &initialPath);
--- a/Telegram/SourceFiles/dialogswidget.cpp
+++ b/Telegram/SourceFiles/dialogswidget.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "dialogs/dialogs_indexed_list.h"
 #include "dialogs/dialogs_layout.h"
 #include "styles/style_dialogs.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_history.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/popup_menu.h"
@ -33,10 +33,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "dialogswidget.h"
 #include "mainwidget.h"
-#include "boxes/addcontactbox.h"
-#include "boxes/contactsbox.h"
-#include "boxes/confirmbox.h"
-#include "boxes/aboutbox.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/contacts_box.h"
+#include "boxes/confirm_box.h"
+#include "boxes/about_box.h"
 #include "storage/localstorage.h"
 #include "apiwrap.h"
 #include "ui/widgets/dropdown_menu.h"
--- a/Telegram/SourceFiles/facades.cpp
+++ b/Telegram/SourceFiles/facades.cpp
@ -24,10 +24,10 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "mainwidget.h"
 #include "messenger.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "layerwidget.h"
 #include "lang.h"
-#include "core/observer.h"
+#include "base/observer.h"

 Q_DECLARE_METATYPE(ClickHandlerPtr);
 Q_DECLARE_METATYPE(Qt::MouseButton);
--- a/Telegram/SourceFiles/facades.h
+++ b/Telegram/SourceFiles/facades.h
@ -20,8 +20,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "core/type_traits.h"
-#include "core/observer.h"
+#include "base/type_traits.h"
+#include "base/observer.h"

 class LayerWidget;
 class BoxContent;
--- a/Telegram/SourceFiles/history.h
+++ b/Telegram/SourceFiles/history.h
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "structs.h"
 #include "dialogs/dialogs_common.h"
 #include "ui/effects/send_action_animations.h"
-#include "core/observer.h"
+#include "base/observer.h"

 void historyInit();

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

-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_boxes.h"
-#include "boxes/confirmbox.h"
-#include "boxes/stickersetbox.h"
+#include "boxes/confirm_box.h"
+#include "boxes/sticker_set_box.h"
 #include "inline_bots/inline_bot_result.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "dialogs/dialogs_layout.h"
--- a/Telegram/SourceFiles/history/history_item.h
+++ b/Telegram/SourceFiles/history/history_item.h
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #pragma once

-#include "core/runtime_composer.h"
+#include "base/runtime_composer.h"

 namespace Ui {
 class RippleAnimation;
--- a/Telegram/SourceFiles/history/history_media_types.cpp
+++ b/Telegram/SourceFiles/history/history_media_types.cpp
@ -27,8 +27,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "media/media_audio.h"
 #include "media/media_clip_reader.h"
 #include "media/player/media_player_instance.h"
-#include "boxes/confirmbox.h"
-#include "boxes/addcontactbox.h"
+#include "boxes/confirm_box.h"
+#include "boxes/add_contact_box.h"
 #include "core/click_handler_types.h"
 #include "history/history_location_manager.h"
 #include "styles/style_history.h"
--- a/Telegram/SourceFiles/historywidget.cpp
+++ b/Telegram/SourceFiles/historywidget.cpp
@ -25,9 +25,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_window.h"
 #include "styles/style_boxes.h"
 #include "styles/style_profile.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "boxes/send_files_box.h"
-#include "boxes/sharebox.h"
+#include "boxes/share_box.h"
 #include "core/file_utilities.h"
 #include "ui/toast/toast.h"
 #include "ui/special_buttons.h"
@ -42,7 +42,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "history/history_drag_area.h"
 #include "profile/profile_block_group_members.h"
 #include "core/click_handler_types.h"
-#include "stickers/emoji_panel.h"
+#include "chat_helpers/emoji_panel.h"
 #include "lang.h"
 #include "application.h"
 #include "mainwidget.h"
@ -57,7 +57,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/top_bar_widget.h"
 #include "window/themes/window_theme.h"
 #include "observer_peer.h"
-#include "core/qthelp_regex.h"
+#include "base/qthelp_regex.h"
 #include "ui/widgets/popup_menu.h"
 #include "platform/platform_file_utilities.h"
 #include "auth_session.h"
--- a/Telegram/SourceFiles/historywidget.h
+++ b/Telegram/SourceFiles/historywidget.h
@ -25,7 +25,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/input_fields.h"
 #include "ui/widgets/scroll_area.h"
 #include "history/history_common.h"
-#include "history/field_autocomplete.h"
+#include "chat_helpers/field_autocomplete.h"
 #include "window/section_widget.h"
 #include "core/single_timer.h"

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

 #include "styles/style_overview.h"
 #include "styles/style_history.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "styles/style_widgets.h"
 #include "inline_bots/inline_bot_result.h"
 #include "media/media_audio.h"
--- a/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
+++ b/Telegram/SourceFiles/inline_bots/inline_results_widget.cpp
@ -20,11 +20,11 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "inline_bots/inline_results_widget.h"

-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/shadow.h"
 #include "ui/effects/ripple_animation.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "inline_bots/inline_bot_result.h"
 #include "inline_bots/inline_bot_layout_item.h"
 #include "dialogs/dialogs_layout.h"
--- a/Telegram/SourceFiles/intro/introphone.cpp
+++ b/Telegram/SourceFiles/intro/introphone.cpp
@ -28,7 +28,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "ui/widgets/labels.h"
 #include "ui/effects/widget_fade_wrap.h"
 #include "core/click_handler_types.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "messenger.h"

 namespace Intro {
--- a/Telegram/SourceFiles/intro/intropwdcheck.cpp
+++ b/Telegram/SourceFiles/intro/intropwdcheck.cpp
@ -23,7 +23,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_intro.h"
 #include "styles/style_boxes.h"
 #include "core/file_utilities.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "lang.h"
 #include "application.h"
 #include "intro/introsignup.h"
--- a/Telegram/SourceFiles/intro/introsignup.cpp
+++ b/Telegram/SourceFiles/intro/introsignup.cpp
@ -23,8 +23,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_intro.h"
 #include "styles/style_boxes.h"
 #include "core/file_utilities.h"
-#include "boxes/photocropbox.h"
-#include "boxes/confirmbox.h"
+#include "boxes/photo_crop_box.h"
+#include "boxes/confirm_box.h"
 #include "lang.h"
 #include "application.h"
 #include "ui/widgets/buttons.h"
--- a/Telegram/SourceFiles/intro/introwidget.cpp
+++ b/Telegram/SourceFiles/intro/introwidget.cpp
@ -32,7 +32,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "mainwindow.h"
 #include "messenger.h"
 #include "application.h"
-#include "boxes/confirmbox.h"
+#include "boxes/confirm_box.h"
 #include "ui/text/text.h"
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/labels.h"
--- a/Telegram/SourceFiles/langloaderplain.cpp
+++ b/Telegram/SourceFiles/langloaderplain.cpp
@ -20,7 +20,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "langloaderplain.h"

-#include "core/parse_helper.h"
+#include "base/parse_helper.h"

 bool LangLoaderPlain::readKeyValue(const char *&from, const char *end) {
 	using base::parse::skipWhitespaces;
--- a/Telegram/SourceFiles/layerwidget.cpp
+++ b/Telegram/SourceFiles/layerwidget.cpp
@ -21,7 +21,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "lang.h"

 #include "media/media_clip_reader.h"
-#include "boxes/abstractbox.h"
+#include "boxes/abstract_box.h"
 #include "layerwidget.h"
 #include "application.h"
 #include "mainwindow.h"
@ -29,7 +29,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "core/file_utilities.h"
 #include "styles/style_boxes.h"
 #include "styles/style_widgets.h"
-#include "styles/style_stickers.h"
+#include "styles/style_chat_helpers.h"
 #include "ui/widgets/shadow.h"
 #include "window/window_main_menu.h"
 #include "auth_session.h"
--- a/Telegram/SourceFiles/layout.cpp
+++ b/Telegram/SourceFiles/layout.cpp
@ -26,8 +26,8 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "storage/file_upload.h"
 #include "mainwindow.h"
 #include "core/file_utilities.h"
-#include "boxes/addcontactbox.h"
-#include "boxes/confirmbox.h"
+#include "boxes/add_contact_box.h"
+#include "boxes/confirm_box.h"
 #include "media/media_audio.h"
 #include "storage/localstorage.h"

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

-#include "core/runtime_composer.h"
+#include "base/runtime_composer.h"

 static constexpr TextSelection FullSelection = { 0xFFFF, 0xFFFF };

--- a/Telegram/SourceFiles/mainwidget.cpp
+++ b/Telegram/SourceFiles/mainwidget.cpp
@ -36,18 +36,18 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "historywidget.h"
 #include "overviewwidget.h"
 #include "lang.h"
-#include "boxes/addcontactbox.h"
+#include "boxes/add_contact_box.h"
 #include "storage/file_upload.h"
 #include "messenger.h"
 #include "application.h"
 #include "mainwindow.h"
 #include "inline_bots/inline_bot_layout_item.h"
-#include "boxes/confirmbox.h"
-#include "boxes/stickersetbox.h"
-#include "boxes/contactsbox.h"
-#include "boxes/downloadpathbox.h"
-#include "boxes/confirmphonebox.h"
-#include "boxes/sharebox.h"
+#include "boxes/confirm_box.h"
+#include "boxes/sticker_set_box.h"
+#include "boxes/contacts_box.h"
+#include "boxes/download_path_box.h"
+#include "boxes/confirm_phone_box.h"
+#include "boxes/share_box.h"
 #include "storage/localstorage.h"
 #include "shortcuts.h"
 #include "media/media_audio.h"
@ -55,14 +55,14 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "media/player/media_player_widget.h"
 #include "media/player/media_player_volume_controller.h"
 #include "media/player/media_player_instance.h"
-#include "core/qthelp_regex.h"
-#include "core/qthelp_url.h"
+#include "base/qthelp_regex.h"
+#include "base/qthelp_url.h"
 #include "window/themes/window_theme.h"
 #include "window/player_wrap_widget.h"
 #include "styles/style_boxes.h"
 #include "mtproto/dc_options.h"
 #include "core/file_utilities.h"
-#include "boxes/calendarbox.h"
+#include "boxes/calendar_box.h"
 #include "auth_session.h"
 #include "window/notifications_manager.h"
 #include "window/window_controller.h"
--- a/Telegram/SourceFiles/mainwindow.cpp
+++ b/Telegram/SourceFiles/mainwindow.cpp
@ -26,7 +26,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "styles/style_boxes.h"
 #include "ui/widgets/popup_menu.h"
 #include "ui/widgets/buttons.h"
-#include "core/zlib_help.h"
+#include "base/zlib_help.h"
 #include "lang.h"
 #include "shortcuts.h"
 #include "messenger.h"
@ -36,9 +36,9 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "intro/introwidget.h"
 #include "mainwidget.h"
 #include "layerwidget.h"
-#include "boxes/confirmbox.h"
-#include "boxes/contactsbox.h"
-#include "boxes/addcontactbox.h"
+#include "boxes/confirm_box.h"
+#include "boxes/contacts_box.h"
+#include "boxes/add_contact_box.h"
 #include "observer_peer.h"
 #include "autoupdater.h"
 #include "mediaview.h"
@ -50,7 +50,7 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 #include "window/themes/window_theme.h"
 #include "window/themes/window_theme_warning.h"
 #include "window/window_main_menu.h"
-#include "core/task_queue.h"
+#include "base/task_queue.h"
 #include "auth_session.h"
 #include "window/window_controller.h"

--- a/Show more
+++ b/Show more