diff --git a/libs/ui/CMakeLists.txt b/libs/ui_legacy/CMakeLists.txt similarity index 100% rename from libs/ui/CMakeLists.txt rename to libs/ui_legacy/CMakeLists.txt diff --git a/libs/ui/bmfont-converter.py b/libs/ui_legacy/bmfont-converter.py similarity index 100% rename from libs/ui/bmfont-converter.py rename to libs/ui_legacy/bmfont-converter.py diff --git a/libs/ui/include/psemek/ui/asymmetric.hpp b/libs/ui_legacy/include/psemek/ui/asymmetric.hpp similarity index 100% rename from libs/ui/include/psemek/ui/asymmetric.hpp rename to libs/ui_legacy/include/psemek/ui/asymmetric.hpp diff --git a/libs/ui/include/psemek/ui/bmfont.hpp b/libs/ui_legacy/include/psemek/ui/bmfont.hpp similarity index 100% rename from libs/ui/include/psemek/ui/bmfont.hpp rename to libs/ui_legacy/include/psemek/ui/bmfont.hpp diff --git a/libs/ui/include/psemek/ui/box_shape.hpp b/libs/ui_legacy/include/psemek/ui/box_shape.hpp similarity index 100% rename from libs/ui/include/psemek/ui/box_shape.hpp rename to libs/ui_legacy/include/psemek/ui/box_shape.hpp diff --git a/libs/ui/include/psemek/ui/button.hpp b/libs/ui_legacy/include/psemek/ui/button.hpp similarity index 100% rename from libs/ui/include/psemek/ui/button.hpp rename to libs/ui_legacy/include/psemek/ui/button.hpp diff --git a/libs/ui/include/psemek/ui/checkbox.hpp b/libs/ui_legacy/include/psemek/ui/checkbox.hpp similarity index 100% rename from libs/ui/include/psemek/ui/checkbox.hpp rename to libs/ui_legacy/include/psemek/ui/checkbox.hpp diff --git a/libs/ui/include/psemek/ui/color_picker.hpp b/libs/ui_legacy/include/psemek/ui/color_picker.hpp similarity index 100% rename from libs/ui/include/psemek/ui/color_picker.hpp rename to libs/ui_legacy/include/psemek/ui/color_picker.hpp diff --git a/libs/ui/include/psemek/ui/color_view.hpp b/libs/ui_legacy/include/psemek/ui/color_view.hpp similarity index 100% rename from libs/ui/include/psemek/ui/color_view.hpp rename to libs/ui_legacy/include/psemek/ui/color_view.hpp diff --git a/libs/ui/include/psemek/ui/container.hpp b/libs/ui_legacy/include/psemek/ui/container.hpp similarity index 100% rename from libs/ui/include/psemek/ui/container.hpp rename to libs/ui_legacy/include/psemek/ui/container.hpp diff --git a/libs/ui/include/psemek/ui/container_impl.hpp b/libs/ui_legacy/include/psemek/ui/container_impl.hpp similarity index 100% rename from libs/ui/include/psemek/ui/container_impl.hpp rename to libs/ui_legacy/include/psemek/ui/container_impl.hpp diff --git a/libs/ui/include/psemek/ui/controller.hpp b/libs/ui_legacy/include/psemek/ui/controller.hpp similarity index 100% rename from libs/ui/include/psemek/ui/controller.hpp rename to libs/ui_legacy/include/psemek/ui/controller.hpp diff --git a/libs/ui/include/psemek/ui/default_element_factory.hpp b/libs/ui_legacy/include/psemek/ui/default_element_factory.hpp similarity index 100% rename from libs/ui/include/psemek/ui/default_element_factory.hpp rename to libs/ui_legacy/include/psemek/ui/default_element_factory.hpp diff --git a/libs/ui/include/psemek/ui/default_image_provider.hpp b/libs/ui_legacy/include/psemek/ui/default_image_provider.hpp similarity index 100% rename from libs/ui/include/psemek/ui/default_image_provider.hpp rename to libs/ui_legacy/include/psemek/ui/default_image_provider.hpp diff --git a/libs/ui/include/psemek/ui/edit.hpp b/libs/ui_legacy/include/psemek/ui/edit.hpp similarity index 100% rename from libs/ui/include/psemek/ui/edit.hpp rename to libs/ui_legacy/include/psemek/ui/edit.hpp diff --git a/libs/ui/include/psemek/ui/element.hpp b/libs/ui_legacy/include/psemek/ui/element.hpp similarity index 100% rename from libs/ui/include/psemek/ui/element.hpp rename to libs/ui_legacy/include/psemek/ui/element.hpp diff --git a/libs/ui/include/psemek/ui/element_factory.hpp b/libs/ui_legacy/include/psemek/ui/element_factory.hpp similarity index 100% rename from libs/ui/include/psemek/ui/element_factory.hpp rename to libs/ui_legacy/include/psemek/ui/element_factory.hpp diff --git a/libs/ui/include/psemek/ui/event.hpp b/libs/ui_legacy/include/psemek/ui/event.hpp similarity index 100% rename from libs/ui/include/psemek/ui/event.hpp rename to libs/ui_legacy/include/psemek/ui/event.hpp diff --git a/libs/ui/include/psemek/ui/event_interceptor.hpp b/libs/ui_legacy/include/psemek/ui/event_interceptor.hpp similarity index 100% rename from libs/ui/include/psemek/ui/event_interceptor.hpp rename to libs/ui_legacy/include/psemek/ui/event_interceptor.hpp diff --git a/libs/ui/include/psemek/ui/file_dialog.hpp b/libs/ui_legacy/include/psemek/ui/file_dialog.hpp similarity index 100% rename from libs/ui/include/psemek/ui/file_dialog.hpp rename to libs/ui_legacy/include/psemek/ui/file_dialog.hpp diff --git a/libs/ui/include/psemek/ui/font.hpp b/libs/ui_legacy/include/psemek/ui/font.hpp similarity index 100% rename from libs/ui/include/psemek/ui/font.hpp rename to libs/ui_legacy/include/psemek/ui/font.hpp diff --git a/libs/ui/include/psemek/ui/frame.hpp b/libs/ui_legacy/include/psemek/ui/frame.hpp similarity index 100% rename from libs/ui/include/psemek/ui/frame.hpp rename to libs/ui_legacy/include/psemek/ui/frame.hpp diff --git a/libs/ui/include/psemek/ui/grid_layout.hpp b/libs/ui_legacy/include/psemek/ui/grid_layout.hpp similarity index 100% rename from libs/ui/include/psemek/ui/grid_layout.hpp rename to libs/ui_legacy/include/psemek/ui/grid_layout.hpp diff --git a/libs/ui/include/psemek/ui/image_provider.hpp b/libs/ui_legacy/include/psemek/ui/image_provider.hpp similarity index 100% rename from libs/ui/include/psemek/ui/image_provider.hpp rename to libs/ui_legacy/include/psemek/ui/image_provider.hpp diff --git a/libs/ui/include/psemek/ui/image_view.hpp b/libs/ui_legacy/include/psemek/ui/image_view.hpp similarity index 100% rename from libs/ui/include/psemek/ui/image_view.hpp rename to libs/ui_legacy/include/psemek/ui/image_view.hpp diff --git a/libs/ui/include/psemek/ui/kerned_font.hpp b/libs/ui_legacy/include/psemek/ui/kerned_font.hpp similarity index 100% rename from libs/ui/include/psemek/ui/kerned_font.hpp rename to libs/ui_legacy/include/psemek/ui/kerned_font.hpp diff --git a/libs/ui/include/psemek/ui/label.hpp b/libs/ui_legacy/include/psemek/ui/label.hpp similarity index 100% rename from libs/ui/include/psemek/ui/label.hpp rename to libs/ui_legacy/include/psemek/ui/label.hpp diff --git a/libs/ui/include/psemek/ui/monospace_font.hpp b/libs/ui_legacy/include/psemek/ui/monospace_font.hpp similarity index 100% rename from libs/ui/include/psemek/ui/monospace_font.hpp rename to libs/ui_legacy/include/psemek/ui/monospace_font.hpp diff --git a/libs/ui/include/psemek/ui/msdf_font.hpp b/libs/ui_legacy/include/psemek/ui/msdf_font.hpp similarity index 100% rename from libs/ui/include/psemek/ui/msdf_font.hpp rename to libs/ui_legacy/include/psemek/ui/msdf_font.hpp diff --git a/libs/ui/include/psemek/ui/null_shape.hpp b/libs/ui_legacy/include/psemek/ui/null_shape.hpp similarity index 100% rename from libs/ui/include/psemek/ui/null_shape.hpp rename to libs/ui_legacy/include/psemek/ui/null_shape.hpp diff --git a/libs/ui/include/psemek/ui/painter.hpp b/libs/ui_legacy/include/psemek/ui/painter.hpp similarity index 100% rename from libs/ui/include/psemek/ui/painter.hpp rename to libs/ui_legacy/include/psemek/ui/painter.hpp diff --git a/libs/ui/include/psemek/ui/painter_impl.hpp b/libs/ui_legacy/include/psemek/ui/painter_impl.hpp similarity index 100% rename from libs/ui/include/psemek/ui/painter_impl.hpp rename to libs/ui_legacy/include/psemek/ui/painter_impl.hpp diff --git a/libs/ui/include/psemek/ui/positioner.hpp b/libs/ui_legacy/include/psemek/ui/positioner.hpp similarity index 100% rename from libs/ui/include/psemek/ui/positioner.hpp rename to libs/ui_legacy/include/psemek/ui/positioner.hpp diff --git a/libs/ui/include/psemek/ui/progress_bar.hpp b/libs/ui_legacy/include/psemek/ui/progress_bar.hpp similarity index 100% rename from libs/ui/include/psemek/ui/progress_bar.hpp rename to libs/ui_legacy/include/psemek/ui/progress_bar.hpp diff --git a/libs/ui/include/psemek/ui/rich_image_view.hpp b/libs/ui_legacy/include/psemek/ui/rich_image_view.hpp similarity index 100% rename from libs/ui/include/psemek/ui/rich_image_view.hpp rename to libs/ui_legacy/include/psemek/ui/rich_image_view.hpp diff --git a/libs/ui/include/psemek/ui/screen.hpp b/libs/ui_legacy/include/psemek/ui/screen.hpp similarity index 100% rename from libs/ui/include/psemek/ui/screen.hpp rename to libs/ui_legacy/include/psemek/ui/screen.hpp diff --git a/libs/ui/include/psemek/ui/scroller.hpp b/libs/ui_legacy/include/psemek/ui/scroller.hpp similarity index 100% rename from libs/ui/include/psemek/ui/scroller.hpp rename to libs/ui_legacy/include/psemek/ui/scroller.hpp diff --git a/libs/ui/include/psemek/ui/selector.hpp b/libs/ui_legacy/include/psemek/ui/selector.hpp similarity index 100% rename from libs/ui/include/psemek/ui/selector.hpp rename to libs/ui_legacy/include/psemek/ui/selector.hpp diff --git a/libs/ui/include/psemek/ui/shape.hpp b/libs/ui_legacy/include/psemek/ui/shape.hpp similarity index 100% rename from libs/ui/include/psemek/ui/shape.hpp rename to libs/ui_legacy/include/psemek/ui/shape.hpp diff --git a/libs/ui/include/psemek/ui/single_container.hpp b/libs/ui_legacy/include/psemek/ui/single_container.hpp similarity index 100% rename from libs/ui/include/psemek/ui/single_container.hpp rename to libs/ui_legacy/include/psemek/ui/single_container.hpp diff --git a/libs/ui/include/psemek/ui/slider.hpp b/libs/ui_legacy/include/psemek/ui/slider.hpp similarity index 100% rename from libs/ui/include/psemek/ui/slider.hpp rename to libs/ui_legacy/include/psemek/ui/slider.hpp diff --git a/libs/ui/include/psemek/ui/spawn.hpp b/libs/ui_legacy/include/psemek/ui/spawn.hpp similarity index 100% rename from libs/ui/include/psemek/ui/spawn.hpp rename to libs/ui_legacy/include/psemek/ui/spawn.hpp diff --git a/libs/ui/include/psemek/ui/spinbox.hpp b/libs/ui_legacy/include/psemek/ui/spinbox.hpp similarity index 100% rename from libs/ui/include/psemek/ui/spinbox.hpp rename to libs/ui_legacy/include/psemek/ui/spinbox.hpp diff --git a/libs/ui/include/psemek/ui/style.hpp b/libs/ui_legacy/include/psemek/ui/style.hpp similarity index 100% rename from libs/ui/include/psemek/ui/style.hpp rename to libs/ui_legacy/include/psemek/ui/style.hpp diff --git a/libs/ui/include/psemek/ui/table.hpp b/libs/ui_legacy/include/psemek/ui/table.hpp similarity index 100% rename from libs/ui/include/psemek/ui/table.hpp rename to libs/ui_legacy/include/psemek/ui/table.hpp diff --git a/libs/ui/include/psemek/ui/tagged_text.hpp b/libs/ui_legacy/include/psemek/ui/tagged_text.hpp similarity index 100% rename from libs/ui/include/psemek/ui/tagged_text.hpp rename to libs/ui_legacy/include/psemek/ui/tagged_text.hpp diff --git a/libs/ui/include/psemek/ui/triangle_shape.hpp b/libs/ui_legacy/include/psemek/ui/triangle_shape.hpp similarity index 100% rename from libs/ui/include/psemek/ui/triangle_shape.hpp rename to libs/ui_legacy/include/psemek/ui/triangle_shape.hpp diff --git a/libs/ui/include/psemek/ui/window.hpp b/libs/ui_legacy/include/psemek/ui/window.hpp similarity index 100% rename from libs/ui/include/psemek/ui/window.hpp rename to libs/ui_legacy/include/psemek/ui/window.hpp diff --git a/libs/ui/resources/back.png b/libs/ui_legacy/resources/back.png similarity index 100% rename from libs/ui/resources/back.png rename to libs/ui_legacy/resources/back.png diff --git a/libs/ui/resources/cross_red_16x16.png b/libs/ui_legacy/resources/cross_red_16x16.png similarity index 100% rename from libs/ui/resources/cross_red_16x16.png rename to libs/ui_legacy/resources/cross_red_16x16.png diff --git a/libs/ui/resources/file.png b/libs/ui_legacy/resources/file.png similarity index 100% rename from libs/ui/resources/file.png rename to libs/ui_legacy/resources/file.png diff --git a/libs/ui/resources/folder.png b/libs/ui_legacy/resources/folder.png similarity index 100% rename from libs/ui/resources/folder.png rename to libs/ui_legacy/resources/folder.png diff --git a/libs/ui/resources/font_10x12_bold_glyphs.txt b/libs/ui_legacy/resources/font_10x12_bold_glyphs.txt similarity index 100% rename from libs/ui/resources/font_10x12_bold_glyphs.txt rename to libs/ui_legacy/resources/font_10x12_bold_glyphs.txt diff --git a/libs/ui/resources/font_9x12_glyphs.txt b/libs/ui_legacy/resources/font_9x12_glyphs.txt similarity index 100% rename from libs/ui/resources/font_9x12_glyphs.txt rename to libs/ui_legacy/resources/font_9x12_glyphs.txt diff --git a/libs/ui/source/asymmetric.cpp b/libs/ui_legacy/source/asymmetric.cpp similarity index 100% rename from libs/ui/source/asymmetric.cpp rename to libs/ui_legacy/source/asymmetric.cpp diff --git a/libs/ui/source/bmfont.cpp b/libs/ui_legacy/source/bmfont.cpp similarity index 100% rename from libs/ui/source/bmfont.cpp rename to libs/ui_legacy/source/bmfont.cpp diff --git a/libs/ui/source/box_shape.cpp b/libs/ui_legacy/source/box_shape.cpp similarity index 100% rename from libs/ui/source/box_shape.cpp rename to libs/ui_legacy/source/box_shape.cpp diff --git a/libs/ui/source/button.cpp b/libs/ui_legacy/source/button.cpp similarity index 100% rename from libs/ui/source/button.cpp rename to libs/ui_legacy/source/button.cpp diff --git a/libs/ui/source/checkbox.cpp b/libs/ui_legacy/source/checkbox.cpp similarity index 100% rename from libs/ui/source/checkbox.cpp rename to libs/ui_legacy/source/checkbox.cpp diff --git a/libs/ui/source/color_picker.cpp b/libs/ui_legacy/source/color_picker.cpp similarity index 100% rename from libs/ui/source/color_picker.cpp rename to libs/ui_legacy/source/color_picker.cpp diff --git a/libs/ui/source/color_view.cpp b/libs/ui_legacy/source/color_view.cpp similarity index 100% rename from libs/ui/source/color_view.cpp rename to libs/ui_legacy/source/color_view.cpp diff --git a/libs/ui/source/container_impl.cpp b/libs/ui_legacy/source/container_impl.cpp similarity index 100% rename from libs/ui/source/container_impl.cpp rename to libs/ui_legacy/source/container_impl.cpp diff --git a/libs/ui/source/controller.cpp b/libs/ui_legacy/source/controller.cpp similarity index 100% rename from libs/ui/source/controller.cpp rename to libs/ui_legacy/source/controller.cpp diff --git a/libs/ui/source/default_element_factory.cpp b/libs/ui_legacy/source/default_element_factory.cpp similarity index 100% rename from libs/ui/source/default_element_factory.cpp rename to libs/ui_legacy/source/default_element_factory.cpp diff --git a/libs/ui/source/default_fonts.cpp b/libs/ui_legacy/source/default_fonts.cpp similarity index 100% rename from libs/ui/source/default_fonts.cpp rename to libs/ui_legacy/source/default_fonts.cpp diff --git a/libs/ui/source/default_image_provider.cpp b/libs/ui_legacy/source/default_image_provider.cpp similarity index 100% rename from libs/ui/source/default_image_provider.cpp rename to libs/ui_legacy/source/default_image_provider.cpp diff --git a/libs/ui/source/edit.cpp b/libs/ui_legacy/source/edit.cpp similarity index 100% rename from libs/ui/source/edit.cpp rename to libs/ui_legacy/source/edit.cpp diff --git a/libs/ui/source/element.cpp b/libs/ui_legacy/source/element.cpp similarity index 100% rename from libs/ui/source/element.cpp rename to libs/ui_legacy/source/element.cpp diff --git a/libs/ui/source/element_factory.cpp b/libs/ui_legacy/source/element_factory.cpp similarity index 100% rename from libs/ui/source/element_factory.cpp rename to libs/ui_legacy/source/element_factory.cpp diff --git a/libs/ui/source/event_interceptor.cpp b/libs/ui_legacy/source/event_interceptor.cpp similarity index 100% rename from libs/ui/source/event_interceptor.cpp rename to libs/ui_legacy/source/event_interceptor.cpp diff --git a/libs/ui/source/file_dialog.cpp b/libs/ui_legacy/source/file_dialog.cpp similarity index 100% rename from libs/ui/source/file_dialog.cpp rename to libs/ui_legacy/source/file_dialog.cpp diff --git a/libs/ui/source/frame.cpp b/libs/ui_legacy/source/frame.cpp similarity index 100% rename from libs/ui/source/frame.cpp rename to libs/ui_legacy/source/frame.cpp diff --git a/libs/ui/source/grid_layout.cpp b/libs/ui_legacy/source/grid_layout.cpp similarity index 100% rename from libs/ui/source/grid_layout.cpp rename to libs/ui_legacy/source/grid_layout.cpp diff --git a/libs/ui/source/image_view.cpp b/libs/ui_legacy/source/image_view.cpp similarity index 100% rename from libs/ui/source/image_view.cpp rename to libs/ui_legacy/source/image_view.cpp diff --git a/libs/ui/source/kerned_font.cpp b/libs/ui_legacy/source/kerned_font.cpp similarity index 100% rename from libs/ui/source/kerned_font.cpp rename to libs/ui_legacy/source/kerned_font.cpp diff --git a/libs/ui/source/label.cpp b/libs/ui_legacy/source/label.cpp similarity index 100% rename from libs/ui/source/label.cpp rename to libs/ui_legacy/source/label.cpp diff --git a/libs/ui/source/monospace_font.cpp b/libs/ui_legacy/source/monospace_font.cpp similarity index 100% rename from libs/ui/source/monospace_font.cpp rename to libs/ui_legacy/source/monospace_font.cpp diff --git a/libs/ui/source/msdf_font.cpp b/libs/ui_legacy/source/msdf_font.cpp similarity index 100% rename from libs/ui/source/msdf_font.cpp rename to libs/ui_legacy/source/msdf_font.cpp diff --git a/libs/ui/source/null_shape.cpp b/libs/ui_legacy/source/null_shape.cpp similarity index 100% rename from libs/ui/source/null_shape.cpp rename to libs/ui_legacy/source/null_shape.cpp diff --git a/libs/ui/source/painter_impl.cpp b/libs/ui_legacy/source/painter_impl.cpp similarity index 100% rename from libs/ui/source/painter_impl.cpp rename to libs/ui_legacy/source/painter_impl.cpp diff --git a/libs/ui/source/positioner.cpp b/libs/ui_legacy/source/positioner.cpp similarity index 100% rename from libs/ui/source/positioner.cpp rename to libs/ui_legacy/source/positioner.cpp diff --git a/libs/ui/source/progress_bar.cpp b/libs/ui_legacy/source/progress_bar.cpp similarity index 100% rename from libs/ui/source/progress_bar.cpp rename to libs/ui_legacy/source/progress_bar.cpp diff --git a/libs/ui/source/rich_image_view.cpp b/libs/ui_legacy/source/rich_image_view.cpp similarity index 100% rename from libs/ui/source/rich_image_view.cpp rename to libs/ui_legacy/source/rich_image_view.cpp diff --git a/libs/ui/source/screen.cpp b/libs/ui_legacy/source/screen.cpp similarity index 100% rename from libs/ui/source/screen.cpp rename to libs/ui_legacy/source/screen.cpp diff --git a/libs/ui/source/scroller.cpp b/libs/ui_legacy/source/scroller.cpp similarity index 100% rename from libs/ui/source/scroller.cpp rename to libs/ui_legacy/source/scroller.cpp diff --git a/libs/ui/source/selector.cpp b/libs/ui_legacy/source/selector.cpp similarity index 100% rename from libs/ui/source/selector.cpp rename to libs/ui_legacy/source/selector.cpp diff --git a/libs/ui/source/single_container.cpp b/libs/ui_legacy/source/single_container.cpp similarity index 100% rename from libs/ui/source/single_container.cpp rename to libs/ui_legacy/source/single_container.cpp diff --git a/libs/ui/source/slider.cpp b/libs/ui_legacy/source/slider.cpp similarity index 100% rename from libs/ui/source/slider.cpp rename to libs/ui_legacy/source/slider.cpp diff --git a/libs/ui/source/spawn.cpp b/libs/ui_legacy/source/spawn.cpp similarity index 100% rename from libs/ui/source/spawn.cpp rename to libs/ui_legacy/source/spawn.cpp diff --git a/libs/ui/source/spinbox.cpp b/libs/ui_legacy/source/spinbox.cpp similarity index 100% rename from libs/ui/source/spinbox.cpp rename to libs/ui_legacy/source/spinbox.cpp diff --git a/libs/ui/source/style.cpp b/libs/ui_legacy/source/style.cpp similarity index 100% rename from libs/ui/source/style.cpp rename to libs/ui_legacy/source/style.cpp diff --git a/libs/ui/source/table.cpp b/libs/ui_legacy/source/table.cpp similarity index 100% rename from libs/ui/source/table.cpp rename to libs/ui_legacy/source/table.cpp diff --git a/libs/ui/source/tagged_text.cpp b/libs/ui_legacy/source/tagged_text.cpp similarity index 100% rename from libs/ui/source/tagged_text.cpp rename to libs/ui_legacy/source/tagged_text.cpp diff --git a/libs/ui/source/triangle_shape.cpp b/libs/ui_legacy/source/triangle_shape.cpp similarity index 100% rename from libs/ui/source/triangle_shape.cpp rename to libs/ui_legacy/source/triangle_shape.cpp diff --git a/libs/ui/tests/tagged_text.cpp b/libs/ui_legacy/tests/tagged_text.cpp similarity index 100% rename from libs/ui/tests/tagged_text.cpp rename to libs/ui_legacy/tests/tagged_text.cpp