diff --git a/Telegram/SourceFiles/gui/animation.cpp b/Telegram/SourceFiles/ui/animation.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/animation.cpp
rename to Telegram/SourceFiles/ui/animation.cpp
diff --git a/Telegram/SourceFiles/gui/animation.h b/Telegram/SourceFiles/ui/animation.h
similarity index 100%
rename from Telegram/SourceFiles/gui/animation.h
rename to Telegram/SourceFiles/ui/animation.h
diff --git a/Telegram/SourceFiles/gui/boxshadow.cpp b/Telegram/SourceFiles/ui/boxshadow.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/boxshadow.cpp
rename to Telegram/SourceFiles/ui/boxshadow.cpp
diff --git a/Telegram/SourceFiles/gui/boxshadow.h b/Telegram/SourceFiles/ui/boxshadow.h
similarity index 100%
rename from Telegram/SourceFiles/gui/boxshadow.h
rename to Telegram/SourceFiles/ui/boxshadow.h
diff --git a/Telegram/SourceFiles/gui/button.cpp b/Telegram/SourceFiles/ui/button.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/button.cpp
rename to Telegram/SourceFiles/ui/button.cpp
diff --git a/Telegram/SourceFiles/gui/button.h b/Telegram/SourceFiles/ui/button.h
similarity index 100%
rename from Telegram/SourceFiles/gui/button.h
rename to Telegram/SourceFiles/ui/button.h
diff --git a/Telegram/SourceFiles/gui/countryinput.cpp b/Telegram/SourceFiles/ui/countryinput.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/countryinput.cpp
rename to Telegram/SourceFiles/ui/countryinput.cpp
diff --git a/Telegram/SourceFiles/gui/countryinput.h b/Telegram/SourceFiles/ui/countryinput.h
similarity index 100%
rename from Telegram/SourceFiles/gui/countryinput.h
rename to Telegram/SourceFiles/ui/countryinput.h
diff --git a/Telegram/SourceFiles/gui/emoji_config.cpp b/Telegram/SourceFiles/ui/emoji_config.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/emoji_config.cpp
rename to Telegram/SourceFiles/ui/emoji_config.cpp
diff --git a/Telegram/SourceFiles/gui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h
similarity index 100%
rename from Telegram/SourceFiles/gui/emoji_config.h
rename to Telegram/SourceFiles/ui/emoji_config.h
diff --git a/Telegram/SourceFiles/gui/filedialog.cpp b/Telegram/SourceFiles/ui/filedialog.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/filedialog.cpp
rename to Telegram/SourceFiles/ui/filedialog.cpp
diff --git a/Telegram/SourceFiles/gui/filedialog.h b/Telegram/SourceFiles/ui/filedialog.h
similarity index 100%
rename from Telegram/SourceFiles/gui/filedialog.h
rename to Telegram/SourceFiles/ui/filedialog.h
diff --git a/Telegram/SourceFiles/gui/flatbutton.cpp b/Telegram/SourceFiles/ui/flatbutton.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/flatbutton.cpp
rename to Telegram/SourceFiles/ui/flatbutton.cpp
diff --git a/Telegram/SourceFiles/gui/flatbutton.h b/Telegram/SourceFiles/ui/flatbutton.h
similarity index 100%
rename from Telegram/SourceFiles/gui/flatbutton.h
rename to Telegram/SourceFiles/ui/flatbutton.h
diff --git a/Telegram/SourceFiles/gui/flatcheckbox.cpp b/Telegram/SourceFiles/ui/flatcheckbox.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/flatcheckbox.cpp
rename to Telegram/SourceFiles/ui/flatcheckbox.cpp
diff --git a/Telegram/SourceFiles/gui/flatcheckbox.h b/Telegram/SourceFiles/ui/flatcheckbox.h
similarity index 100%
rename from Telegram/SourceFiles/gui/flatcheckbox.h
rename to Telegram/SourceFiles/ui/flatcheckbox.h
diff --git a/Telegram/SourceFiles/gui/flatinput.cpp b/Telegram/SourceFiles/ui/flatinput.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/flatinput.cpp
rename to Telegram/SourceFiles/ui/flatinput.cpp
diff --git a/Telegram/SourceFiles/gui/flatinput.h b/Telegram/SourceFiles/ui/flatinput.h
similarity index 100%
rename from Telegram/SourceFiles/gui/flatinput.h
rename to Telegram/SourceFiles/ui/flatinput.h
diff --git a/Telegram/SourceFiles/gui/flatlabel.cpp b/Telegram/SourceFiles/ui/flatlabel.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/flatlabel.cpp
rename to Telegram/SourceFiles/ui/flatlabel.cpp
diff --git a/Telegram/SourceFiles/gui/flatlabel.h b/Telegram/SourceFiles/ui/flatlabel.h
similarity index 100%
rename from Telegram/SourceFiles/gui/flatlabel.h
rename to Telegram/SourceFiles/ui/flatlabel.h
diff --git a/Telegram/SourceFiles/gui/flattextarea.cpp b/Telegram/SourceFiles/ui/flattextarea.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/flattextarea.cpp
rename to Telegram/SourceFiles/ui/flattextarea.cpp
diff --git a/Telegram/SourceFiles/gui/flattextarea.h b/Telegram/SourceFiles/ui/flattextarea.h
similarity index 100%
rename from Telegram/SourceFiles/gui/flattextarea.h
rename to Telegram/SourceFiles/ui/flattextarea.h
diff --git a/Telegram/SourceFiles/gui/images.cpp b/Telegram/SourceFiles/ui/images.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/images.cpp
rename to Telegram/SourceFiles/ui/images.cpp
diff --git a/Telegram/SourceFiles/gui/images.h b/Telegram/SourceFiles/ui/images.h
similarity index 100%
rename from Telegram/SourceFiles/gui/images.h
rename to Telegram/SourceFiles/ui/images.h
diff --git a/Telegram/SourceFiles/gui/popupmenu.cpp b/Telegram/SourceFiles/ui/popupmenu.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/popupmenu.cpp
rename to Telegram/SourceFiles/ui/popupmenu.cpp
diff --git a/Telegram/SourceFiles/gui/popupmenu.h b/Telegram/SourceFiles/ui/popupmenu.h
similarity index 100%
rename from Telegram/SourceFiles/gui/popupmenu.h
rename to Telegram/SourceFiles/ui/popupmenu.h
diff --git a/Telegram/SourceFiles/gui/scrollarea.cpp b/Telegram/SourceFiles/ui/scrollarea.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/scrollarea.cpp
rename to Telegram/SourceFiles/ui/scrollarea.cpp
diff --git a/Telegram/SourceFiles/gui/scrollarea.h b/Telegram/SourceFiles/ui/scrollarea.h
similarity index 100%
rename from Telegram/SourceFiles/gui/scrollarea.h
rename to Telegram/SourceFiles/ui/scrollarea.h
diff --git a/Telegram/SourceFiles/gui/style.h b/Telegram/SourceFiles/ui/style.h
similarity index 100%
rename from Telegram/SourceFiles/gui/style.h
rename to Telegram/SourceFiles/ui/style.h
diff --git a/Telegram/SourceFiles/gui/style_core.cpp b/Telegram/SourceFiles/ui/style_core.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/style_core.cpp
rename to Telegram/SourceFiles/ui/style_core.cpp
diff --git a/Telegram/SourceFiles/gui/style_core.h b/Telegram/SourceFiles/ui/style_core.h
similarity index 100%
rename from Telegram/SourceFiles/gui/style_core.h
rename to Telegram/SourceFiles/ui/style_core.h
diff --git a/Telegram/SourceFiles/gui/text.cpp b/Telegram/SourceFiles/ui/text.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/text.cpp
rename to Telegram/SourceFiles/ui/text.cpp
diff --git a/Telegram/SourceFiles/gui/text.h b/Telegram/SourceFiles/ui/text.h
similarity index 100%
rename from Telegram/SourceFiles/gui/text.h
rename to Telegram/SourceFiles/ui/text.h
diff --git a/Telegram/SourceFiles/gui/twidget.cpp b/Telegram/SourceFiles/ui/twidget.cpp
similarity index 100%
rename from Telegram/SourceFiles/gui/twidget.cpp
rename to Telegram/SourceFiles/ui/twidget.cpp
diff --git a/Telegram/SourceFiles/gui/twidget.h b/Telegram/SourceFiles/ui/twidget.h
similarity index 100%
rename from Telegram/SourceFiles/gui/twidget.h
rename to Telegram/SourceFiles/ui/twidget.h