diff --git a/Telegram/SourceFiles/core/build_config.h b/Telegram/SourceFiles/base/build_config.h
similarity index 100%
rename from Telegram/SourceFiles/core/build_config.h
rename to Telegram/SourceFiles/base/build_config.h
diff --git a/Telegram/SourceFiles/core/lambda.h b/Telegram/SourceFiles/base/lambda.h
similarity index 100%
rename from Telegram/SourceFiles/core/lambda.h
rename to Telegram/SourceFiles/base/lambda.h
diff --git a/Telegram/SourceFiles/core/observer.cpp b/Telegram/SourceFiles/base/observer.cpp
similarity index 100%
rename from Telegram/SourceFiles/core/observer.cpp
rename to Telegram/SourceFiles/base/observer.cpp
diff --git a/Telegram/SourceFiles/core/observer.h b/Telegram/SourceFiles/base/observer.h
similarity index 100%
rename from Telegram/SourceFiles/core/observer.h
rename to Telegram/SourceFiles/base/observer.h
diff --git a/Telegram/SourceFiles/core/ordered_set.h b/Telegram/SourceFiles/base/ordered_set.h
similarity index 100%
rename from Telegram/SourceFiles/core/ordered_set.h
rename to Telegram/SourceFiles/base/ordered_set.h
diff --git a/Telegram/SourceFiles/core/parse_helper.cpp b/Telegram/SourceFiles/base/parse_helper.cpp
similarity index 100%
rename from Telegram/SourceFiles/core/parse_helper.cpp
rename to Telegram/SourceFiles/base/parse_helper.cpp
diff --git a/Telegram/SourceFiles/core/parse_helper.h b/Telegram/SourceFiles/base/parse_helper.h
similarity index 100%
rename from Telegram/SourceFiles/core/parse_helper.h
rename to Telegram/SourceFiles/base/parse_helper.h
diff --git a/Telegram/SourceFiles/core/qthelp_regex.h b/Telegram/SourceFiles/base/qthelp_regex.h
similarity index 100%
rename from Telegram/SourceFiles/core/qthelp_regex.h
rename to Telegram/SourceFiles/base/qthelp_regex.h
diff --git a/Telegram/SourceFiles/core/qthelp_url.cpp b/Telegram/SourceFiles/base/qthelp_url.cpp
similarity index 100%
rename from Telegram/SourceFiles/core/qthelp_url.cpp
rename to Telegram/SourceFiles/base/qthelp_url.cpp
diff --git a/Telegram/SourceFiles/core/qthelp_url.h b/Telegram/SourceFiles/base/qthelp_url.h
similarity index 100%
rename from Telegram/SourceFiles/core/qthelp_url.h
rename to Telegram/SourceFiles/base/qthelp_url.h
diff --git a/Telegram/SourceFiles/core/runtime_composer.cpp b/Telegram/SourceFiles/base/runtime_composer.cpp
similarity index 100%
rename from Telegram/SourceFiles/core/runtime_composer.cpp
rename to Telegram/SourceFiles/base/runtime_composer.cpp
diff --git a/Telegram/SourceFiles/core/runtime_composer.h b/Telegram/SourceFiles/base/runtime_composer.h
similarity index 100%
rename from Telegram/SourceFiles/core/runtime_composer.h
rename to Telegram/SourceFiles/base/runtime_composer.h
diff --git a/Telegram/SourceFiles/core/task_queue.cpp b/Telegram/SourceFiles/base/task_queue.cpp
similarity index 100%
rename from Telegram/SourceFiles/core/task_queue.cpp
rename to Telegram/SourceFiles/base/task_queue.cpp
diff --git a/Telegram/SourceFiles/core/task_queue.h b/Telegram/SourceFiles/base/task_queue.h
similarity index 100%
rename from Telegram/SourceFiles/core/task_queue.h
rename to Telegram/SourceFiles/base/task_queue.h
diff --git a/Telegram/SourceFiles/core/type_traits.h b/Telegram/SourceFiles/base/type_traits.h
similarity index 100%
rename from Telegram/SourceFiles/core/type_traits.h
rename to Telegram/SourceFiles/base/type_traits.h
diff --git a/Telegram/SourceFiles/core/variant.h b/Telegram/SourceFiles/base/variant.h
similarity index 100%
rename from Telegram/SourceFiles/core/variant.h
rename to Telegram/SourceFiles/base/variant.h
diff --git a/Telegram/SourceFiles/core/virtual_method.h b/Telegram/SourceFiles/base/virtual_method.h
similarity index 100%
rename from Telegram/SourceFiles/core/virtual_method.h
rename to Telegram/SourceFiles/base/virtual_method.h
diff --git a/Telegram/SourceFiles/core/weak_unique_ptr.h b/Telegram/SourceFiles/base/weak_unique_ptr.h
similarity index 100%
rename from Telegram/SourceFiles/core/weak_unique_ptr.h
rename to Telegram/SourceFiles/base/weak_unique_ptr.h
diff --git a/Telegram/SourceFiles/core/zlib_help.h b/Telegram/SourceFiles/base/zlib_help.h
similarity index 100%
rename from Telegram/SourceFiles/core/zlib_help.h
rename to Telegram/SourceFiles/base/zlib_help.h
diff --git a/Telegram/SourceFiles/boxes/aboutbox.cpp b/Telegram/SourceFiles/boxes/about_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/aboutbox.cpp
rename to Telegram/SourceFiles/boxes/about_box.cpp
diff --git a/Telegram/SourceFiles/boxes/aboutbox.h b/Telegram/SourceFiles/boxes/about_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/aboutbox.h
rename to Telegram/SourceFiles/boxes/about_box.h
diff --git a/Telegram/SourceFiles/boxes/abstractbox.cpp b/Telegram/SourceFiles/boxes/abstract_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/abstractbox.cpp
rename to Telegram/SourceFiles/boxes/abstract_box.cpp
diff --git a/Telegram/SourceFiles/boxes/abstractbox.h b/Telegram/SourceFiles/boxes/abstract_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/abstractbox.h
rename to Telegram/SourceFiles/boxes/abstract_box.h
diff --git a/Telegram/SourceFiles/boxes/addcontactbox.cpp b/Telegram/SourceFiles/boxes/add_contact_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/addcontactbox.cpp
rename to Telegram/SourceFiles/boxes/add_contact_box.cpp
diff --git a/Telegram/SourceFiles/boxes/addcontactbox.h b/Telegram/SourceFiles/boxes/add_contact_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/addcontactbox.h
rename to Telegram/SourceFiles/boxes/add_contact_box.h
diff --git a/Telegram/SourceFiles/boxes/autolockbox.cpp b/Telegram/SourceFiles/boxes/autolock_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/autolockbox.cpp
rename to Telegram/SourceFiles/boxes/autolock_box.cpp
diff --git a/Telegram/SourceFiles/boxes/autolockbox.h b/Telegram/SourceFiles/boxes/autolock_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/autolockbox.h
rename to Telegram/SourceFiles/boxes/autolock_box.h
diff --git a/Telegram/SourceFiles/boxes/backgroundbox.cpp b/Telegram/SourceFiles/boxes/background_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/backgroundbox.cpp
rename to Telegram/SourceFiles/boxes/background_box.cpp
diff --git a/Telegram/SourceFiles/boxes/backgroundbox.h b/Telegram/SourceFiles/boxes/background_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/backgroundbox.h
rename to Telegram/SourceFiles/boxes/background_box.h
diff --git a/Telegram/SourceFiles/boxes/calendarbox.cpp b/Telegram/SourceFiles/boxes/calendar_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/calendarbox.cpp
rename to Telegram/SourceFiles/boxes/calendar_box.cpp
diff --git a/Telegram/SourceFiles/boxes/calendarbox.h b/Telegram/SourceFiles/boxes/calendar_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/calendarbox.h
rename to Telegram/SourceFiles/boxes/calendar_box.h
diff --git a/Telegram/SourceFiles/boxes/confirmbox.cpp b/Telegram/SourceFiles/boxes/confirm_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/confirmbox.cpp
rename to Telegram/SourceFiles/boxes/confirm_box.cpp
diff --git a/Telegram/SourceFiles/boxes/confirmbox.h b/Telegram/SourceFiles/boxes/confirm_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/confirmbox.h
rename to Telegram/SourceFiles/boxes/confirm_box.h
diff --git a/Telegram/SourceFiles/boxes/confirmphonebox.cpp b/Telegram/SourceFiles/boxes/confirm_phone_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/confirmphonebox.cpp
rename to Telegram/SourceFiles/boxes/confirm_phone_box.cpp
diff --git a/Telegram/SourceFiles/boxes/confirmphonebox.h b/Telegram/SourceFiles/boxes/confirm_phone_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/confirmphonebox.h
rename to Telegram/SourceFiles/boxes/confirm_phone_box.h
diff --git a/Telegram/SourceFiles/boxes/connectionbox.cpp b/Telegram/SourceFiles/boxes/connection_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/connectionbox.cpp
rename to Telegram/SourceFiles/boxes/connection_box.cpp
diff --git a/Telegram/SourceFiles/boxes/connectionbox.h b/Telegram/SourceFiles/boxes/connection_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/connectionbox.h
rename to Telegram/SourceFiles/boxes/connection_box.h
diff --git a/Telegram/SourceFiles/boxes/contactsbox.cpp b/Telegram/SourceFiles/boxes/contacts_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/contactsbox.cpp
rename to Telegram/SourceFiles/boxes/contacts_box.cpp
diff --git a/Telegram/SourceFiles/boxes/contactsbox.h b/Telegram/SourceFiles/boxes/contacts_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/contactsbox.h
rename to Telegram/SourceFiles/boxes/contacts_box.h
diff --git a/Telegram/SourceFiles/boxes/downloadpathbox.cpp b/Telegram/SourceFiles/boxes/download_path_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/downloadpathbox.cpp
rename to Telegram/SourceFiles/boxes/download_path_box.cpp
diff --git a/Telegram/SourceFiles/boxes/downloadpathbox.h b/Telegram/SourceFiles/boxes/download_path_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/downloadpathbox.h
rename to Telegram/SourceFiles/boxes/download_path_box.h
diff --git a/Telegram/SourceFiles/boxes/editcolorbox.cpp b/Telegram/SourceFiles/boxes/edit_color_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/editcolorbox.cpp
rename to Telegram/SourceFiles/boxes/edit_color_box.cpp
diff --git a/Telegram/SourceFiles/boxes/editcolorbox.h b/Telegram/SourceFiles/boxes/edit_color_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/editcolorbox.h
rename to Telegram/SourceFiles/boxes/edit_color_box.h
diff --git a/Telegram/SourceFiles/boxes/emojibox.cpp b/Telegram/SourceFiles/boxes/emoji_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/emojibox.cpp
rename to Telegram/SourceFiles/boxes/emoji_box.cpp
diff --git a/Telegram/SourceFiles/boxes/emojibox.h b/Telegram/SourceFiles/boxes/emoji_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/emojibox.h
rename to Telegram/SourceFiles/boxes/emoji_box.h
diff --git a/Telegram/SourceFiles/boxes/languagebox.cpp b/Telegram/SourceFiles/boxes/language_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/languagebox.cpp
rename to Telegram/SourceFiles/boxes/language_box.cpp
diff --git a/Telegram/SourceFiles/boxes/languagebox.h b/Telegram/SourceFiles/boxes/language_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/languagebox.h
rename to Telegram/SourceFiles/boxes/language_box.h
diff --git a/Telegram/SourceFiles/boxes/localstoragebox.cpp b/Telegram/SourceFiles/boxes/local_storage_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/localstoragebox.cpp
rename to Telegram/SourceFiles/boxes/local_storage_box.cpp
diff --git a/Telegram/SourceFiles/boxes/localstoragebox.h b/Telegram/SourceFiles/boxes/local_storage_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/localstoragebox.h
rename to Telegram/SourceFiles/boxes/local_storage_box.h
diff --git a/Telegram/SourceFiles/boxes/passcodebox.cpp b/Telegram/SourceFiles/boxes/passcode_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/passcodebox.cpp
rename to Telegram/SourceFiles/boxes/passcode_box.cpp
diff --git a/Telegram/SourceFiles/boxes/passcodebox.h b/Telegram/SourceFiles/boxes/passcode_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/passcodebox.h
rename to Telegram/SourceFiles/boxes/passcode_box.h
diff --git a/Telegram/SourceFiles/boxes/photocropbox.cpp b/Telegram/SourceFiles/boxes/photo_crop_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/photocropbox.cpp
rename to Telegram/SourceFiles/boxes/photo_crop_box.cpp
diff --git a/Telegram/SourceFiles/boxes/photocropbox.h b/Telegram/SourceFiles/boxes/photo_crop_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/photocropbox.h
rename to Telegram/SourceFiles/boxes/photo_crop_box.h
diff --git a/Telegram/SourceFiles/boxes/sessionsbox.cpp b/Telegram/SourceFiles/boxes/sessions_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/sessionsbox.cpp
rename to Telegram/SourceFiles/boxes/sessions_box.cpp
diff --git a/Telegram/SourceFiles/boxes/sessionsbox.h b/Telegram/SourceFiles/boxes/sessions_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/sessionsbox.h
rename to Telegram/SourceFiles/boxes/sessions_box.h
diff --git a/Telegram/SourceFiles/boxes/sharebox.cpp b/Telegram/SourceFiles/boxes/share_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/sharebox.cpp
rename to Telegram/SourceFiles/boxes/share_box.cpp
diff --git a/Telegram/SourceFiles/boxes/sharebox.h b/Telegram/SourceFiles/boxes/share_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/sharebox.h
rename to Telegram/SourceFiles/boxes/share_box.h
diff --git a/Telegram/SourceFiles/boxes/stickersetbox.cpp b/Telegram/SourceFiles/boxes/sticker_set_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/stickersetbox.cpp
rename to Telegram/SourceFiles/boxes/sticker_set_box.cpp
diff --git a/Telegram/SourceFiles/boxes/stickersetbox.h b/Telegram/SourceFiles/boxes/sticker_set_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/stickersetbox.h
rename to Telegram/SourceFiles/boxes/sticker_set_box.h
diff --git a/Telegram/SourceFiles/boxes/usernamebox.cpp b/Telegram/SourceFiles/boxes/username_box.cpp
similarity index 100%
rename from Telegram/SourceFiles/boxes/usernamebox.cpp
rename to Telegram/SourceFiles/boxes/username_box.cpp
diff --git a/Telegram/SourceFiles/boxes/usernamebox.h b/Telegram/SourceFiles/boxes/username_box.h
similarity index 100%
rename from Telegram/SourceFiles/boxes/usernamebox.h
rename to Telegram/SourceFiles/boxes/username_box.h
diff --git a/Telegram/SourceFiles/stickers/stickers.style b/Telegram/SourceFiles/chat_helpers/chat_helpers.style
similarity index 100%
rename from Telegram/SourceFiles/stickers/stickers.style
rename to Telegram/SourceFiles/chat_helpers/chat_helpers.style
diff --git a/Telegram/SourceFiles/stickers/emoji_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
similarity index 100%
rename from Telegram/SourceFiles/stickers/emoji_list_widget.cpp
rename to Telegram/SourceFiles/chat_helpers/emoji_list_widget.cpp
diff --git a/Telegram/SourceFiles/stickers/emoji_list_widget.h b/Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
similarity index 100%
rename from Telegram/SourceFiles/stickers/emoji_list_widget.h
rename to Telegram/SourceFiles/chat_helpers/emoji_list_widget.h
diff --git a/Telegram/SourceFiles/stickers/emoji_panel.cpp b/Telegram/SourceFiles/chat_helpers/emoji_panel.cpp
similarity index 100%
rename from Telegram/SourceFiles/stickers/emoji_panel.cpp
rename to Telegram/SourceFiles/chat_helpers/emoji_panel.cpp
diff --git a/Telegram/SourceFiles/stickers/emoji_panel.h b/Telegram/SourceFiles/chat_helpers/emoji_panel.h
similarity index 100%
rename from Telegram/SourceFiles/stickers/emoji_panel.h
rename to Telegram/SourceFiles/chat_helpers/emoji_panel.h
diff --git a/Telegram/SourceFiles/history/field_autocomplete.cpp b/Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
similarity index 100%
rename from Telegram/SourceFiles/history/field_autocomplete.cpp
rename to Telegram/SourceFiles/chat_helpers/field_autocomplete.cpp
diff --git a/Telegram/SourceFiles/history/field_autocomplete.h b/Telegram/SourceFiles/chat_helpers/field_autocomplete.h
similarity index 100%
rename from Telegram/SourceFiles/history/field_autocomplete.h
rename to Telegram/SourceFiles/chat_helpers/field_autocomplete.h
diff --git a/Telegram/SourceFiles/stickers/gifs_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
similarity index 100%
rename from Telegram/SourceFiles/stickers/gifs_list_widget.cpp
rename to Telegram/SourceFiles/chat_helpers/gifs_list_widget.cpp
diff --git a/Telegram/SourceFiles/stickers/gifs_list_widget.h b/Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
similarity index 100%
rename from Telegram/SourceFiles/stickers/gifs_list_widget.h
rename to Telegram/SourceFiles/chat_helpers/gifs_list_widget.h
diff --git a/Telegram/SourceFiles/stickers/stickers.cpp b/Telegram/SourceFiles/chat_helpers/stickers.cpp
similarity index 100%
rename from Telegram/SourceFiles/stickers/stickers.cpp
rename to Telegram/SourceFiles/chat_helpers/stickers.cpp
diff --git a/Telegram/SourceFiles/stickers/stickers.h b/Telegram/SourceFiles/chat_helpers/stickers.h
similarity index 100%
rename from Telegram/SourceFiles/stickers/stickers.h
rename to Telegram/SourceFiles/chat_helpers/stickers.h
diff --git a/Telegram/SourceFiles/stickers/stickers_list_widget.cpp b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
similarity index 100%
rename from Telegram/SourceFiles/stickers/stickers_list_widget.cpp
rename to Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
diff --git a/Telegram/SourceFiles/stickers/stickers_list_widget.h b/Telegram/SourceFiles/chat_helpers/stickers_list_widget.h
similarity index 100%
rename from Telegram/SourceFiles/stickers/stickers_list_widget.h
rename to Telegram/SourceFiles/chat_helpers/stickers_list_widget.h