diff --git a/COPYING b/COPYING index 205c98b433..506e516297 100644 --- a/COPYING +++ b/COPYING @@ -33,6 +33,7 @@ emotion: licenses/COPYING.BSD ethumb: licenses/COPYING.LGPL eolian: licenses/COPYING.BSD elua: licenses/COPYING.BSD +elementary: licenses/COPYING.LGPL NOTE: If linked together, the result will be effectively be LGPL (or GPL if escape is used) due to license characteristics. diff --git a/legacy/elementary/COPYING.images b/COPYING.images similarity index 100% rename from legacy/elementary/COPYING.images rename to COPYING.images diff --git a/legacy/elementary/Makefile_Elm_Helpers.am b/Makefile_Elm_Helpers.am similarity index 100% rename from legacy/elementary/Makefile_Elm_Helpers.am rename to Makefile_Elm_Helpers.am diff --git a/legacy/elementary/cmakeconfig/ElementaryConfig.cmake.in b/cmakeconfig/ElementaryConfig.cmake.in similarity index 100% rename from legacy/elementary/cmakeconfig/ElementaryConfig.cmake.in rename to cmakeconfig/ElementaryConfig.cmake.in diff --git a/legacy/elementary/cmakeconfig/ElementaryConfigVersion.cmake.in b/cmakeconfig/ElementaryConfigVersion.cmake.in similarity index 100% rename from legacy/elementary/cmakeconfig/ElementaryConfigVersion.cmake.in rename to cmakeconfig/ElementaryConfigVersion.cmake.in diff --git a/legacy/elementary/config/.gitignore b/config/.gitignore similarity index 100% rename from legacy/elementary/config/.gitignore rename to config/.gitignore diff --git a/legacy/elementary/config/Makefile.am b/config/Makefile.am similarity index 100% rename from legacy/elementary/config/Makefile.am rename to config/Makefile.am diff --git a/legacy/elementary/config/default/Makefile.am b/config/default/Makefile.am similarity index 100% rename from legacy/elementary/config/default/Makefile.am rename to config/default/Makefile.am diff --git a/legacy/elementary/config/default/base.src.in b/config/default/base.src.in similarity index 100% rename from legacy/elementary/config/default/base.src.in rename to config/default/base.src.in diff --git a/legacy/elementary/config/default/icon.png b/config/default/icon.png similarity index 100% rename from legacy/elementary/config/default/icon.png rename to config/default/icon.png diff --git a/legacy/elementary/config/default/profile.desktop b/config/default/profile.desktop similarity index 100% rename from legacy/elementary/config/default/profile.desktop rename to config/default/profile.desktop diff --git a/legacy/elementary/config/mobile/Makefile.am b/config/mobile/Makefile.am similarity index 100% rename from legacy/elementary/config/mobile/Makefile.am rename to config/mobile/Makefile.am diff --git a/legacy/elementary/config/mobile/base.src.in b/config/mobile/base.src.in similarity index 100% rename from legacy/elementary/config/mobile/base.src.in rename to config/mobile/base.src.in diff --git a/legacy/elementary/config/mobile/icon.png b/config/mobile/icon.png similarity index 100% rename from legacy/elementary/config/mobile/icon.png rename to config/mobile/icon.png diff --git a/legacy/elementary/config/mobile/profile.desktop b/config/mobile/profile.desktop similarity index 100% rename from legacy/elementary/config/mobile/profile.desktop rename to config/mobile/profile.desktop diff --git a/legacy/elementary/config/profile.src b/config/profile.src similarity index 100% rename from legacy/elementary/config/profile.src rename to config/profile.src diff --git a/legacy/elementary/config/standard/Makefile.am b/config/standard/Makefile.am similarity index 100% rename from legacy/elementary/config/standard/Makefile.am rename to config/standard/Makefile.am diff --git a/legacy/elementary/config/standard/base.src.in b/config/standard/base.src.in similarity index 100% rename from legacy/elementary/config/standard/base.src.in rename to config/standard/base.src.in diff --git a/legacy/elementary/config/standard/icon.png b/config/standard/icon.png similarity index 100% rename from legacy/elementary/config/standard/icon.png rename to config/standard/icon.png diff --git a/legacy/elementary/config/standard/profile.desktop b/config/standard/profile.desktop similarity index 100% rename from legacy/elementary/config/standard/profile.desktop rename to config/standard/profile.desktop diff --git a/legacy/elementary/data/.gitignore b/data/elementary/.gitignore similarity index 100% rename from legacy/elementary/data/.gitignore rename to data/elementary/.gitignore diff --git a/legacy/elementary/data/Makefile.am b/data/elementary/Makefile.am similarity index 100% rename from legacy/elementary/data/Makefile.am rename to data/elementary/Makefile.am diff --git a/legacy/elementary/data/desktop/Makefile.am b/data/elementary/desktop/Makefile.am similarity index 100% rename from legacy/elementary/data/desktop/Makefile.am rename to data/elementary/desktop/Makefile.am diff --git a/legacy/elementary/data/desktop/elementary.png b/data/elementary/desktop/elementary.png similarity index 100% rename from legacy/elementary/data/desktop/elementary.png rename to data/elementary/desktop/elementary.png diff --git a/legacy/elementary/data/desktop/elementary_config.desktop b/data/elementary/desktop/elementary_config.desktop similarity index 100% rename from legacy/elementary/data/desktop/elementary_config.desktop rename to data/elementary/desktop/elementary_config.desktop diff --git a/legacy/elementary/data/desktop/elementary_test.desktop b/data/elementary/desktop/elementary_test.desktop similarity index 100% rename from legacy/elementary/data/desktop/elementary_test.desktop rename to data/elementary/desktop/elementary_test.desktop diff --git a/legacy/elementary/data/edje_externals/Makefile.am b/data/elementary/edje_externals/Makefile.am similarity index 100% rename from legacy/elementary/data/edje_externals/Makefile.am rename to data/elementary/edje_externals/Makefile.am diff --git a/legacy/elementary/data/edje_externals/ico_anchorblock.png b/data/elementary/edje_externals/ico_anchorblock.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_anchorblock.png rename to data/elementary/edje_externals/ico_anchorblock.png diff --git a/legacy/elementary/data/edje_externals/ico_anchorview.png b/data/elementary/edje_externals/ico_anchorview.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_anchorview.png rename to data/elementary/edje_externals/ico_anchorview.png diff --git a/legacy/elementary/data/edje_externals/ico_bubble.png b/data/elementary/edje_externals/ico_bubble.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_bubble.png rename to data/elementary/edje_externals/ico_bubble.png diff --git a/legacy/elementary/data/edje_externals/ico_button.png b/data/elementary/edje_externals/ico_button.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_button.png rename to data/elementary/edje_externals/ico_button.png diff --git a/legacy/elementary/data/edje_externals/ico_check.png b/data/elementary/edje_externals/ico_check.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_check.png rename to data/elementary/edje_externals/ico_check.png diff --git a/legacy/elementary/data/edje_externals/ico_clock.png b/data/elementary/edje_externals/ico_clock.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_clock.png rename to data/elementary/edje_externals/ico_clock.png diff --git a/legacy/elementary/data/edje_externals/ico_fileselector.png b/data/elementary/edje_externals/ico_fileselector.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_fileselector.png rename to data/elementary/edje_externals/ico_fileselector.png diff --git a/legacy/elementary/data/edje_externals/ico_fileselector_button.png b/data/elementary/edje_externals/ico_fileselector_button.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_fileselector_button.png rename to data/elementary/edje_externals/ico_fileselector_button.png diff --git a/legacy/elementary/data/edje_externals/ico_genlist.png b/data/elementary/edje_externals/ico_genlist.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_genlist.png rename to data/elementary/edje_externals/ico_genlist.png diff --git a/legacy/elementary/data/edje_externals/ico_hoversel.png b/data/elementary/edje_externals/ico_hoversel.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_hoversel.png rename to data/elementary/edje_externals/ico_hoversel.png diff --git a/legacy/elementary/data/edje_externals/ico_list.png b/data/elementary/edje_externals/ico_list.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_list.png rename to data/elementary/edje_externals/ico_list.png diff --git a/legacy/elementary/data/edje_externals/ico_map.png b/data/elementary/edje_externals/ico_map.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_map.png rename to data/elementary/edje_externals/ico_map.png diff --git a/legacy/elementary/data/edje_externals/ico_notepad.png b/data/elementary/edje_externals/ico_notepad.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_notepad.png rename to data/elementary/edje_externals/ico_notepad.png diff --git a/legacy/elementary/data/edje_externals/ico_photocam.png b/data/elementary/edje_externals/ico_photocam.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_photocam.png rename to data/elementary/edje_externals/ico_photocam.png diff --git a/legacy/elementary/data/edje_externals/ico_progressbar.png b/data/elementary/edje_externals/ico_progressbar.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_progressbar.png rename to data/elementary/edje_externals/ico_progressbar.png diff --git a/legacy/elementary/data/edje_externals/ico_radio.png b/data/elementary/edje_externals/ico_radio.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_radio.png rename to data/elementary/edje_externals/ico_radio.png diff --git a/legacy/elementary/data/edje_externals/ico_scrolled_entry.png b/data/elementary/edje_externals/ico_scrolled_entry.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_scrolled_entry.png rename to data/elementary/edje_externals/ico_scrolled_entry.png diff --git a/legacy/elementary/data/edje_externals/ico_slider.png b/data/elementary/edje_externals/ico_slider.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_slider.png rename to data/elementary/edje_externals/ico_slider.png diff --git a/legacy/elementary/data/edje_externals/ico_slideshow.png b/data/elementary/edje_externals/ico_slideshow.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_slideshow.png rename to data/elementary/edje_externals/ico_slideshow.png diff --git a/legacy/elementary/data/edje_externals/ico_spinner.png b/data/elementary/edje_externals/ico_spinner.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_spinner.png rename to data/elementary/edje_externals/ico_spinner.png diff --git a/legacy/elementary/data/edje_externals/ico_thumb.png b/data/elementary/edje_externals/ico_thumb.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_thumb.png rename to data/elementary/edje_externals/ico_thumb.png diff --git a/legacy/elementary/data/edje_externals/ico_toolbar.png b/data/elementary/edje_externals/ico_toolbar.png similarity index 100% rename from legacy/elementary/data/edje_externals/ico_toolbar.png rename to data/elementary/edje_externals/ico_toolbar.png diff --git a/legacy/elementary/data/edje_externals/icons.edc b/data/elementary/edje_externals/icons.edc similarity index 100% rename from legacy/elementary/data/edje_externals/icons.edc rename to data/elementary/edje_externals/icons.edc diff --git a/legacy/elementary/data/images/Makefile.am b/data/elementary/images/Makefile.am similarity index 100% rename from legacy/elementary/data/images/Makefile.am rename to data/elementary/images/Makefile.am diff --git a/legacy/elementary/data/images/animated_logo.gif b/data/elementary/images/animated_logo.gif similarity index 100% rename from legacy/elementary/data/images/animated_logo.gif rename to data/elementary/images/animated_logo.gif diff --git a/legacy/elementary/data/images/bubble.png b/data/elementary/images/bubble.png similarity index 100% rename from legacy/elementary/data/images/bubble.png rename to data/elementary/images/bubble.png diff --git a/legacy/elementary/data/images/bubble_sh.png b/data/elementary/images/bubble_sh.png similarity index 100% rename from legacy/elementary/data/images/bubble_sh.png rename to data/elementary/images/bubble_sh.png diff --git a/legacy/elementary/data/images/earth_normal.png b/data/elementary/images/earth_normal.png similarity index 100% rename from legacy/elementary/data/images/earth_normal.png rename to data/elementary/images/earth_normal.png diff --git a/legacy/elementary/data/images/g_layer/double_tap_1.png b/data/elementary/images/g_layer/double_tap_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/double_tap_1.png rename to data/elementary/images/g_layer/double_tap_1.png diff --git a/legacy/elementary/data/images/g_layer/double_tap_2.png b/data/elementary/images/g_layer/double_tap_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/double_tap_2.png rename to data/elementary/images/g_layer/double_tap_2.png diff --git a/legacy/elementary/data/images/g_layer/double_tap_3.png b/data/elementary/images/g_layer/double_tap_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/double_tap_3.png rename to data/elementary/images/g_layer/double_tap_3.png diff --git a/legacy/elementary/data/images/g_layer/double_tap_4.png b/data/elementary/images/g_layer/double_tap_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/double_tap_4.png rename to data/elementary/images/g_layer/double_tap_4.png diff --git a/legacy/elementary/data/images/g_layer/double_tap_5.png b/data/elementary/images/g_layer/double_tap_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/double_tap_5.png rename to data/elementary/images/g_layer/double_tap_5.png diff --git a/legacy/elementary/data/images/g_layer/flick_1.png b/data/elementary/images/g_layer/flick_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/flick_1.png rename to data/elementary/images/g_layer/flick_1.png diff --git a/legacy/elementary/data/images/g_layer/flick_2.png b/data/elementary/images/g_layer/flick_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/flick_2.png rename to data/elementary/images/g_layer/flick_2.png diff --git a/legacy/elementary/data/images/g_layer/flick_3.png b/data/elementary/images/g_layer/flick_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/flick_3.png rename to data/elementary/images/g_layer/flick_3.png diff --git a/legacy/elementary/data/images/g_layer/flick_4.png b/data/elementary/images/g_layer/flick_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/flick_4.png rename to data/elementary/images/g_layer/flick_4.png diff --git a/legacy/elementary/data/images/g_layer/flick_5.png b/data/elementary/images/g_layer/flick_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/flick_5.png rename to data/elementary/images/g_layer/flick_5.png diff --git a/legacy/elementary/data/images/g_layer/line_1.png b/data/elementary/images/g_layer/line_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/line_1.png rename to data/elementary/images/g_layer/line_1.png diff --git a/legacy/elementary/data/images/g_layer/line_2.png b/data/elementary/images/g_layer/line_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/line_2.png rename to data/elementary/images/g_layer/line_2.png diff --git a/legacy/elementary/data/images/g_layer/line_3.png b/data/elementary/images/g_layer/line_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/line_3.png rename to data/elementary/images/g_layer/line_3.png diff --git a/legacy/elementary/data/images/g_layer/line_4.png b/data/elementary/images/g_layer/line_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/line_4.png rename to data/elementary/images/g_layer/line_4.png diff --git a/legacy/elementary/data/images/g_layer/line_5.png b/data/elementary/images/g_layer/line_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/line_5.png rename to data/elementary/images/g_layer/line_5.png diff --git a/legacy/elementary/data/images/g_layer/long_tap_1.png b/data/elementary/images/g_layer/long_tap_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/long_tap_1.png rename to data/elementary/images/g_layer/long_tap_1.png diff --git a/legacy/elementary/data/images/g_layer/long_tap_2.png b/data/elementary/images/g_layer/long_tap_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/long_tap_2.png rename to data/elementary/images/g_layer/long_tap_2.png diff --git a/legacy/elementary/data/images/g_layer/long_tap_3.png b/data/elementary/images/g_layer/long_tap_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/long_tap_3.png rename to data/elementary/images/g_layer/long_tap_3.png diff --git a/legacy/elementary/data/images/g_layer/long_tap_4.png b/data/elementary/images/g_layer/long_tap_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/long_tap_4.png rename to data/elementary/images/g_layer/long_tap_4.png diff --git a/legacy/elementary/data/images/g_layer/long_tap_5.png b/data/elementary/images/g_layer/long_tap_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/long_tap_5.png rename to data/elementary/images/g_layer/long_tap_5.png diff --git a/legacy/elementary/data/images/g_layer/momentum_1.png b/data/elementary/images/g_layer/momentum_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/momentum_1.png rename to data/elementary/images/g_layer/momentum_1.png diff --git a/legacy/elementary/data/images/g_layer/momentum_2.png b/data/elementary/images/g_layer/momentum_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/momentum_2.png rename to data/elementary/images/g_layer/momentum_2.png diff --git a/legacy/elementary/data/images/g_layer/momentum_3.png b/data/elementary/images/g_layer/momentum_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/momentum_3.png rename to data/elementary/images/g_layer/momentum_3.png diff --git a/legacy/elementary/data/images/g_layer/momentum_4.png b/data/elementary/images/g_layer/momentum_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/momentum_4.png rename to data/elementary/images/g_layer/momentum_4.png diff --git a/legacy/elementary/data/images/g_layer/momentum_5.png b/data/elementary/images/g_layer/momentum_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/momentum_5.png rename to data/elementary/images/g_layer/momentum_5.png diff --git a/legacy/elementary/data/images/g_layer/rotate_1.png b/data/elementary/images/g_layer/rotate_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/rotate_1.png rename to data/elementary/images/g_layer/rotate_1.png diff --git a/legacy/elementary/data/images/g_layer/tap_1.png b/data/elementary/images/g_layer/tap_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/tap_1.png rename to data/elementary/images/g_layer/tap_1.png diff --git a/legacy/elementary/data/images/g_layer/tap_2.png b/data/elementary/images/g_layer/tap_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/tap_2.png rename to data/elementary/images/g_layer/tap_2.png diff --git a/legacy/elementary/data/images/g_layer/tap_3.png b/data/elementary/images/g_layer/tap_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/tap_3.png rename to data/elementary/images/g_layer/tap_3.png diff --git a/legacy/elementary/data/images/g_layer/tap_4.png b/data/elementary/images/g_layer/tap_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/tap_4.png rename to data/elementary/images/g_layer/tap_4.png diff --git a/legacy/elementary/data/images/g_layer/tap_5.png b/data/elementary/images/g_layer/tap_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/tap_5.png rename to data/elementary/images/g_layer/tap_5.png diff --git a/legacy/elementary/data/images/g_layer/triple_tap_1.png b/data/elementary/images/g_layer/triple_tap_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/triple_tap_1.png rename to data/elementary/images/g_layer/triple_tap_1.png diff --git a/legacy/elementary/data/images/g_layer/triple_tap_2.png b/data/elementary/images/g_layer/triple_tap_2.png similarity index 100% rename from legacy/elementary/data/images/g_layer/triple_tap_2.png rename to data/elementary/images/g_layer/triple_tap_2.png diff --git a/legacy/elementary/data/images/g_layer/triple_tap_3.png b/data/elementary/images/g_layer/triple_tap_3.png similarity index 100% rename from legacy/elementary/data/images/g_layer/triple_tap_3.png rename to data/elementary/images/g_layer/triple_tap_3.png diff --git a/legacy/elementary/data/images/g_layer/triple_tap_4.png b/data/elementary/images/g_layer/triple_tap_4.png similarity index 100% rename from legacy/elementary/data/images/g_layer/triple_tap_4.png rename to data/elementary/images/g_layer/triple_tap_4.png diff --git a/legacy/elementary/data/images/g_layer/triple_tap_5.png b/data/elementary/images/g_layer/triple_tap_5.png similarity index 100% rename from legacy/elementary/data/images/g_layer/triple_tap_5.png rename to data/elementary/images/g_layer/triple_tap_5.png diff --git a/legacy/elementary/data/images/g_layer/zoom_1.png b/data/elementary/images/g_layer/zoom_1.png similarity index 100% rename from legacy/elementary/data/images/g_layer/zoom_1.png rename to data/elementary/images/g_layer/zoom_1.png diff --git a/legacy/elementary/data/images/icon_00.png b/data/elementary/images/icon_00.png similarity index 100% rename from legacy/elementary/data/images/icon_00.png rename to data/elementary/images/icon_00.png diff --git a/legacy/elementary/data/images/icon_01.png b/data/elementary/images/icon_01.png similarity index 100% rename from legacy/elementary/data/images/icon_01.png rename to data/elementary/images/icon_01.png diff --git a/legacy/elementary/data/images/icon_02.png b/data/elementary/images/icon_02.png similarity index 100% rename from legacy/elementary/data/images/icon_02.png rename to data/elementary/images/icon_02.png diff --git a/legacy/elementary/data/images/icon_03.png b/data/elementary/images/icon_03.png similarity index 100% rename from legacy/elementary/data/images/icon_03.png rename to data/elementary/images/icon_03.png diff --git a/legacy/elementary/data/images/icon_04.png b/data/elementary/images/icon_04.png similarity index 100% rename from legacy/elementary/data/images/icon_04.png rename to data/elementary/images/icon_04.png diff --git a/legacy/elementary/data/images/icon_05.png b/data/elementary/images/icon_05.png similarity index 100% rename from legacy/elementary/data/images/icon_05.png rename to data/elementary/images/icon_05.png diff --git a/legacy/elementary/data/images/icon_06.png b/data/elementary/images/icon_06.png similarity index 100% rename from legacy/elementary/data/images/icon_06.png rename to data/elementary/images/icon_06.png diff --git a/legacy/elementary/data/images/icon_07.png b/data/elementary/images/icon_07.png similarity index 100% rename from legacy/elementary/data/images/icon_07.png rename to data/elementary/images/icon_07.png diff --git a/legacy/elementary/data/images/icon_08.png b/data/elementary/images/icon_08.png similarity index 100% rename from legacy/elementary/data/images/icon_08.png rename to data/elementary/images/icon_08.png diff --git a/legacy/elementary/data/images/icon_09.png b/data/elementary/images/icon_09.png similarity index 100% rename from legacy/elementary/data/images/icon_09.png rename to data/elementary/images/icon_09.png diff --git a/legacy/elementary/data/images/icon_10.png b/data/elementary/images/icon_10.png similarity index 100% rename from legacy/elementary/data/images/icon_10.png rename to data/elementary/images/icon_10.png diff --git a/legacy/elementary/data/images/icon_11.png b/data/elementary/images/icon_11.png similarity index 100% rename from legacy/elementary/data/images/icon_11.png rename to data/elementary/images/icon_11.png diff --git a/legacy/elementary/data/images/icon_12.png b/data/elementary/images/icon_12.png similarity index 100% rename from legacy/elementary/data/images/icon_12.png rename to data/elementary/images/icon_12.png diff --git a/legacy/elementary/data/images/icon_13.png b/data/elementary/images/icon_13.png similarity index 100% rename from legacy/elementary/data/images/icon_13.png rename to data/elementary/images/icon_13.png diff --git a/legacy/elementary/data/images/icon_14.png b/data/elementary/images/icon_14.png similarity index 100% rename from legacy/elementary/data/images/icon_14.png rename to data/elementary/images/icon_14.png diff --git a/legacy/elementary/data/images/icon_15.png b/data/elementary/images/icon_15.png similarity index 100% rename from legacy/elementary/data/images/icon_15.png rename to data/elementary/images/icon_15.png diff --git a/legacy/elementary/data/images/icon_16.png b/data/elementary/images/icon_16.png similarity index 100% rename from legacy/elementary/data/images/icon_16.png rename to data/elementary/images/icon_16.png diff --git a/legacy/elementary/data/images/icon_17.png b/data/elementary/images/icon_17.png similarity index 100% rename from legacy/elementary/data/images/icon_17.png rename to data/elementary/images/icon_17.png diff --git a/legacy/elementary/data/images/icon_18.png b/data/elementary/images/icon_18.png similarity index 100% rename from legacy/elementary/data/images/icon_18.png rename to data/elementary/images/icon_18.png diff --git a/legacy/elementary/data/images/icon_19.png b/data/elementary/images/icon_19.png similarity index 100% rename from legacy/elementary/data/images/icon_19.png rename to data/elementary/images/icon_19.png diff --git a/legacy/elementary/data/images/icon_20.png b/data/elementary/images/icon_20.png similarity index 100% rename from legacy/elementary/data/images/icon_20.png rename to data/elementary/images/icon_20.png diff --git a/legacy/elementary/data/images/icon_21.png b/data/elementary/images/icon_21.png similarity index 100% rename from legacy/elementary/data/images/icon_21.png rename to data/elementary/images/icon_21.png diff --git a/legacy/elementary/data/images/icon_22.png b/data/elementary/images/icon_22.png similarity index 100% rename from legacy/elementary/data/images/icon_22.png rename to data/elementary/images/icon_22.png diff --git a/legacy/elementary/data/images/icon_23.png b/data/elementary/images/icon_23.png similarity index 100% rename from legacy/elementary/data/images/icon_23.png rename to data/elementary/images/icon_23.png diff --git a/legacy/elementary/data/images/icon_right_arrow.png b/data/elementary/images/icon_right_arrow.png similarity index 100% rename from legacy/elementary/data/images/icon_right_arrow.png rename to data/elementary/images/icon_right_arrow.png diff --git a/legacy/elementary/data/images/insanely_huge_test_image.jpg b/data/elementary/images/insanely_huge_test_image.jpg similarity index 100% rename from legacy/elementary/data/images/insanely_huge_test_image.jpg rename to data/elementary/images/insanely_huge_test_image.jpg diff --git a/legacy/elementary/data/images/logo.png b/data/elementary/images/logo.png similarity index 100% rename from legacy/elementary/data/images/logo.png rename to data/elementary/images/logo.png diff --git a/legacy/elementary/data/images/logo_small.png b/data/elementary/images/logo_small.png similarity index 100% rename from legacy/elementary/data/images/logo_small.png rename to data/elementary/images/logo_small.png diff --git a/legacy/elementary/data/images/mystrale.jpg b/data/elementary/images/mystrale.jpg similarity index 100% rename from legacy/elementary/data/images/mystrale.jpg rename to data/elementary/images/mystrale.jpg diff --git a/legacy/elementary/data/images/mystrale_2.jpg b/data/elementary/images/mystrale_2.jpg similarity index 100% rename from legacy/elementary/data/images/mystrale_2.jpg rename to data/elementary/images/mystrale_2.jpg diff --git a/legacy/elementary/data/images/panel_01.jpg b/data/elementary/images/panel_01.jpg similarity index 100% rename from legacy/elementary/data/images/panel_01.jpg rename to data/elementary/images/panel_01.jpg diff --git a/legacy/elementary/data/images/parking.png b/data/elementary/images/parking.png similarity index 100% rename from legacy/elementary/data/images/parking.png rename to data/elementary/images/parking.png diff --git a/legacy/elementary/data/images/plant_01.jpg b/data/elementary/images/plant_01.jpg similarity index 100% rename from legacy/elementary/data/images/plant_01.jpg rename to data/elementary/images/plant_01.jpg diff --git a/legacy/elementary/data/images/pol_shadow.png b/data/elementary/images/pol_shadow.png similarity index 100% rename from legacy/elementary/data/images/pol_shadow.png rename to data/elementary/images/pol_shadow.png diff --git a/legacy/elementary/data/images/pol_sky.png b/data/elementary/images/pol_sky.png similarity index 100% rename from legacy/elementary/data/images/pol_sky.png rename to data/elementary/images/pol_sky.png diff --git a/legacy/elementary/data/images/pol_twofish.png b/data/elementary/images/pol_twofish.png similarity index 100% rename from legacy/elementary/data/images/pol_twofish.png rename to data/elementary/images/pol_twofish.png diff --git a/legacy/elementary/data/images/pt.png b/data/elementary/images/pt.png similarity index 100% rename from legacy/elementary/data/images/pt.png rename to data/elementary/images/pt.png diff --git a/legacy/elementary/data/images/rock_01.jpg b/data/elementary/images/rock_01.jpg similarity index 100% rename from legacy/elementary/data/images/rock_01.jpg rename to data/elementary/images/rock_01.jpg diff --git a/legacy/elementary/data/images/rock_02.jpg b/data/elementary/images/rock_02.jpg similarity index 100% rename from legacy/elementary/data/images/rock_02.jpg rename to data/elementary/images/rock_02.jpg diff --git a/legacy/elementary/data/images/sky_01.jpg b/data/elementary/images/sky_01.jpg similarity index 100% rename from legacy/elementary/data/images/sky_01.jpg rename to data/elementary/images/sky_01.jpg diff --git a/legacy/elementary/data/images/sky_02.jpg b/data/elementary/images/sky_02.jpg similarity index 100% rename from legacy/elementary/data/images/sky_02.jpg rename to data/elementary/images/sky_02.jpg diff --git a/legacy/elementary/data/images/sky_03.jpg b/data/elementary/images/sky_03.jpg similarity index 100% rename from legacy/elementary/data/images/sky_03.jpg rename to data/elementary/images/sky_03.jpg diff --git a/legacy/elementary/data/images/sky_04.jpg b/data/elementary/images/sky_04.jpg similarity index 100% rename from legacy/elementary/data/images/sky_04.jpg rename to data/elementary/images/sky_04.jpg diff --git a/legacy/elementary/data/images/space.png b/data/elementary/images/space.png similarity index 100% rename from legacy/elementary/data/images/space.png rename to data/elementary/images/space.png diff --git a/legacy/elementary/data/images/twofish.jpg b/data/elementary/images/twofish.jpg similarity index 100% rename from legacy/elementary/data/images/twofish.jpg rename to data/elementary/images/twofish.jpg diff --git a/legacy/elementary/data/images/wood_01.jpg b/data/elementary/images/wood_01.jpg similarity index 100% rename from legacy/elementary/data/images/wood_01.jpg rename to data/elementary/images/wood_01.jpg diff --git a/legacy/elementary/data/objects/Makefile.am b/data/elementary/objects/Makefile.am similarity index 100% rename from legacy/elementary/data/objects/Makefile.am rename to data/elementary/objects/Makefile.am diff --git a/legacy/elementary/data/objects/border.png b/data/elementary/objects/border.png similarity index 100% rename from legacy/elementary/data/objects/border.png rename to data/elementary/objects/border.png diff --git a/legacy/elementary/data/objects/border2.png b/data/elementary/objects/border2.png similarity index 100% rename from legacy/elementary/data/objects/border2.png rename to data/elementary/objects/border2.png diff --git a/legacy/elementary/data/objects/border3.png b/data/elementary/objects/border3.png similarity index 100% rename from legacy/elementary/data/objects/border3.png rename to data/elementary/objects/border3.png diff --git a/legacy/elementary/data/objects/border4.png b/data/elementary/objects/border4.png similarity index 100% rename from legacy/elementary/data/objects/border4.png rename to data/elementary/objects/border4.png diff --git a/legacy/elementary/data/objects/border5.png b/data/elementary/objects/border5.png similarity index 100% rename from legacy/elementary/data/objects/border5.png rename to data/elementary/objects/border5.png diff --git a/legacy/elementary/data/objects/border6.png b/data/elementary/objects/border6.png similarity index 100% rename from legacy/elementary/data/objects/border6.png rename to data/elementary/objects/border6.png diff --git a/legacy/elementary/data/objects/clo.png b/data/elementary/objects/clo.png similarity index 100% rename from legacy/elementary/data/objects/clo.png rename to data/elementary/objects/clo.png diff --git a/legacy/elementary/data/objects/combobox_multiple.edc b/data/elementary/objects/combobox_multiple.edc similarity index 100% rename from legacy/elementary/data/objects/combobox_multiple.edc rename to data/elementary/objects/combobox_multiple.edc diff --git a/legacy/elementary/data/objects/cross.png b/data/elementary/objects/cross.png similarity index 100% rename from legacy/elementary/data/objects/cross.png rename to data/elementary/objects/cross.png diff --git a/legacy/elementary/data/objects/cursors.edc b/data/elementary/objects/cursors.edc similarity index 100% rename from legacy/elementary/data/objects/cursors.edc rename to data/elementary/objects/cursors.edc diff --git a/legacy/elementary/data/objects/font_preview.edc b/data/elementary/objects/font_preview.edc similarity index 100% rename from legacy/elementary/data/objects/font_preview.edc rename to data/elementary/objects/font_preview.edc diff --git a/legacy/elementary/data/objects/multibuttonentry.edc b/data/elementary/objects/multibuttonentry.edc similarity index 100% rename from legacy/elementary/data/objects/multibuttonentry.edc rename to data/elementary/objects/multibuttonentry.edc diff --git a/legacy/elementary/data/objects/multip.edc b/data/elementary/objects/multip.edc similarity index 100% rename from legacy/elementary/data/objects/multip.edc rename to data/elementary/objects/multip.edc diff --git a/legacy/elementary/data/objects/over.png b/data/elementary/objects/over.png similarity index 100% rename from legacy/elementary/data/objects/over.png rename to data/elementary/objects/over.png diff --git a/legacy/elementary/data/objects/postit_ent.edc b/data/elementary/objects/postit_ent.edc similarity index 100% rename from legacy/elementary/data/objects/postit_ent.edc rename to data/elementary/objects/postit_ent.edc diff --git a/legacy/elementary/data/objects/sky.jpg b/data/elementary/objects/sky.jpg similarity index 100% rename from legacy/elementary/data/objects/sky.jpg rename to data/elementary/objects/sky.jpg diff --git a/legacy/elementary/data/objects/test.edc b/data/elementary/objects/test.edc similarity index 100% rename from legacy/elementary/data/objects/test.edc rename to data/elementary/objects/test.edc diff --git a/legacy/elementary/data/objects/test_external.edc b/data/elementary/objects/test_external.edc similarity index 100% rename from legacy/elementary/data/objects/test_external.edc rename to data/elementary/objects/test_external.edc diff --git a/legacy/elementary/data/objects/test_focus_style.edc b/data/elementary/objects/test_focus_style.edc similarity index 100% rename from legacy/elementary/data/objects/test_focus_style.edc rename to data/elementary/objects/test_focus_style.edc diff --git a/legacy/elementary/data/objects/test_prefs.edc b/data/elementary/objects/test_prefs.edc similarity index 100% rename from legacy/elementary/data/objects/test_prefs.edc rename to data/elementary/objects/test_prefs.edc diff --git a/legacy/elementary/data/objects/test_prefs.epc b/data/elementary/objects/test_prefs.epc similarity index 100% rename from legacy/elementary/data/objects/test_prefs.epc rename to data/elementary/objects/test_prefs.epc diff --git a/legacy/elementary/data/objects/under.png b/data/elementary/objects/under.png similarity index 100% rename from legacy/elementary/data/objects/under.png rename to data/elementary/objects/under.png diff --git a/legacy/elementary/data/themes/Makefile.am b/data/elementary/themes/Makefile.am similarity index 100% rename from legacy/elementary/data/themes/Makefile.am rename to data/elementary/themes/Makefile.am diff --git a/legacy/elementary/data/themes/colorclasses.edc b/data/elementary/themes/colorclasses.edc similarity index 100% rename from legacy/elementary/data/themes/colorclasses.edc rename to data/elementary/themes/colorclasses.edc diff --git a/legacy/elementary/data/themes/default.edc b/data/elementary/themes/default.edc similarity index 100% rename from legacy/elementary/data/themes/default.edc rename to data/elementary/themes/default.edc diff --git a/legacy/elementary/data/themes/edc/O/efm_icons.edc b/data/elementary/themes/edc/O/efm_icons.edc similarity index 100% rename from legacy/elementary/data/themes/edc/O/efm_icons.edc rename to data/elementary/themes/edc/O/efm_icons.edc diff --git a/legacy/elementary/data/themes/edc/O/icons.edc b/data/elementary/themes/edc/O/icons.edc similarity index 100% rename from legacy/elementary/data/themes/edc/O/icons.edc rename to data/elementary/themes/edc/O/icons.edc diff --git a/legacy/elementary/data/themes/edc/about-e.edc b/data/elementary/themes/edc/about-e.edc similarity index 100% rename from legacy/elementary/data/themes/edc/about-e.edc rename to data/elementary/themes/edc/about-e.edc diff --git a/legacy/elementary/data/themes/edc/about-theme.edc b/data/elementary/themes/edc/about-theme.edc similarity index 100% rename from legacy/elementary/data/themes/edc/about-theme.edc rename to data/elementary/themes/edc/about-theme.edc diff --git a/legacy/elementary/data/themes/edc/appmenu.edc b/data/elementary/themes/edc/appmenu.edc similarity index 100% rename from legacy/elementary/data/themes/edc/appmenu.edc rename to data/elementary/themes/edc/appmenu.edc diff --git a/legacy/elementary/data/themes/edc/background.edc b/data/elementary/themes/edc/background.edc similarity index 100% rename from legacy/elementary/data/themes/edc/background.edc rename to data/elementary/themes/edc/background.edc diff --git a/legacy/elementary/data/themes/edc/backlight.edc b/data/elementary/themes/edc/backlight.edc similarity index 100% rename from legacy/elementary/data/themes/edc/backlight.edc rename to data/elementary/themes/edc/backlight.edc diff --git a/legacy/elementary/data/themes/edc/battery.edc b/data/elementary/themes/edc/battery.edc similarity index 100% rename from legacy/elementary/data/themes/edc/battery.edc rename to data/elementary/themes/edc/battery.edc diff --git a/legacy/elementary/data/themes/edc/bluez4.edc b/data/elementary/themes/edc/bluez4.edc similarity index 100% rename from legacy/elementary/data/themes/edc/bluez4.edc rename to data/elementary/themes/edc/bluez4.edc diff --git a/legacy/elementary/data/themes/edc/border-icons.edc b/data/elementary/themes/edc/border-icons.edc similarity index 100% rename from legacy/elementary/data/themes/edc/border-icons.edc rename to data/elementary/themes/edc/border-icons.edc diff --git a/legacy/elementary/data/themes/edc/border.edc b/data/elementary/themes/edc/border.edc similarity index 100% rename from legacy/elementary/data/themes/edc/border.edc rename to data/elementary/themes/edc/border.edc diff --git a/legacy/elementary/data/themes/edc/bryce.edc b/data/elementary/themes/edc/bryce.edc similarity index 100% rename from legacy/elementary/data/themes/edc/bryce.edc rename to data/elementary/themes/edc/bryce.edc diff --git a/legacy/elementary/data/themes/edc/bryce_editor.edc b/data/elementary/themes/edc/bryce_editor.edc similarity index 100% rename from legacy/elementary/data/themes/edc/bryce_editor.edc rename to data/elementary/themes/edc/bryce_editor.edc diff --git a/legacy/elementary/data/themes/edc/button.edc b/data/elementary/themes/edc/button.edc similarity index 100% rename from legacy/elementary/data/themes/edc/button.edc rename to data/elementary/themes/edc/button.edc diff --git a/legacy/elementary/data/themes/edc/check.edc b/data/elementary/themes/edc/check.edc similarity index 100% rename from legacy/elementary/data/themes/edc/check.edc rename to data/elementary/themes/edc/check.edc diff --git a/legacy/elementary/data/themes/edc/clock.edc b/data/elementary/themes/edc/clock.edc similarity index 100% rename from legacy/elementary/data/themes/edc/clock.edc rename to data/elementary/themes/edc/clock.edc diff --git a/legacy/elementary/data/themes/edc/colors.edc b/data/elementary/themes/edc/colors.edc similarity index 100% rename from legacy/elementary/data/themes/edc/colors.edc rename to data/elementary/themes/edc/colors.edc diff --git a/legacy/elementary/data/themes/edc/colorwell.edc b/data/elementary/themes/edc/colorwell.edc similarity index 100% rename from legacy/elementary/data/themes/edc/colorwell.edc rename to data/elementary/themes/edc/colorwell.edc diff --git a/legacy/elementary/data/themes/edc/comp.edc b/data/elementary/themes/edc/comp.edc similarity index 100% rename from legacy/elementary/data/themes/edc/comp.edc rename to data/elementary/themes/edc/comp.edc diff --git a/legacy/elementary/data/themes/edc/comp_compat.edc b/data/elementary/themes/edc/comp_compat.edc similarity index 100% rename from legacy/elementary/data/themes/edc/comp_compat.edc rename to data/elementary/themes/edc/comp_compat.edc diff --git a/legacy/elementary/data/themes/edc/comp_effects.edc b/data/elementary/themes/edc/comp_effects.edc similarity index 100% rename from legacy/elementary/data/themes/edc/comp_effects.edc rename to data/elementary/themes/edc/comp_effects.edc diff --git a/legacy/elementary/data/themes/edc/conf.edc b/data/elementary/themes/edc/conf.edc similarity index 100% rename from legacy/elementary/data/themes/edc/conf.edc rename to data/elementary/themes/edc/conf.edc diff --git a/legacy/elementary/data/themes/edc/connman.edc b/data/elementary/themes/edc/connman.edc similarity index 100% rename from legacy/elementary/data/themes/edc/connman.edc rename to data/elementary/themes/edc/connman.edc diff --git a/legacy/elementary/data/themes/edc/cpufreq.edc b/data/elementary/themes/edc/cpufreq.edc similarity index 100% rename from legacy/elementary/data/themes/edc/cpufreq.edc rename to data/elementary/themes/edc/cpufreq.edc diff --git a/legacy/elementary/data/themes/edc/cslider.edc b/data/elementary/themes/edc/cslider.edc similarity index 100% rename from legacy/elementary/data/themes/edc/cslider.edc rename to data/elementary/themes/edc/cslider.edc diff --git a/legacy/elementary/data/themes/edc/desklock.edc b/data/elementary/themes/edc/desklock.edc similarity index 100% rename from legacy/elementary/data/themes/edc/desklock.edc rename to data/elementary/themes/edc/desklock.edc diff --git a/legacy/elementary/data/themes/edc/deskmirror.edc b/data/elementary/themes/edc/deskmirror.edc similarity index 100% rename from legacy/elementary/data/themes/edc/deskmirror.edc rename to data/elementary/themes/edc/deskmirror.edc diff --git a/legacy/elementary/data/themes/edc/deskpreview.edc b/data/elementary/themes/edc/deskpreview.edc similarity index 100% rename from legacy/elementary/data/themes/edc/deskpreview.edc rename to data/elementary/themes/edc/deskpreview.edc diff --git a/legacy/elementary/data/themes/edc/dialog.edc b/data/elementary/themes/edc/dialog.edc similarity index 100% rename from legacy/elementary/data/themes/edc/dialog.edc rename to data/elementary/themes/edc/dialog.edc diff --git a/legacy/elementary/data/themes/edc/edgebindings.edc b/data/elementary/themes/edc/edgebindings.edc similarity index 100% rename from legacy/elementary/data/themes/edc/edgebindings.edc rename to data/elementary/themes/edc/edgebindings.edc diff --git a/legacy/elementary/data/themes/edc/elm/access.edc b/data/elementary/themes/edc/elm/access.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/access.edc rename to data/elementary/themes/edc/elm/access.edc diff --git a/legacy/elementary/data/themes/edc/elm/actionslider.edc b/data/elementary/themes/edc/elm/actionslider.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/actionslider.edc rename to data/elementary/themes/edc/elm/actionslider.edc diff --git a/legacy/elementary/data/themes/edc/elm/bg.edc b/data/elementary/themes/edc/elm/bg.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/bg.edc rename to data/elementary/themes/edc/elm/bg.edc diff --git a/legacy/elementary/data/themes/edc/elm/border.edc b/data/elementary/themes/edc/elm/border.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/border.edc rename to data/elementary/themes/edc/elm/border.edc diff --git a/legacy/elementary/data/themes/edc/elm/bubble.edc b/data/elementary/themes/edc/elm/bubble.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/bubble.edc rename to data/elementary/themes/edc/elm/bubble.edc diff --git a/legacy/elementary/data/themes/edc/elm/button.edc b/data/elementary/themes/edc/elm/button.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/button.edc rename to data/elementary/themes/edc/elm/button.edc diff --git a/legacy/elementary/data/themes/edc/elm/calendar.edc b/data/elementary/themes/edc/elm/calendar.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/calendar.edc rename to data/elementary/themes/edc/elm/calendar.edc diff --git a/legacy/elementary/data/themes/edc/elm/check.edc b/data/elementary/themes/edc/elm/check.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/check.edc rename to data/elementary/themes/edc/elm/check.edc diff --git a/legacy/elementary/data/themes/edc/elm/clock.edc b/data/elementary/themes/edc/elm/clock.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/clock.edc rename to data/elementary/themes/edc/elm/clock.edc diff --git a/legacy/elementary/data/themes/edc/elm/colorclass.edc b/data/elementary/themes/edc/elm/colorclass.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/colorclass.edc rename to data/elementary/themes/edc/elm/colorclass.edc diff --git a/legacy/elementary/data/themes/edc/elm/colorsel.edc b/data/elementary/themes/edc/elm/colorsel.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/colorsel.edc rename to data/elementary/themes/edc/elm/colorsel.edc diff --git a/legacy/elementary/data/themes/edc/elm/conform.edc b/data/elementary/themes/edc/elm/conform.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/conform.edc rename to data/elementary/themes/edc/elm/conform.edc diff --git a/legacy/elementary/data/themes/edc/elm/ctxpopup.edc b/data/elementary/themes/edc/elm/ctxpopup.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/ctxpopup.edc rename to data/elementary/themes/edc/elm/ctxpopup.edc diff --git a/legacy/elementary/data/themes/edc/elm/cursor.edc b/data/elementary/themes/edc/elm/cursor.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/cursor.edc rename to data/elementary/themes/edc/elm/cursor.edc diff --git a/legacy/elementary/data/themes/edc/elm/datetime.edc b/data/elementary/themes/edc/elm/datetime.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/datetime.edc rename to data/elementary/themes/edc/elm/datetime.edc diff --git a/legacy/elementary/data/themes/edc/elm/dayselector.edc b/data/elementary/themes/edc/elm/dayselector.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/dayselector.edc rename to data/elementary/themes/edc/elm/dayselector.edc diff --git a/legacy/elementary/data/themes/edc/elm/diskselector.edc b/data/elementary/themes/edc/elm/diskselector.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/diskselector.edc rename to data/elementary/themes/edc/elm/diskselector.edc diff --git a/legacy/elementary/data/themes/edc/elm/entry.edc b/data/elementary/themes/edc/elm/entry.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/entry.edc rename to data/elementary/themes/edc/elm/entry.edc diff --git a/legacy/elementary/data/themes/edc/elm/fileselector.edc b/data/elementary/themes/edc/elm/fileselector.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/fileselector.edc rename to data/elementary/themes/edc/elm/fileselector.edc diff --git a/legacy/elementary/data/themes/edc/elm/flipselector.edc b/data/elementary/themes/edc/elm/flipselector.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/flipselector.edc rename to data/elementary/themes/edc/elm/flipselector.edc diff --git a/legacy/elementary/data/themes/edc/elm/focus.edc b/data/elementary/themes/edc/elm/focus.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/focus.edc rename to data/elementary/themes/edc/elm/focus.edc diff --git a/legacy/elementary/data/themes/edc/elm/frame.edc b/data/elementary/themes/edc/elm/frame.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/frame.edc rename to data/elementary/themes/edc/elm/frame.edc diff --git a/legacy/elementary/data/themes/edc/elm/gengrid.edc b/data/elementary/themes/edc/elm/gengrid.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/gengrid.edc rename to data/elementary/themes/edc/elm/gengrid.edc diff --git a/legacy/elementary/data/themes/edc/elm/genlist.edc b/data/elementary/themes/edc/elm/genlist.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/genlist.edc rename to data/elementary/themes/edc/elm/genlist.edc diff --git a/legacy/elementary/data/themes/edc/elm/hover.edc b/data/elementary/themes/edc/elm/hover.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/hover.edc rename to data/elementary/themes/edc/elm/hover.edc diff --git a/legacy/elementary/data/themes/edc/elm/icon.edc b/data/elementary/themes/edc/elm/icon.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/icon.edc rename to data/elementary/themes/edc/elm/icon.edc diff --git a/legacy/elementary/data/themes/edc/elm/index.edc b/data/elementary/themes/edc/elm/index.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/index.edc rename to data/elementary/themes/edc/elm/index.edc diff --git a/legacy/elementary/data/themes/edc/elm/inwin.edc b/data/elementary/themes/edc/elm/inwin.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/inwin.edc rename to data/elementary/themes/edc/elm/inwin.edc diff --git a/legacy/elementary/data/themes/edc/elm/label.edc b/data/elementary/themes/edc/elm/label.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/label.edc rename to data/elementary/themes/edc/elm/label.edc diff --git a/legacy/elementary/data/themes/edc/elm/layout.edc b/data/elementary/themes/edc/elm/layout.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/layout.edc rename to data/elementary/themes/edc/elm/layout.edc diff --git a/legacy/elementary/data/themes/edc/elm/list.edc b/data/elementary/themes/edc/elm/list.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/list.edc rename to data/elementary/themes/edc/elm/list.edc diff --git a/legacy/elementary/data/themes/edc/elm/map.edc b/data/elementary/themes/edc/elm/map.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/map.edc rename to data/elementary/themes/edc/elm/map.edc diff --git a/legacy/elementary/data/themes/edc/elm/menu.edc b/data/elementary/themes/edc/elm/menu.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/menu.edc rename to data/elementary/themes/edc/elm/menu.edc diff --git a/legacy/elementary/data/themes/edc/elm/multibuttonentry.edc b/data/elementary/themes/edc/elm/multibuttonentry.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/multibuttonentry.edc rename to data/elementary/themes/edc/elm/multibuttonentry.edc diff --git a/legacy/elementary/data/themes/edc/elm/naviframe.edc b/data/elementary/themes/edc/elm/naviframe.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/naviframe.edc rename to data/elementary/themes/edc/elm/naviframe.edc diff --git a/legacy/elementary/data/themes/edc/elm/notify.edc b/data/elementary/themes/edc/elm/notify.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/notify.edc rename to data/elementary/themes/edc/elm/notify.edc diff --git a/legacy/elementary/data/themes/edc/elm/panel.edc b/data/elementary/themes/edc/elm/panel.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/panel.edc rename to data/elementary/themes/edc/elm/panel.edc diff --git a/legacy/elementary/data/themes/edc/elm/panes.edc b/data/elementary/themes/edc/elm/panes.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/panes.edc rename to data/elementary/themes/edc/elm/panes.edc diff --git a/legacy/elementary/data/themes/edc/elm/photo.edc b/data/elementary/themes/edc/elm/photo.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/photo.edc rename to data/elementary/themes/edc/elm/photo.edc diff --git a/legacy/elementary/data/themes/edc/elm/photocam.edc b/data/elementary/themes/edc/elm/photocam.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/photocam.edc rename to data/elementary/themes/edc/elm/photocam.edc diff --git a/legacy/elementary/data/themes/edc/elm/player.edc b/data/elementary/themes/edc/elm/player.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/player.edc rename to data/elementary/themes/edc/elm/player.edc diff --git a/legacy/elementary/data/themes/edc/elm/pointer.edc b/data/elementary/themes/edc/elm/pointer.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/pointer.edc rename to data/elementary/themes/edc/elm/pointer.edc diff --git a/legacy/elementary/data/themes/edc/elm/popup.edc b/data/elementary/themes/edc/elm/popup.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/popup.edc rename to data/elementary/themes/edc/elm/popup.edc diff --git a/legacy/elementary/data/themes/edc/elm/progress.edc b/data/elementary/themes/edc/elm/progress.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/progress.edc rename to data/elementary/themes/edc/elm/progress.edc diff --git a/legacy/elementary/data/themes/edc/elm/radio.edc b/data/elementary/themes/edc/elm/radio.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/radio.edc rename to data/elementary/themes/edc/elm/radio.edc diff --git a/legacy/elementary/data/themes/edc/elm/scroller.edc b/data/elementary/themes/edc/elm/scroller.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/scroller.edc rename to data/elementary/themes/edc/elm/scroller.edc diff --git a/legacy/elementary/data/themes/edc/elm/segment_control.edc b/data/elementary/themes/edc/elm/segment_control.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/segment_control.edc rename to data/elementary/themes/edc/elm/segment_control.edc diff --git a/legacy/elementary/data/themes/edc/elm/separator.edc b/data/elementary/themes/edc/elm/separator.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/separator.edc rename to data/elementary/themes/edc/elm/separator.edc diff --git a/legacy/elementary/data/themes/edc/elm/slider.edc b/data/elementary/themes/edc/elm/slider.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/slider.edc rename to data/elementary/themes/edc/elm/slider.edc diff --git a/legacy/elementary/data/themes/edc/elm/slideshow.edc b/data/elementary/themes/edc/elm/slideshow.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/slideshow.edc rename to data/elementary/themes/edc/elm/slideshow.edc diff --git a/legacy/elementary/data/themes/edc/elm/spinner.edc b/data/elementary/themes/edc/elm/spinner.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/spinner.edc rename to data/elementary/themes/edc/elm/spinner.edc diff --git a/legacy/elementary/data/themes/edc/elm/thumb.edc b/data/elementary/themes/edc/elm/thumb.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/thumb.edc rename to data/elementary/themes/edc/elm/thumb.edc diff --git a/legacy/elementary/data/themes/edc/elm/toolbar.edc b/data/elementary/themes/edc/elm/toolbar.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/toolbar.edc rename to data/elementary/themes/edc/elm/toolbar.edc diff --git a/legacy/elementary/data/themes/edc/elm/tooltip.edc b/data/elementary/themes/edc/elm/tooltip.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/tooltip.edc rename to data/elementary/themes/edc/elm/tooltip.edc diff --git a/legacy/elementary/data/themes/edc/elm/video.edc b/data/elementary/themes/edc/elm/video.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/video.edc rename to data/elementary/themes/edc/elm/video.edc diff --git a/legacy/elementary/data/themes/edc/elm/win.edc b/data/elementary/themes/edc/elm/win.edc similarity index 100% rename from legacy/elementary/data/themes/edc/elm/win.edc rename to data/elementary/themes/edc/elm/win.edc diff --git a/legacy/elementary/data/themes/edc/entry.edc b/data/elementary/themes/edc/entry.edc similarity index 100% rename from legacy/elementary/data/themes/edc/entry.edc rename to data/elementary/themes/edc/entry.edc diff --git a/legacy/elementary/data/themes/edc/evrything.edc b/data/elementary/themes/edc/evrything.edc similarity index 100% rename from legacy/elementary/data/themes/edc/evrything.edc rename to data/elementary/themes/edc/evrything.edc diff --git a/legacy/elementary/data/themes/edc/fileman.edc b/data/elementary/themes/edc/fileman.edc similarity index 100% rename from legacy/elementary/data/themes/edc/fileman.edc rename to data/elementary/themes/edc/fileman.edc diff --git a/legacy/elementary/data/themes/edc/fontpreview.edc b/data/elementary/themes/edc/fontpreview.edc similarity index 100% rename from legacy/elementary/data/themes/edc/fontpreview.edc rename to data/elementary/themes/edc/fontpreview.edc diff --git a/legacy/elementary/data/themes/edc/frame.edc b/data/elementary/themes/edc/frame.edc similarity index 100% rename from legacy/elementary/data/themes/edc/frame.edc rename to data/elementary/themes/edc/frame.edc diff --git a/legacy/elementary/data/themes/edc/gadman.edc b/data/elementary/themes/edc/gadman.edc similarity index 100% rename from legacy/elementary/data/themes/edc/gadman.edc rename to data/elementary/themes/edc/gadman.edc diff --git a/legacy/elementary/data/themes/edc/ibar-ibox.edc b/data/elementary/themes/edc/ibar-ibox.edc similarity index 100% rename from legacy/elementary/data/themes/edc/ibar-ibox.edc rename to data/elementary/themes/edc/ibar-ibox.edc diff --git a/legacy/elementary/data/themes/edc/icons.edc b/data/elementary/themes/edc/icons.edc similarity index 100% rename from legacy/elementary/data/themes/edc/icons.edc rename to data/elementary/themes/edc/icons.edc diff --git a/legacy/elementary/data/themes/edc/ilist.edc b/data/elementary/themes/edc/ilist.edc similarity index 100% rename from legacy/elementary/data/themes/edc/ilist.edc rename to data/elementary/themes/edc/ilist.edc diff --git a/legacy/elementary/data/themes/edc/illume.edc b/data/elementary/themes/edc/illume.edc similarity index 100% rename from legacy/elementary/data/themes/edc/illume.edc rename to data/elementary/themes/edc/illume.edc diff --git a/legacy/elementary/data/themes/edc/init.edc b/data/elementary/themes/edc/init.edc similarity index 100% rename from legacy/elementary/data/themes/edc/init.edc rename to data/elementary/themes/edc/init.edc diff --git a/legacy/elementary/data/themes/edc/label.edc b/data/elementary/themes/edc/label.edc similarity index 100% rename from legacy/elementary/data/themes/edc/label.edc rename to data/elementary/themes/edc/label.edc diff --git a/legacy/elementary/data/themes/edc/menu.edc b/data/elementary/themes/edc/menu.edc similarity index 100% rename from legacy/elementary/data/themes/edc/menu.edc rename to data/elementary/themes/edc/menu.edc diff --git a/legacy/elementary/data/themes/edc/mixer.edc b/data/elementary/themes/edc/mixer.edc similarity index 100% rename from legacy/elementary/data/themes/edc/mixer.edc rename to data/elementary/themes/edc/mixer.edc diff --git a/legacy/elementary/data/themes/edc/music_control.edc b/data/elementary/themes/edc/music_control.edc similarity index 100% rename from legacy/elementary/data/themes/edc/music_control.edc rename to data/elementary/themes/edc/music_control.edc diff --git a/legacy/elementary/data/themes/edc/notification.edc b/data/elementary/themes/edc/notification.edc similarity index 100% rename from legacy/elementary/data/themes/edc/notification.edc rename to data/elementary/themes/edc/notification.edc diff --git a/legacy/elementary/data/themes/edc/packagekit.edc b/data/elementary/themes/edc/packagekit.edc similarity index 100% rename from legacy/elementary/data/themes/edc/packagekit.edc rename to data/elementary/themes/edc/packagekit.edc diff --git a/legacy/elementary/data/themes/edc/pager.edc b/data/elementary/themes/edc/pager.edc similarity index 100% rename from legacy/elementary/data/themes/edc/pager.edc rename to data/elementary/themes/edc/pager.edc diff --git a/legacy/elementary/data/themes/edc/pager16.edc b/data/elementary/themes/edc/pager16.edc similarity index 100% rename from legacy/elementary/data/themes/edc/pager16.edc rename to data/elementary/themes/edc/pager16.edc diff --git a/legacy/elementary/data/themes/edc/pointer.edc b/data/elementary/themes/edc/pointer.edc similarity index 100% rename from legacy/elementary/data/themes/edc/pointer.edc rename to data/elementary/themes/edc/pointer.edc diff --git a/legacy/elementary/data/themes/edc/preview.edc b/data/elementary/themes/edc/preview.edc similarity index 100% rename from legacy/elementary/data/themes/edc/preview.edc rename to data/elementary/themes/edc/preview.edc diff --git a/legacy/elementary/data/themes/edc/radio.edc b/data/elementary/themes/edc/radio.edc similarity index 100% rename from legacy/elementary/data/themes/edc/radio.edc rename to data/elementary/themes/edc/radio.edc diff --git a/legacy/elementary/data/themes/edc/randr.edc b/data/elementary/themes/edc/randr.edc similarity index 100% rename from legacy/elementary/data/themes/edc/randr.edc rename to data/elementary/themes/edc/randr.edc diff --git a/legacy/elementary/data/themes/edc/scrollframe.edc b/data/elementary/themes/edc/scrollframe.edc similarity index 100% rename from legacy/elementary/data/themes/edc/scrollframe.edc rename to data/elementary/themes/edc/scrollframe.edc diff --git a/legacy/elementary/data/themes/edc/shelf.edc b/data/elementary/themes/edc/shelf.edc similarity index 100% rename from legacy/elementary/data/themes/edc/shelf.edc rename to data/elementary/themes/edc/shelf.edc diff --git a/legacy/elementary/data/themes/edc/slider.edc b/data/elementary/themes/edc/slider.edc similarity index 100% rename from legacy/elementary/data/themes/edc/slider.edc rename to data/elementary/themes/edc/slider.edc diff --git a/legacy/elementary/data/themes/edc/spectrum.edc b/data/elementary/themes/edc/spectrum.edc similarity index 100% rename from legacy/elementary/data/themes/edc/spectrum.edc rename to data/elementary/themes/edc/spectrum.edc diff --git a/legacy/elementary/data/themes/edc/start.edc b/data/elementary/themes/edc/start.edc similarity index 100% rename from legacy/elementary/data/themes/edc/start.edc rename to data/elementary/themes/edc/start.edc diff --git a/legacy/elementary/data/themes/edc/sys.edc b/data/elementary/themes/edc/sys.edc similarity index 100% rename from legacy/elementary/data/themes/edc/sys.edc rename to data/elementary/themes/edc/sys.edc diff --git a/legacy/elementary/data/themes/edc/syscon.edc b/data/elementary/themes/edc/syscon.edc similarity index 100% rename from legacy/elementary/data/themes/edc/syscon.edc rename to data/elementary/themes/edc/syscon.edc diff --git a/legacy/elementary/data/themes/edc/systray.edc b/data/elementary/themes/edc/systray.edc similarity index 100% rename from legacy/elementary/data/themes/edc/systray.edc rename to data/elementary/themes/edc/systray.edc diff --git a/legacy/elementary/data/themes/edc/tasks.edc b/data/elementary/themes/edc/tasks.edc similarity index 100% rename from legacy/elementary/data/themes/edc/tasks.edc rename to data/elementary/themes/edc/tasks.edc diff --git a/legacy/elementary/data/themes/edc/temperature.edc b/data/elementary/themes/edc/temperature.edc similarity index 100% rename from legacy/elementary/data/themes/edc/temperature.edc rename to data/elementary/themes/edc/temperature.edc diff --git a/legacy/elementary/data/themes/edc/textblock.edc b/data/elementary/themes/edc/textblock.edc similarity index 100% rename from legacy/elementary/data/themes/edc/textblock.edc rename to data/elementary/themes/edc/textblock.edc diff --git a/legacy/elementary/data/themes/edc/time.edc b/data/elementary/themes/edc/time.edc similarity index 100% rename from legacy/elementary/data/themes/edc/time.edc rename to data/elementary/themes/edc/time.edc diff --git a/legacy/elementary/data/themes/edc/toolbar.edc b/data/elementary/themes/edc/toolbar.edc similarity index 100% rename from legacy/elementary/data/themes/edc/toolbar.edc rename to data/elementary/themes/edc/toolbar.edc diff --git a/legacy/elementary/data/themes/edc/transitions.edc b/data/elementary/themes/edc/transitions.edc similarity index 100% rename from legacy/elementary/data/themes/edc/transitions.edc rename to data/elementary/themes/edc/transitions.edc diff --git a/legacy/elementary/data/themes/edc/wallpaper.edc b/data/elementary/themes/edc/wallpaper.edc similarity index 100% rename from legacy/elementary/data/themes/edc/wallpaper.edc rename to data/elementary/themes/edc/wallpaper.edc diff --git a/legacy/elementary/data/themes/edc/winlist.edc b/data/elementary/themes/edc/winlist.edc similarity index 100% rename from legacy/elementary/data/themes/edc/winlist.edc rename to data/elementary/themes/edc/winlist.edc diff --git a/legacy/elementary/data/themes/edc/wireless.edc b/data/elementary/themes/edc/wireless.edc similarity index 100% rename from legacy/elementary/data/themes/edc/wireless.edc rename to data/elementary/themes/edc/wireless.edc diff --git a/legacy/elementary/data/themes/edc/wizard.edc b/data/elementary/themes/edc/wizard.edc similarity index 100% rename from legacy/elementary/data/themes/edc/wizard.edc rename to data/elementary/themes/edc/wizard.edc diff --git a/legacy/elementary/data/themes/edc/xkbswitch.edc b/data/elementary/themes/edc/xkbswitch.edc similarity index 100% rename from legacy/elementary/data/themes/edc/xkbswitch.edc rename to data/elementary/themes/edc/xkbswitch.edc diff --git a/legacy/elementary/data/themes/fonts.edc b/data/elementary/themes/fonts.edc similarity index 100% rename from legacy/elementary/data/themes/fonts.edc rename to data/elementary/themes/fonts.edc diff --git a/legacy/elementary/data/themes/img/O/about_bot.png b/data/elementary/themes/img/O/about_bot.png similarity index 100% rename from legacy/elementary/data/themes/img/O/about_bot.png rename to data/elementary/themes/img/O/about_bot.png diff --git a/legacy/elementary/data/themes/img/O/about_mid.png b/data/elementary/themes/img/O/about_mid.png similarity index 100% rename from legacy/elementary/data/themes/img/O/about_mid.png rename to data/elementary/themes/img/O/about_mid.png diff --git a/legacy/elementary/data/themes/img/O/about_top.png b/data/elementary/themes/img/O/about_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/about_top.png rename to data/elementary/themes/img/O/about_top.png diff --git a/legacy/elementary/data/themes/img/O/arrow_down.png b/data/elementary/themes/img/O/arrow_down.png similarity index 100% rename from legacy/elementary/data/themes/img/O/arrow_down.png rename to data/elementary/themes/img/O/arrow_down.png diff --git a/legacy/elementary/data/themes/img/O/arrow_up.png b/data/elementary/themes/img/O/arrow_up.png similarity index 100% rename from legacy/elementary/data/themes/img/O/arrow_up.png rename to data/elementary/themes/img/O/arrow_up.png diff --git a/legacy/elementary/data/themes/img/O/batt_base.png b/data/elementary/themes/img/O/batt_base.png similarity index 100% rename from legacy/elementary/data/themes/img/O/batt_base.png rename to data/elementary/themes/img/O/batt_base.png diff --git a/legacy/elementary/data/themes/img/O/batt_level.png b/data/elementary/themes/img/O/batt_level.png similarity index 100% rename from legacy/elementary/data/themes/img/O/batt_level.png rename to data/elementary/themes/img/O/batt_level.png diff --git a/legacy/elementary/data/themes/img/O/batt_over.png b/data/elementary/themes/img/O/batt_over.png similarity index 100% rename from legacy/elementary/data/themes/img/O/batt_over.png rename to data/elementary/themes/img/O/batt_over.png diff --git a/legacy/elementary/data/themes/img/O/batt_power.png b/data/elementary/themes/img/O/batt_power.png similarity index 100% rename from legacy/elementary/data/themes/img/O/batt_power.png rename to data/elementary/themes/img/O/batt_power.png diff --git a/legacy/elementary/data/themes/img/O/bg_shadow.png b/data/elementary/themes/img/O/bg_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bg_shadow.png rename to data/elementary/themes/img/O/bg_shadow.png diff --git a/legacy/elementary/data/themes/img/O/big_arrow_up.png b/data/elementary/themes/img/O/big_arrow_up.png similarity index 100% rename from legacy/elementary/data/themes/img/O/big_arrow_up.png rename to data/elementary/themes/img/O/big_arrow_up.png diff --git a/legacy/elementary/data/themes/img/O/bnw.png b/data/elementary/themes/img/O/bnw.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bnw.png rename to data/elementary/themes/img/O/bnw.png diff --git a/legacy/elementary/data/themes/img/O/bt_base1.png b/data/elementary/themes/img/O/bt_base1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_base1.png rename to data/elementary/themes/img/O/bt_base1.png diff --git a/legacy/elementary/data/themes/img/O/bt_base2.png b/data/elementary/themes/img/O/bt_base2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_base2.png rename to data/elementary/themes/img/O/bt_base2.png diff --git a/legacy/elementary/data/themes/img/O/bt_dis_base.png b/data/elementary/themes/img/O/bt_dis_base.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_dis_base.png rename to data/elementary/themes/img/O/bt_dis_base.png diff --git a/legacy/elementary/data/themes/img/O/bt_dis_hilight.png b/data/elementary/themes/img/O/bt_dis_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_dis_hilight.png rename to data/elementary/themes/img/O/bt_dis_hilight.png diff --git a/legacy/elementary/data/themes/img/O/bt_dis_shine.png b/data/elementary/themes/img/O/bt_dis_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_dis_shine.png rename to data/elementary/themes/img/O/bt_dis_shine.png diff --git a/legacy/elementary/data/themes/img/O/bt_glow.png b/data/elementary/themes/img/O/bt_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_glow.png rename to data/elementary/themes/img/O/bt_glow.png diff --git a/legacy/elementary/data/themes/img/O/bt_hilight.png b/data/elementary/themes/img/O/bt_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_hilight.png rename to data/elementary/themes/img/O/bt_hilight.png diff --git a/legacy/elementary/data/themes/img/O/bt_shine.png b/data/elementary/themes/img/O/bt_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_shine.png rename to data/elementary/themes/img/O/bt_shine.png diff --git a/legacy/elementary/data/themes/img/O/bt_sm_base1.png b/data/elementary/themes/img/O/bt_sm_base1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_sm_base1.png rename to data/elementary/themes/img/O/bt_sm_base1.png diff --git a/legacy/elementary/data/themes/img/O/bt_sm_base2.png b/data/elementary/themes/img/O/bt_sm_base2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_sm_base2.png rename to data/elementary/themes/img/O/bt_sm_base2.png diff --git a/legacy/elementary/data/themes/img/O/bt_sm_hilight.png b/data/elementary/themes/img/O/bt_sm_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_sm_hilight.png rename to data/elementary/themes/img/O/bt_sm_hilight.png diff --git a/legacy/elementary/data/themes/img/O/bt_sm_shine.png b/data/elementary/themes/img/O/bt_sm_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bt_sm_shine.png rename to data/elementary/themes/img/O/bt_sm_shine.png diff --git a/legacy/elementary/data/themes/img/O/bulb-0.png b/data/elementary/themes/img/O/bulb-0.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bulb-0.png rename to data/elementary/themes/img/O/bulb-0.png diff --git a/legacy/elementary/data/themes/img/O/bulb-1.png b/data/elementary/themes/img/O/bulb-1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bulb-1.png rename to data/elementary/themes/img/O/bulb-1.png diff --git a/legacy/elementary/data/themes/img/O/bulb-2.png b/data/elementary/themes/img/O/bulb-2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/bulb-2.png rename to data/elementary/themes/img/O/bulb-2.png diff --git a/legacy/elementary/data/themes/img/O/busy-1.png b/data/elementary/themes/img/O/busy-1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-1.png rename to data/elementary/themes/img/O/busy-1.png diff --git a/legacy/elementary/data/themes/img/O/busy-2.png b/data/elementary/themes/img/O/busy-2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-2.png rename to data/elementary/themes/img/O/busy-2.png diff --git a/legacy/elementary/data/themes/img/O/busy-3.png b/data/elementary/themes/img/O/busy-3.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-3.png rename to data/elementary/themes/img/O/busy-3.png diff --git a/legacy/elementary/data/themes/img/O/busy-4.png b/data/elementary/themes/img/O/busy-4.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-4.png rename to data/elementary/themes/img/O/busy-4.png diff --git a/legacy/elementary/data/themes/img/O/busy-5.png b/data/elementary/themes/img/O/busy-5.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-5.png rename to data/elementary/themes/img/O/busy-5.png diff --git a/legacy/elementary/data/themes/img/O/busy-6.png b/data/elementary/themes/img/O/busy-6.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-6.png rename to data/elementary/themes/img/O/busy-6.png diff --git a/legacy/elementary/data/themes/img/O/busy-7.png b/data/elementary/themes/img/O/busy-7.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-7.png rename to data/elementary/themes/img/O/busy-7.png diff --git a/legacy/elementary/data/themes/img/O/busy-8.png b/data/elementary/themes/img/O/busy-8.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-8.png rename to data/elementary/themes/img/O/busy-8.png diff --git a/legacy/elementary/data/themes/img/O/busy-9.png b/data/elementary/themes/img/O/busy-9.png similarity index 100% rename from legacy/elementary/data/themes/img/O/busy-9.png rename to data/elementary/themes/img/O/busy-9.png diff --git a/legacy/elementary/data/themes/img/O/dia_botshad.png b/data/elementary/themes/img/O/dia_botshad.png similarity index 100% rename from legacy/elementary/data/themes/img/O/dia_botshad.png rename to data/elementary/themes/img/O/dia_botshad.png diff --git a/legacy/elementary/data/themes/img/O/dia_grad.png b/data/elementary/themes/img/O/dia_grad.png similarity index 100% rename from legacy/elementary/data/themes/img/O/dia_grad.png rename to data/elementary/themes/img/O/dia_grad.png diff --git a/legacy/elementary/data/themes/img/O/digit_0.png b/data/elementary/themes/img/O/digit_0.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_0.png rename to data/elementary/themes/img/O/digit_0.png diff --git a/legacy/elementary/data/themes/img/O/digit_1.png b/data/elementary/themes/img/O/digit_1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_1.png rename to data/elementary/themes/img/O/digit_1.png diff --git a/legacy/elementary/data/themes/img/O/digit_2.png b/data/elementary/themes/img/O/digit_2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_2.png rename to data/elementary/themes/img/O/digit_2.png diff --git a/legacy/elementary/data/themes/img/O/digit_3.png b/data/elementary/themes/img/O/digit_3.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_3.png rename to data/elementary/themes/img/O/digit_3.png diff --git a/legacy/elementary/data/themes/img/O/digit_4.png b/data/elementary/themes/img/O/digit_4.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_4.png rename to data/elementary/themes/img/O/digit_4.png diff --git a/legacy/elementary/data/themes/img/O/digit_5.png b/data/elementary/themes/img/O/digit_5.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_5.png rename to data/elementary/themes/img/O/digit_5.png diff --git a/legacy/elementary/data/themes/img/O/digit_6.png b/data/elementary/themes/img/O/digit_6.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_6.png rename to data/elementary/themes/img/O/digit_6.png diff --git a/legacy/elementary/data/themes/img/O/digit_7.png b/data/elementary/themes/img/O/digit_7.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_7.png rename to data/elementary/themes/img/O/digit_7.png diff --git a/legacy/elementary/data/themes/img/O/digit_8.png b/data/elementary/themes/img/O/digit_8.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_8.png rename to data/elementary/themes/img/O/digit_8.png diff --git a/legacy/elementary/data/themes/img/O/digit_9.png b/data/elementary/themes/img/O/digit_9.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_9.png rename to data/elementary/themes/img/O/digit_9.png diff --git a/legacy/elementary/data/themes/img/O/digit_am.png b/data/elementary/themes/img/O/digit_am.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_am.png rename to data/elementary/themes/img/O/digit_am.png diff --git a/legacy/elementary/data/themes/img/O/digit_na.png b/data/elementary/themes/img/O/digit_na.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_na.png rename to data/elementary/themes/img/O/digit_na.png diff --git a/legacy/elementary/data/themes/img/O/digit_nm.png b/data/elementary/themes/img/O/digit_nm.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_nm.png rename to data/elementary/themes/img/O/digit_nm.png diff --git a/legacy/elementary/data/themes/img/O/digit_pm.png b/data/elementary/themes/img/O/digit_pm.png similarity index 100% rename from legacy/elementary/data/themes/img/O/digit_pm.png rename to data/elementary/themes/img/O/digit_pm.png diff --git a/legacy/elementary/data/themes/img/O/e17_mini_button_shadow2.png b/data/elementary/themes/img/O/e17_mini_button_shadow2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/e17_mini_button_shadow2.png rename to data/elementary/themes/img/O/e17_mini_button_shadow2.png diff --git a/legacy/elementary/data/themes/img/O/everything_box.png b/data/elementary/themes/img/O/everything_box.png similarity index 100% rename from legacy/elementary/data/themes/img/O/everything_box.png rename to data/elementary/themes/img/O/everything_box.png diff --git a/legacy/elementary/data/themes/img/O/everything_item_bg.png b/data/elementary/themes/img/O/everything_item_bg.png similarity index 100% rename from legacy/elementary/data/themes/img/O/everything_item_bg.png rename to data/elementary/themes/img/O/everything_item_bg.png diff --git a/legacy/elementary/data/themes/img/O/exq-bglight.png b/data/elementary/themes/img/O/exq-bglight.png similarity index 100% rename from legacy/elementary/data/themes/img/O/exq-bglight.png rename to data/elementary/themes/img/O/exq-bglight.png diff --git a/legacy/elementary/data/themes/img/O/exq-dot-glow.png b/data/elementary/themes/img/O/exq-dot-glow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/exq-dot-glow.png rename to data/elementary/themes/img/O/exq-dot-glow.png diff --git a/legacy/elementary/data/themes/img/O/exq-dot.png b/data/elementary/themes/img/O/exq-dot.png similarity index 100% rename from legacy/elementary/data/themes/img/O/exq-dot.png rename to data/elementary/themes/img/O/exq-dot.png diff --git a/legacy/elementary/data/themes/img/O/exq-logo.png b/data/elementary/themes/img/O/exq-logo.png similarity index 100% rename from legacy/elementary/data/themes/img/O/exq-logo.png rename to data/elementary/themes/img/O/exq-logo.png diff --git a/legacy/elementary/data/themes/img/O/exq-vgrad.png b/data/elementary/themes/img/O/exq-vgrad.png similarity index 100% rename from legacy/elementary/data/themes/img/O/exq-vgrad.png rename to data/elementary/themes/img/O/exq-vgrad.png diff --git a/legacy/elementary/data/themes/img/O/gadman_border.png b/data/elementary/themes/img/O/gadman_border.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_border.png rename to data/elementary/themes/img/O/gadman_border.png diff --git a/legacy/elementary/data/themes/img/O/gadman_bottom.png b/data/elementary/themes/img/O/gadman_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_bottom.png rename to data/elementary/themes/img/O/gadman_bottom.png diff --git a/legacy/elementary/data/themes/img/O/gadman_frame.png b/data/elementary/themes/img/O/gadman_frame.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_frame.png rename to data/elementary/themes/img/O/gadman_frame.png diff --git a/legacy/elementary/data/themes/img/O/gadman_left.png b/data/elementary/themes/img/O/gadman_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_left.png rename to data/elementary/themes/img/O/gadman_left.png diff --git a/legacy/elementary/data/themes/img/O/gadman_right.png b/data/elementary/themes/img/O/gadman_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_right.png rename to data/elementary/themes/img/O/gadman_right.png diff --git a/legacy/elementary/data/themes/img/O/gadman_top.png b/data/elementary/themes/img/O/gadman_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/gadman_top.png rename to data/elementary/themes/img/O/gadman_top.png diff --git a/legacy/elementary/data/themes/img/O/glow.png b/data/elementary/themes/img/O/glow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/glow.png rename to data/elementary/themes/img/O/glow.png diff --git a/legacy/elementary/data/themes/img/O/icon_active.png b/data/elementary/themes/img/O/icon_active.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_active.png rename to data/elementary/themes/img/O/icon_active.png diff --git a/legacy/elementary/data/themes/img/O/icon_add.png b/data/elementary/themes/img/O/icon_add.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_add.png rename to data/elementary/themes/img/O/icon_add.png diff --git a/legacy/elementary/data/themes/img/O/icon_add_fav.png b/data/elementary/themes/img/O/icon_add_fav.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_add_fav.png rename to data/elementary/themes/img/O/icon_add_fav.png diff --git a/legacy/elementary/data/themes/img/O/icon_advanced.png b/data/elementary/themes/img/O/icon_advanced.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_advanced.png rename to data/elementary/themes/img/O/icon_advanced.png diff --git a/legacy/elementary/data/themes/img/O/icon_applications.png b/data/elementary/themes/img/O/icon_applications.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_applications.png rename to data/elementary/themes/img/O/icon_applications.png diff --git a/legacy/elementary/data/themes/img/O/icon_applications_ibar.png b/data/elementary/themes/img/O/icon_applications_ibar.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_applications_ibar.png rename to data/elementary/themes/img/O/icon_applications_ibar.png diff --git a/legacy/elementary/data/themes/img/O/icon_applications_new.png b/data/elementary/themes/img/O/icon_applications_new.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_applications_new.png rename to data/elementary/themes/img/O/icon_applications_new.png diff --git a/legacy/elementary/data/themes/img/O/icon_applications_restart.png b/data/elementary/themes/img/O/icon_applications_restart.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_applications_restart.png rename to data/elementary/themes/img/O/icon_applications_restart.png diff --git a/legacy/elementary/data/themes/img/O/icon_applications_startup.png b/data/elementary/themes/img/O/icon_applications_startup.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_applications_startup.png rename to data/elementary/themes/img/O/icon_applications_startup.png diff --git a/legacy/elementary/data/themes/img/O/icon_autoscroll.png b/data/elementary/themes/img/O/icon_autoscroll.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_autoscroll.png rename to data/elementary/themes/img/O/icon_autoscroll.png diff --git a/legacy/elementary/data/themes/img/O/icon_behavior.png b/data/elementary/themes/img/O/icon_behavior.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_behavior.png rename to data/elementary/themes/img/O/icon_behavior.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_border.png b/data/elementary/themes/img/O/icon_border_border.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_border.png rename to data/elementary/themes/img/O/icon_border_border.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_close.png b/data/elementary/themes/img/O/icon_border_close.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_close.png rename to data/elementary/themes/img/O/icon_border_close.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_kill.png b/data/elementary/themes/img/O/icon_border_kill.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_kill.png rename to data/elementary/themes/img/O/icon_border_kill.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_lock.png b/data/elementary/themes/img/O/icon_border_lock.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_lock.png rename to data/elementary/themes/img/O/icon_border_lock.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_maximize.png b/data/elementary/themes/img/O/icon_border_maximize.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_maximize.png rename to data/elementary/themes/img/O/icon_border_maximize.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_minimize.png b/data/elementary/themes/img/O/icon_border_minimize.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_minimize.png rename to data/elementary/themes/img/O/icon_border_minimize.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_more.png b/data/elementary/themes/img/O/icon_border_more.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_more.png rename to data/elementary/themes/img/O/icon_border_more.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_pager.png b/data/elementary/themes/img/O/icon_border_pager.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_pager.png rename to data/elementary/themes/img/O/icon_border_pager.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_pin.png b/data/elementary/themes/img/O/icon_border_pin.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_pin.png rename to data/elementary/themes/img/O/icon_border_pin.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_properties.png b/data/elementary/themes/img/O/icon_border_properties.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_properties.png rename to data/elementary/themes/img/O/icon_border_properties.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_remember.png b/data/elementary/themes/img/O/icon_border_remember.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_remember.png rename to data/elementary/themes/img/O/icon_border_remember.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_sendto.png b/data/elementary/themes/img/O/icon_border_sendto.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_sendto.png rename to data/elementary/themes/img/O/icon_border_sendto.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_shaded.png b/data/elementary/themes/img/O/icon_border_shaded.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_shaded.png rename to data/elementary/themes/img/O/icon_border_shaded.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_skip.png b/data/elementary/themes/img/O/icon_border_skip.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_skip.png rename to data/elementary/themes/img/O/icon_border_skip.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_stack_bot.png b/data/elementary/themes/img/O/icon_border_stack_bot.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_stack_bot.png rename to data/elementary/themes/img/O/icon_border_stack_bot.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_stack_norm.png b/data/elementary/themes/img/O/icon_border_stack_norm.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_stack_norm.png rename to data/elementary/themes/img/O/icon_border_stack_norm.png diff --git a/legacy/elementary/data/themes/img/O/icon_border_stack_top.png b/data/elementary/themes/img/O/icon_border_stack_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_border_stack_top.png rename to data/elementary/themes/img/O/icon_border_stack_top.png diff --git a/legacy/elementary/data/themes/img/O/icon_check.png b/data/elementary/themes/img/O/icon_check.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_check.png rename to data/elementary/themes/img/O/icon_check.png diff --git a/legacy/elementary/data/themes/img/O/icon_close.png b/data/elementary/themes/img/O/icon_close.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_close.png rename to data/elementary/themes/img/O/icon_close.png diff --git a/legacy/elementary/data/themes/img/O/icon_colors.png b/data/elementary/themes/img/O/icon_colors.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_colors.png rename to data/elementary/themes/img/O/icon_colors.png diff --git a/legacy/elementary/data/themes/img/O/icon_config.png b/data/elementary/themes/img/O/icon_config.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_config.png rename to data/elementary/themes/img/O/icon_config.png diff --git a/legacy/elementary/data/themes/img/O/icon_configuration.png b/data/elementary/themes/img/O/icon_configuration.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_configuration.png rename to data/elementary/themes/img/O/icon_configuration.png diff --git a/legacy/elementary/data/themes/img/O/icon_del.png b/data/elementary/themes/img/O/icon_del.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_del.png rename to data/elementary/themes/img/O/icon_del.png diff --git a/legacy/elementary/data/themes/img/O/icon_desklock.png b/data/elementary/themes/img/O/icon_desklock.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_desklock.png rename to data/elementary/themes/img/O/icon_desklock.png diff --git a/legacy/elementary/data/themes/img/O/icon_desklock_menu.png b/data/elementary/themes/img/O/icon_desklock_menu.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_desklock_menu.png rename to data/elementary/themes/img/O/icon_desklock_menu.png diff --git a/legacy/elementary/data/themes/img/O/icon_desktops.png b/data/elementary/themes/img/O/icon_desktops.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_desktops.png rename to data/elementary/themes/img/O/icon_desktops.png diff --git a/legacy/elementary/data/themes/img/O/icon_directories.png b/data/elementary/themes/img/O/icon_directories.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_directories.png rename to data/elementary/themes/img/O/icon_directories.png diff --git a/legacy/elementary/data/themes/img/O/icon_down_arrow.png b/data/elementary/themes/img/O/icon_down_arrow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_down_arrow.png rename to data/elementary/themes/img/O/icon_down_arrow.png diff --git a/legacy/elementary/data/themes/img/O/icon_dummy.png b/data/elementary/themes/img/O/icon_dummy.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_dummy.png rename to data/elementary/themes/img/O/icon_dummy.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_arrange.png b/data/elementary/themes/img/O/icon_efm_arrange.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_arrange.png rename to data/elementary/themes/img/O/icon_efm_arrange.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_arrange_name.png b/data/elementary/themes/img/O/icon_efm_arrange_name.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_arrange_name.png rename to data/elementary/themes/img/O/icon_efm_arrange_name.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_arrange_time.png b/data/elementary/themes/img/O/icon_efm_arrange_time.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_arrange_time.png rename to data/elementary/themes/img/O/icon_efm_arrange_time.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_cd.png b/data/elementary/themes/img/O/icon_efm_cd.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_cd.png rename to data/elementary/themes/img/O/icon_efm_cd.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_copy.png b/data/elementary/themes/img/O/icon_efm_copy.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_copy.png rename to data/elementary/themes/img/O/icon_efm_copy.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_cut.png b/data/elementary/themes/img/O/icon_efm_cut.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_cut.png rename to data/elementary/themes/img/O/icon_efm_cut.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_delete.png b/data/elementary/themes/img/O/icon_efm_delete.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_delete.png rename to data/elementary/themes/img/O/icon_efm_delete.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_desktop.png b/data/elementary/themes/img/O/icon_efm_desktop.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_desktop.png rename to data/elementary/themes/img/O/icon_efm_desktop.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_dnd_ask.png b/data/elementary/themes/img/O/icon_efm_dnd_ask.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_dnd_ask.png rename to data/elementary/themes/img/O/icon_efm_dnd_ask.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_dnd_copy.png b/data/elementary/themes/img/O/icon_efm_dnd_copy.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_dnd_copy.png rename to data/elementary/themes/img/O/icon_efm_dnd_copy.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_dnd_move.png b/data/elementary/themes/img/O/icon_efm_dnd_move.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_dnd_move.png rename to data/elementary/themes/img/O/icon_efm_dnd_move.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_eject.png b/data/elementary/themes/img/O/icon_efm_eject.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_eject.png rename to data/elementary/themes/img/O/icon_efm_eject.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_file.png b/data/elementary/themes/img/O/icon_efm_file.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_file.png rename to data/elementary/themes/img/O/icon_efm_file.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_file_del.png b/data/elementary/themes/img/O/icon_efm_file_del.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_file_del.png rename to data/elementary/themes/img/O/icon_efm_file_del.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_flash.png b/data/elementary/themes/img/O/icon_efm_flash.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_flash.png rename to data/elementary/themes/img/O/icon_efm_flash.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_folder.png b/data/elementary/themes/img/O/icon_efm_folder.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_folder.png rename to data/elementary/themes/img/O/icon_efm_folder.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_hdd.png b/data/elementary/themes/img/O/icon_efm_hdd.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_hdd.png rename to data/elementary/themes/img/O/icon_efm_hdd.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_home.png b/data/elementary/themes/img/O/icon_efm_home.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_home.png rename to data/elementary/themes/img/O/icon_efm_home.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_new.png b/data/elementary/themes/img/O/icon_efm_new.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_new.png rename to data/elementary/themes/img/O/icon_efm_new.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_new_dir.png b/data/elementary/themes/img/O/icon_efm_new_dir.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_new_dir.png rename to data/elementary/themes/img/O/icon_efm_new_dir.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_open.png b/data/elementary/themes/img/O/icon_efm_open.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_open.png rename to data/elementary/themes/img/O/icon_efm_open.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_paste.png b/data/elementary/themes/img/O/icon_efm_paste.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_paste.png rename to data/elementary/themes/img/O/icon_efm_paste.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_properties.png b/data/elementary/themes/img/O/icon_efm_properties.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_properties.png rename to data/elementary/themes/img/O/icon_efm_properties.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_refresh.png b/data/elementary/themes/img/O/icon_efm_refresh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_refresh.png rename to data/elementary/themes/img/O/icon_efm_refresh.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_rename.png b/data/elementary/themes/img/O/icon_efm_rename.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_rename.png rename to data/elementary/themes/img/O/icon_efm_rename.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_root.png b/data/elementary/themes/img/O/icon_efm_root.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_root.png rename to data/elementary/themes/img/O/icon_efm_root.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_select.png b/data/elementary/themes/img/O/icon_efm_select.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_select.png rename to data/elementary/themes/img/O/icon_efm_select.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_sort.png b/data/elementary/themes/img/O/icon_efm_sort.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_sort.png rename to data/elementary/themes/img/O/icon_efm_sort.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_tmp.png b/data/elementary/themes/img/O/icon_efm_tmp.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_tmp.png rename to data/elementary/themes/img/O/icon_efm_tmp.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_usbmedia.png b/data/elementary/themes/img/O/icon_efm_usbmedia.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_usbmedia.png rename to data/elementary/themes/img/O/icon_efm_usbmedia.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_view.png b/data/elementary/themes/img/O/icon_efm_view.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_view.png rename to data/elementary/themes/img/O/icon_efm_view.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_view_details.png b/data/elementary/themes/img/O/icon_efm_view_details.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_view_details.png rename to data/elementary/themes/img/O/icon_efm_view_details.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_view_name.png b/data/elementary/themes/img/O/icon_efm_view_name.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_view_name.png rename to data/elementary/themes/img/O/icon_efm_view_name.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_vol_mounted.png b/data/elementary/themes/img/O/icon_efm_vol_mounted.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_vol_mounted.png rename to data/elementary/themes/img/O/icon_efm_vol_mounted.png diff --git a/legacy/elementary/data/themes/img/O/icon_efm_vol_unmounted.png b/data/elementary/themes/img/O/icon_efm_vol_unmounted.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_efm_vol_unmounted.png rename to data/elementary/themes/img/O/icon_efm_vol_unmounted.png diff --git a/legacy/elementary/data/themes/img/O/icon_engine.png b/data/elementary/themes/img/O/icon_engine.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_engine.png rename to data/elementary/themes/img/O/icon_engine.png diff --git a/legacy/elementary/data/themes/img/O/icon_evry_clipboard.png b/data/elementary/themes/img/O/icon_evry_clipboard.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_evry_clipboard.png rename to data/elementary/themes/img/O/icon_evry_clipboard.png diff --git a/legacy/elementary/data/themes/img/O/icon_extensions.png b/data/elementary/themes/img/O/icon_extensions.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_extensions.png rename to data/elementary/themes/img/O/icon_extensions.png diff --git a/legacy/elementary/data/themes/img/O/icon_favorites.png b/data/elementary/themes/img/O/icon_favorites.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_favorites.png rename to data/elementary/themes/img/O/icon_favorites.png diff --git a/legacy/elementary/data/themes/img/O/icon_file_icons.png b/data/elementary/themes/img/O/icon_file_icons.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_file_icons.png rename to data/elementary/themes/img/O/icon_file_icons.png diff --git a/legacy/elementary/data/themes/img/O/icon_fonts.png b/data/elementary/themes/img/O/icon_fonts.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_fonts.png rename to data/elementary/themes/img/O/icon_fonts.png diff --git a/legacy/elementary/data/themes/img/O/icon_gadget.png b/data/elementary/themes/img/O/icon_gadget.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_gadget.png rename to data/elementary/themes/img/O/icon_gadget.png diff --git a/legacy/elementary/data/themes/img/O/icon_globe.png b/data/elementary/themes/img/O/icon_globe.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_globe.png rename to data/elementary/themes/img/O/icon_globe.png diff --git a/legacy/elementary/data/themes/img/O/icon_gradient.png b/data/elementary/themes/img/O/icon_gradient.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_gradient.png rename to data/elementary/themes/img/O/icon_gradient.png diff --git a/legacy/elementary/data/themes/img/O/icon_halt.png b/data/elementary/themes/img/O/icon_halt.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_halt.png rename to data/elementary/themes/img/O/icon_halt.png diff --git a/legacy/elementary/data/themes/img/O/icon_hibernate.png b/data/elementary/themes/img/O/icon_hibernate.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_hibernate.png rename to data/elementary/themes/img/O/icon_hibernate.png diff --git a/legacy/elementary/data/themes/img/O/icon_icon_theme.png b/data/elementary/themes/img/O/icon_icon_theme.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_icon_theme.png rename to data/elementary/themes/img/O/icon_icon_theme.png diff --git a/legacy/elementary/data/themes/img/O/icon_illume.png b/data/elementary/themes/img/O/icon_illume.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_illume.png rename to data/elementary/themes/img/O/icon_illume.png diff --git a/legacy/elementary/data/themes/img/O/icon_imc.png b/data/elementary/themes/img/O/icon_imc.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_imc.png rename to data/elementary/themes/img/O/icon_imc.png diff --git a/legacy/elementary/data/themes/img/O/icon_interaction.png b/data/elementary/themes/img/O/icon_interaction.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_interaction.png rename to data/elementary/themes/img/O/icon_interaction.png diff --git a/legacy/elementary/data/themes/img/O/icon_intl.png b/data/elementary/themes/img/O/icon_intl.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_intl.png rename to data/elementary/themes/img/O/icon_intl.png diff --git a/legacy/elementary/data/themes/img/O/icon_keyboard.png b/data/elementary/themes/img/O/icon_keyboard.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_keyboard.png rename to data/elementary/themes/img/O/icon_keyboard.png diff --git a/legacy/elementary/data/themes/img/O/icon_keys.png b/data/elementary/themes/img/O/icon_keys.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_keys.png rename to data/elementary/themes/img/O/icon_keys.png diff --git a/legacy/elementary/data/themes/img/O/icon_left_arrow.png b/data/elementary/themes/img/O/icon_left_arrow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_left_arrow.png rename to data/elementary/themes/img/O/icon_left_arrow.png diff --git a/legacy/elementary/data/themes/img/O/icon_logout.png b/data/elementary/themes/img/O/icon_logout.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_logout.png rename to data/elementary/themes/img/O/icon_logout.png diff --git a/legacy/elementary/data/themes/img/O/icon_look.png b/data/elementary/themes/img/O/icon_look.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_look.png rename to data/elementary/themes/img/O/icon_look.png diff --git a/legacy/elementary/data/themes/img/O/icon_lost_windows.png b/data/elementary/themes/img/O/icon_lost_windows.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_lost_windows.png rename to data/elementary/themes/img/O/icon_lost_windows.png diff --git a/legacy/elementary/data/themes/img/O/icon_menu_settings.png b/data/elementary/themes/img/O/icon_menu_settings.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_menu_settings.png rename to data/elementary/themes/img/O/icon_menu_settings.png diff --git a/legacy/elementary/data/themes/img/O/icon_menus.png b/data/elementary/themes/img/O/icon_menus.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_menus.png rename to data/elementary/themes/img/O/icon_menus.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_audio_generic.png b/data/elementary/themes/img/O/icon_mime_audio_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_audio_generic.png rename to data/elementary/themes/img/O/icon_mime_audio_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_bdf.png b/data/elementary/themes/img/O/icon_mime_bdf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_bdf.png rename to data/elementary/themes/img/O/icon_mime_bdf.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_c.png b/data/elementary/themes/img/O/icon_mime_c.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_c.png rename to data/elementary/themes/img/O/icon_mime_c.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_css.png b/data/elementary/themes/img/O/icon_mime_css.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_css.png rename to data/elementary/themes/img/O/icon_mime_css.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_deb.png b/data/elementary/themes/img/O/icon_mime_deb.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_deb.png rename to data/elementary/themes/img/O/icon_mime_deb.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_doc.png b/data/elementary/themes/img/O/icon_mime_doc.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_doc.png rename to data/elementary/themes/img/O/icon_mime_doc.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_executable_generic.png b/data/elementary/themes/img/O/icon_mime_executable_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_executable_generic.png rename to data/elementary/themes/img/O/icon_mime_executable_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_font_generic.png b/data/elementary/themes/img/O/icon_mime_font_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_font_generic.png rename to data/elementary/themes/img/O/icon_mime_font_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_h.png b/data/elementary/themes/img/O/icon_mime_h.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_h.png rename to data/elementary/themes/img/O/icon_mime_h.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_html.png b/data/elementary/themes/img/O/icon_mime_html.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_html.png rename to data/elementary/themes/img/O/icon_mime_html.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_image_generic.png b/data/elementary/themes/img/O/icon_mime_image_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_image_generic.png rename to data/elementary/themes/img/O/icon_mime_image_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_o.png b/data/elementary/themes/img/O/icon_mime_o.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_o.png rename to data/elementary/themes/img/O/icon_mime_o.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_package.png b/data/elementary/themes/img/O/icon_mime_package.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_package.png rename to data/elementary/themes/img/O/icon_mime_package.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_patch.png b/data/elementary/themes/img/O/icon_mime_patch.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_patch.png rename to data/elementary/themes/img/O/icon_mime_patch.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_pcf.png b/data/elementary/themes/img/O/icon_mime_pcf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_pcf.png rename to data/elementary/themes/img/O/icon_mime_pcf.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_pdf.png b/data/elementary/themes/img/O/icon_mime_pdf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_pdf.png rename to data/elementary/themes/img/O/icon_mime_pdf.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_plain.png b/data/elementary/themes/img/O/icon_mime_plain.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_plain.png rename to data/elementary/themes/img/O/icon_mime_plain.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_sh.png b/data/elementary/themes/img/O/icon_mime_sh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_sh.png rename to data/elementary/themes/img/O/icon_mime_sh.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_text_generic.png b/data/elementary/themes/img/O/icon_mime_text_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_text_generic.png rename to data/elementary/themes/img/O/icon_mime_text_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_ttf.png b/data/elementary/themes/img/O/icon_mime_ttf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_ttf.png rename to data/elementary/themes/img/O/icon_mime_ttf.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_video_generic.png b/data/elementary/themes/img/O/icon_mime_video_generic.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_video_generic.png rename to data/elementary/themes/img/O/icon_mime_video_generic.png diff --git a/legacy/elementary/data/themes/img/O/icon_mime_xcf.png b/data/elementary/themes/img/O/icon_mime_xcf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mime_xcf.png rename to data/elementary/themes/img/O/icon_mime_xcf.png diff --git a/legacy/elementary/data/themes/img/O/icon_mixer.png b/data/elementary/themes/img/O/icon_mixer.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mixer.png rename to data/elementary/themes/img/O/icon_mixer.png diff --git a/legacy/elementary/data/themes/img/O/icon_modules.png b/data/elementary/themes/img/O/icon_modules.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_modules.png rename to data/elementary/themes/img/O/icon_modules.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse.png b/data/elementary/themes/img/O/icon_mouse.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse.png rename to data/elementary/themes/img/O/icon_mouse.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_clean.png b/data/elementary/themes/img/O/icon_mouse_clean.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_clean.png rename to data/elementary/themes/img/O/icon_mouse_clean.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_extra.png b/data/elementary/themes/img/O/icon_mouse_extra.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_extra.png rename to data/elementary/themes/img/O/icon_mouse_extra.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_left.png b/data/elementary/themes/img/O/icon_mouse_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_left.png rename to data/elementary/themes/img/O/icon_mouse_left.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_middle.png b/data/elementary/themes/img/O/icon_mouse_middle.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_middle.png rename to data/elementary/themes/img/O/icon_mouse_middle.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_right.png b/data/elementary/themes/img/O/icon_mouse_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_right.png rename to data/elementary/themes/img/O/icon_mouse_right.png diff --git a/legacy/elementary/data/themes/img/O/icon_mouse_wheel.png b/data/elementary/themes/img/O/icon_mouse_wheel.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_mouse_wheel.png rename to data/elementary/themes/img/O/icon_mouse_wheel.png diff --git a/legacy/elementary/data/themes/img/O/icon_new.png b/data/elementary/themes/img/O/icon_new.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_new.png rename to data/elementary/themes/img/O/icon_new.png diff --git a/legacy/elementary/data/themes/img/O/icon_pager.png b/data/elementary/themes/img/O/icon_pager.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_pager.png rename to data/elementary/themes/img/O/icon_pager.png diff --git a/legacy/elementary/data/themes/img/O/icon_performance.png b/data/elementary/themes/img/O/icon_performance.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_performance.png rename to data/elementary/themes/img/O/icon_performance.png diff --git a/legacy/elementary/data/themes/img/O/icon_power_management.png b/data/elementary/themes/img/O/icon_power_management.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_power_management.png rename to data/elementary/themes/img/O/icon_power_management.png diff --git a/legacy/elementary/data/themes/img/O/icon_profiles.png b/data/elementary/themes/img/O/icon_profiles.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_profiles.png rename to data/elementary/themes/img/O/icon_profiles.png diff --git a/legacy/elementary/data/themes/img/O/icon_reboot.png b/data/elementary/themes/img/O/icon_reboot.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_reboot.png rename to data/elementary/themes/img/O/icon_reboot.png diff --git a/legacy/elementary/data/themes/img/O/icon_reset.png b/data/elementary/themes/img/O/icon_reset.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_reset.png rename to data/elementary/themes/img/O/icon_reset.png diff --git a/legacy/elementary/data/themes/img/O/icon_resize.png b/data/elementary/themes/img/O/icon_resize.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_resize.png rename to data/elementary/themes/img/O/icon_resize.png diff --git a/legacy/elementary/data/themes/img/O/icon_right_arrow.png b/data/elementary/themes/img/O/icon_right_arrow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_right_arrow.png rename to data/elementary/themes/img/O/icon_right_arrow.png diff --git a/legacy/elementary/data/themes/img/O/icon_run.png b/data/elementary/themes/img/O/icon_run.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_run.png rename to data/elementary/themes/img/O/icon_run.png diff --git a/legacy/elementary/data/themes/img/O/icon_scale.png b/data/elementary/themes/img/O/icon_scale.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_scale.png rename to data/elementary/themes/img/O/icon_scale.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_around.png b/data/elementary/themes/img/O/icon_screen_around.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_around.png rename to data/elementary/themes/img/O/icon_screen_around.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_hflip.png b/data/elementary/themes/img/O/icon_screen_hflip.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_hflip.png rename to data/elementary/themes/img/O/icon_screen_hflip.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_left.png b/data/elementary/themes/img/O/icon_screen_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_left.png rename to data/elementary/themes/img/O/icon_screen_left.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_normal.png b/data/elementary/themes/img/O/icon_screen_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_normal.png rename to data/elementary/themes/img/O/icon_screen_normal.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_resolution.png b/data/elementary/themes/img/O/icon_screen_resolution.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_resolution.png rename to data/elementary/themes/img/O/icon_screen_resolution.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_right.png b/data/elementary/themes/img/O/icon_screen_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_right.png rename to data/elementary/themes/img/O/icon_screen_right.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_setup.png b/data/elementary/themes/img/O/icon_screen_setup.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_setup.png rename to data/elementary/themes/img/O/icon_screen_setup.png diff --git a/legacy/elementary/data/themes/img/O/icon_screen_vflip.png b/data/elementary/themes/img/O/icon_screen_vflip.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screen_vflip.png rename to data/elementary/themes/img/O/icon_screen_vflip.png diff --git a/legacy/elementary/data/themes/img/O/icon_screensaver.png b/data/elementary/themes/img/O/icon_screensaver.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screensaver.png rename to data/elementary/themes/img/O/icon_screensaver.png diff --git a/legacy/elementary/data/themes/img/O/icon_screenshot.png b/data/elementary/themes/img/O/icon_screenshot.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_screenshot.png rename to data/elementary/themes/img/O/icon_screenshot.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf.png b/data/elementary/themes/img/O/icon_shelf.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf.png rename to data/elementary/themes/img/O/icon_shelf.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_bottom.png b/data/elementary/themes/img/O/icon_shelf_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_bottom.png rename to data/elementary/themes/img/O/icon_shelf_bottom.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_bottom_desk.png b/data/elementary/themes/img/O/icon_shelf_bottom_desk.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_bottom_desk.png rename to data/elementary/themes/img/O/icon_shelf_bottom_desk.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_bottom_left.png b/data/elementary/themes/img/O/icon_shelf_bottom_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_bottom_left.png rename to data/elementary/themes/img/O/icon_shelf_bottom_left.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_bottom_right.png b/data/elementary/themes/img/O/icon_shelf_bottom_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_bottom_right.png rename to data/elementary/themes/img/O/icon_shelf_bottom_right.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_custom.png b/data/elementary/themes/img/O/icon_shelf_custom.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_custom.png rename to data/elementary/themes/img/O/icon_shelf_custom.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_dock.png b/data/elementary/themes/img/O/icon_shelf_dock.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_dock.png rename to data/elementary/themes/img/O/icon_shelf_dock.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_left.png b/data/elementary/themes/img/O/icon_shelf_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_left.png rename to data/elementary/themes/img/O/icon_shelf_left.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_left_bottom.png b/data/elementary/themes/img/O/icon_shelf_left_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_left_bottom.png rename to data/elementary/themes/img/O/icon_shelf_left_bottom.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_left_top.png b/data/elementary/themes/img/O/icon_shelf_left_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_left_top.png rename to data/elementary/themes/img/O/icon_shelf_left_top.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_menu_bar.png b/data/elementary/themes/img/O/icon_shelf_menu_bar.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_menu_bar.png rename to data/elementary/themes/img/O/icon_shelf_menu_bar.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_panel.png b/data/elementary/themes/img/O/icon_shelf_panel.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_panel.png rename to data/elementary/themes/img/O/icon_shelf_panel.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_right.png b/data/elementary/themes/img/O/icon_shelf_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_right.png rename to data/elementary/themes/img/O/icon_shelf_right.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_right_bottom.png b/data/elementary/themes/img/O/icon_shelf_right_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_right_bottom.png rename to data/elementary/themes/img/O/icon_shelf_right_bottom.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_right_top.png b/data/elementary/themes/img/O/icon_shelf_right_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_right_top.png rename to data/elementary/themes/img/O/icon_shelf_right_top.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_top.png b/data/elementary/themes/img/O/icon_shelf_top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_top.png rename to data/elementary/themes/img/O/icon_shelf_top.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_top_desk.png b/data/elementary/themes/img/O/icon_shelf_top_desk.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_top_desk.png rename to data/elementary/themes/img/O/icon_shelf_top_desk.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_top_left.png b/data/elementary/themes/img/O/icon_shelf_top_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_top_left.png rename to data/elementary/themes/img/O/icon_shelf_top_left.png diff --git a/legacy/elementary/data/themes/img/O/icon_shelf_top_right.png b/data/elementary/themes/img/O/icon_shelf_top_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_shelf_top_right.png rename to data/elementary/themes/img/O/icon_shelf_top_right.png diff --git a/legacy/elementary/data/themes/img/O/icon_startup.png b/data/elementary/themes/img/O/icon_startup.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_startup.png rename to data/elementary/themes/img/O/icon_startup.png diff --git a/legacy/elementary/data/themes/img/O/icon_suspend.png b/data/elementary/themes/img/O/icon_suspend.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_suspend.png rename to data/elementary/themes/img/O/icon_suspend.png diff --git a/legacy/elementary/data/themes/img/O/icon_swap.png b/data/elementary/themes/img/O/icon_swap.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_swap.png rename to data/elementary/themes/img/O/icon_swap.png diff --git a/legacy/elementary/data/themes/img/O/icon_system.png b/data/elementary/themes/img/O/icon_system.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_system.png rename to data/elementary/themes/img/O/icon_system.png diff --git a/legacy/elementary/data/themes/img/O/icon_theme.png b/data/elementary/themes/img/O/icon_theme.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_theme.png rename to data/elementary/themes/img/O/icon_theme.png diff --git a/legacy/elementary/data/themes/img/O/icon_toolbar.png b/data/elementary/themes/img/O/icon_toolbar.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_toolbar.png rename to data/elementary/themes/img/O/icon_toolbar.png diff --git a/legacy/elementary/data/themes/img/O/icon_transitions.png b/data/elementary/themes/img/O/icon_transitions.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_transitions.png rename to data/elementary/themes/img/O/icon_transitions.png diff --git a/legacy/elementary/data/themes/img/O/icon_up_arrow.png b/data/elementary/themes/img/O/icon_up_arrow.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_up_arrow.png rename to data/elementary/themes/img/O/icon_up_arrow.png diff --git a/legacy/elementary/data/themes/img/O/icon_wallpaper.png b/data/elementary/themes/img/O/icon_wallpaper.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_wallpaper.png rename to data/elementary/themes/img/O/icon_wallpaper.png diff --git a/legacy/elementary/data/themes/img/O/icon_wallpaper_center.png b/data/elementary/themes/img/O/icon_wallpaper_center.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_wallpaper_center.png rename to data/elementary/themes/img/O/icon_wallpaper_center.png diff --git a/legacy/elementary/data/themes/img/O/icon_wallpaper_center_flat.png b/data/elementary/themes/img/O/icon_wallpaper_center_flat.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_wallpaper_center_flat.png rename to data/elementary/themes/img/O/icon_wallpaper_center_flat.png diff --git a/legacy/elementary/data/themes/img/O/icon_wallpaper_grad_screen.png b/data/elementary/themes/img/O/icon_wallpaper_grad_screen.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_wallpaper_grad_screen.png rename to data/elementary/themes/img/O/icon_wallpaper_grad_screen.png diff --git a/legacy/elementary/data/themes/img/O/icon_wallpaper_screen.png b/data/elementary/themes/img/O/icon_wallpaper_screen.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_wallpaper_screen.png rename to data/elementary/themes/img/O/icon_wallpaper_screen.png diff --git a/legacy/elementary/data/themes/img/O/icon_warning.png b/data/elementary/themes/img/O/icon_warning.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_warning.png rename to data/elementary/themes/img/O/icon_warning.png diff --git a/legacy/elementary/data/themes/img/O/icon_win_move.png b/data/elementary/themes/img/O/icon_win_move.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_win_move.png rename to data/elementary/themes/img/O/icon_win_move.png diff --git a/legacy/elementary/data/themes/img/O/icon_win_resize.png b/data/elementary/themes/img/O/icon_win_resize.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_win_resize.png rename to data/elementary/themes/img/O/icon_win_resize.png diff --git a/legacy/elementary/data/themes/img/O/icon_window_focus.png b/data/elementary/themes/img/O/icon_window_focus.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_window_focus.png rename to data/elementary/themes/img/O/icon_window_focus.png diff --git a/legacy/elementary/data/themes/img/O/icon_window_geometry.png b/data/elementary/themes/img/O/icon_window_geometry.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_window_geometry.png rename to data/elementary/themes/img/O/icon_window_geometry.png diff --git a/legacy/elementary/data/themes/img/O/icon_window_manipulation.png b/data/elementary/themes/img/O/icon_window_manipulation.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_window_manipulation.png rename to data/elementary/themes/img/O/icon_window_manipulation.png diff --git a/legacy/elementary/data/themes/img/O/icon_window_process_management.png b/data/elementary/themes/img/O/icon_window_process_management.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_window_process_management.png rename to data/elementary/themes/img/O/icon_window_process_management.png diff --git a/legacy/elementary/data/themes/img/O/icon_window_remembers.png b/data/elementary/themes/img/O/icon_window_remembers.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_window_remembers.png rename to data/elementary/themes/img/O/icon_window_remembers.png diff --git a/legacy/elementary/data/themes/img/O/icon_windows.png b/data/elementary/themes/img/O/icon_windows.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_windows.png rename to data/elementary/themes/img/O/icon_windows.png diff --git a/legacy/elementary/data/themes/img/O/icon_winlist.png b/data/elementary/themes/img/O/icon_winlist.png similarity index 100% rename from legacy/elementary/data/themes/img/O/icon_winlist.png rename to data/elementary/themes/img/O/icon_winlist.png diff --git a/legacy/elementary/data/themes/img/O/illume-home.png b/data/elementary/themes/img/O/illume-home.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-home.png rename to data/elementary/themes/img/O/illume-home.png diff --git a/legacy/elementary/data/themes/img/O/illume-kbd-on.png b/data/elementary/themes/img/O/illume-kbd-on.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-kbd-on.png rename to data/elementary/themes/img/O/illume-kbd-on.png diff --git a/legacy/elementary/data/themes/img/O/illume-kbd.png b/data/elementary/themes/img/O/illume-kbd.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-kbd.png rename to data/elementary/themes/img/O/illume-kbd.png diff --git a/legacy/elementary/data/themes/img/O/illume-mode-dual-left.png b/data/elementary/themes/img/O/illume-mode-dual-left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-mode-dual-left.png rename to data/elementary/themes/img/O/illume-mode-dual-left.png diff --git a/legacy/elementary/data/themes/img/O/illume-mode-dual-top.png b/data/elementary/themes/img/O/illume-mode-dual-top.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-mode-dual-top.png rename to data/elementary/themes/img/O/illume-mode-dual-top.png diff --git a/legacy/elementary/data/themes/img/O/illume-mode-single.png b/data/elementary/themes/img/O/illume-mode-single.png similarity index 100% rename from legacy/elementary/data/themes/img/O/illume-mode-single.png rename to data/elementary/themes/img/O/illume-mode-single.png diff --git a/legacy/elementary/data/themes/img/O/inset_raised.png b/data/elementary/themes/img/O/inset_raised.png similarity index 100% rename from legacy/elementary/data/themes/img/O/inset_raised.png rename to data/elementary/themes/img/O/inset_raised.png diff --git a/legacy/elementary/data/themes/img/O/inset_sunk.png b/data/elementary/themes/img/O/inset_sunk.png similarity index 100% rename from legacy/elementary/data/themes/img/O/inset_sunk.png rename to data/elementary/themes/img/O/inset_sunk.png diff --git a/legacy/elementary/data/themes/img/O/logo_black_128.png b/data/elementary/themes/img/O/logo_black_128.png similarity index 100% rename from legacy/elementary/data/themes/img/O/logo_black_128.png rename to data/elementary/themes/img/O/logo_black_128.png diff --git a/legacy/elementary/data/themes/img/O/logo_white_128.png b/data/elementary/themes/img/O/logo_white_128.png similarity index 100% rename from legacy/elementary/data/themes/img/O/logo_white_128.png rename to data/elementary/themes/img/O/logo_white_128.png diff --git a/legacy/elementary/data/themes/img/O/mixer.png b/data/elementary/themes/img/O/mixer.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer.png rename to data/elementary/themes/img/O/mixer.png diff --git a/legacy/elementary/data/themes/img/O/mixer_high_left.png b/data/elementary/themes/img/O/mixer_high_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_high_left.png rename to data/elementary/themes/img/O/mixer_high_left.png diff --git a/legacy/elementary/data/themes/img/O/mixer_high_right.png b/data/elementary/themes/img/O/mixer_high_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_high_right.png rename to data/elementary/themes/img/O/mixer_high_right.png diff --git a/legacy/elementary/data/themes/img/O/mixer_low_left.png b/data/elementary/themes/img/O/mixer_low_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_low_left.png rename to data/elementary/themes/img/O/mixer_low_left.png diff --git a/legacy/elementary/data/themes/img/O/mixer_low_right.png b/data/elementary/themes/img/O/mixer_low_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_low_right.png rename to data/elementary/themes/img/O/mixer_low_right.png diff --git a/legacy/elementary/data/themes/img/O/mixer_med_left.png b/data/elementary/themes/img/O/mixer_med_left.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_med_left.png rename to data/elementary/themes/img/O/mixer_med_left.png diff --git a/legacy/elementary/data/themes/img/O/mixer_med_right.png b/data/elementary/themes/img/O/mixer_med_right.png similarity index 100% rename from legacy/elementary/data/themes/img/O/mixer_med_right.png rename to data/elementary/themes/img/O/mixer_med_right.png diff --git a/legacy/elementary/data/themes/img/O/outline.png b/data/elementary/themes/img/O/outline.png similarity index 100% rename from legacy/elementary/data/themes/img/O/outline.png rename to data/elementary/themes/img/O/outline.png diff --git a/legacy/elementary/data/themes/img/O/randr_icon_off.png b/data/elementary/themes/img/O/randr_icon_off.png similarity index 100% rename from legacy/elementary/data/themes/img/O/randr_icon_off.png rename to data/elementary/themes/img/O/randr_icon_off.png diff --git a/legacy/elementary/data/themes/img/O/randr_icon_on.png b/data/elementary/themes/img/O/randr_icon_on.png similarity index 100% rename from legacy/elementary/data/themes/img/O/randr_icon_on.png rename to data/elementary/themes/img/O/randr_icon_on.png diff --git a/legacy/elementary/data/themes/img/O/randr_monitor.png b/data/elementary/themes/img/O/randr_monitor.png similarity index 100% rename from legacy/elementary/data/themes/img/O/randr_monitor.png rename to data/elementary/themes/img/O/randr_monitor.png diff --git a/legacy/elementary/data/themes/img/O/randr_stand.png b/data/elementary/themes/img/O/randr_stand.png similarity index 100% rename from legacy/elementary/data/themes/img/O/randr_stand.png rename to data/elementary/themes/img/O/randr_stand.png diff --git a/legacy/elementary/data/themes/img/O/sb_runnerh.png b/data/elementary/themes/img/O/sb_runnerh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/sb_runnerh.png rename to data/elementary/themes/img/O/sb_runnerh.png diff --git a/legacy/elementary/data/themes/img/O/sb_runnerv.png b/data/elementary/themes/img/O/sb_runnerv.png similarity index 100% rename from legacy/elementary/data/themes/img/O/sb_runnerv.png rename to data/elementary/themes/img/O/sb_runnerv.png diff --git a/legacy/elementary/data/themes/img/O/silk.png b/data/elementary/themes/img/O/silk.png similarity index 100% rename from legacy/elementary/data/themes/img/O/silk.png rename to data/elementary/themes/img/O/silk.png diff --git a/legacy/elementary/data/themes/img/O/t0-sh.png b/data/elementary/themes/img/O/t0-sh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/t0-sh.png rename to data/elementary/themes/img/O/t0-sh.png diff --git a/legacy/elementary/data/themes/img/O/t0.png b/data/elementary/themes/img/O/t0.png similarity index 100% rename from legacy/elementary/data/themes/img/O/t0.png rename to data/elementary/themes/img/O/t0.png diff --git a/legacy/elementary/data/themes/img/O/t1-sh.png b/data/elementary/themes/img/O/t1-sh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/t1-sh.png rename to data/elementary/themes/img/O/t1-sh.png diff --git a/legacy/elementary/data/themes/img/O/t1.png b/data/elementary/themes/img/O/t1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/t1.png rename to data/elementary/themes/img/O/t1.png diff --git a/legacy/elementary/data/themes/img/O/t2.png b/data/elementary/themes/img/O/t2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/t2.png rename to data/elementary/themes/img/O/t2.png diff --git a/legacy/elementary/data/themes/img/O/tacho_bg.png b/data/elementary/themes/img/O/tacho_bg.png similarity index 100% rename from legacy/elementary/data/themes/img/O/tacho_bg.png rename to data/elementary/themes/img/O/tacho_bg.png diff --git a/legacy/elementary/data/themes/img/O/tacho_fg.png b/data/elementary/themes/img/O/tacho_fg.png similarity index 100% rename from legacy/elementary/data/themes/img/O/tacho_fg.png rename to data/elementary/themes/img/O/tacho_fg.png diff --git a/legacy/elementary/data/themes/img/O/temp_base.png b/data/elementary/themes/img/O/temp_base.png similarity index 100% rename from legacy/elementary/data/themes/img/O/temp_base.png rename to data/elementary/themes/img/O/temp_base.png diff --git a/legacy/elementary/data/themes/img/O/temp_mid.png b/data/elementary/themes/img/O/temp_mid.png similarity index 100% rename from legacy/elementary/data/themes/img/O/temp_mid.png rename to data/elementary/themes/img/O/temp_mid.png diff --git a/legacy/elementary/data/themes/img/O/temp_over.png b/data/elementary/themes/img/O/temp_over.png similarity index 100% rename from legacy/elementary/data/themes/img/O/temp_over.png rename to data/elementary/themes/img/O/temp_over.png diff --git a/legacy/elementary/data/themes/img/O/theme-label.png b/data/elementary/themes/img/O/theme-label.png similarity index 100% rename from legacy/elementary/data/themes/img/O/theme-label.png rename to data/elementary/themes/img/O/theme-label.png diff --git a/legacy/elementary/data/themes/img/O/toolbar_sel.png b/data/elementary/themes/img/O/toolbar_sel.png similarity index 100% rename from legacy/elementary/data/themes/img/O/toolbar_sel.png rename to data/elementary/themes/img/O/toolbar_sel.png diff --git a/legacy/elementary/data/themes/img/O/topsh.png b/data/elementary/themes/img/O/topsh.png similarity index 100% rename from legacy/elementary/data/themes/img/O/topsh.png rename to data/elementary/themes/img/O/topsh.png diff --git a/legacy/elementary/data/themes/img/O/transition_vswipe.png b/data/elementary/themes/img/O/transition_vswipe.png similarity index 100% rename from legacy/elementary/data/themes/img/O/transition_vswipe.png rename to data/elementary/themes/img/O/transition_vswipe.png diff --git a/legacy/elementary/data/themes/img/O/vgrad_dark.png b/data/elementary/themes/img/O/vgrad_dark.png similarity index 100% rename from legacy/elementary/data/themes/img/O/vgrad_dark.png rename to data/elementary/themes/img/O/vgrad_dark.png diff --git a/legacy/elementary/data/themes/img/O/vgrad_light.png b/data/elementary/themes/img/O/vgrad_light.png similarity index 100% rename from legacy/elementary/data/themes/img/O/vgrad_light.png rename to data/elementary/themes/img/O/vgrad_light.png diff --git a/legacy/elementary/data/themes/img/O/wizard_bt1.png b/data/elementary/themes/img/O/wizard_bt1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wizard_bt1.png rename to data/elementary/themes/img/O/wizard_bt1.png diff --git a/legacy/elementary/data/themes/img/O/wizard_bt2.png b/data/elementary/themes/img/O/wizard_bt2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wizard_bt2.png rename to data/elementary/themes/img/O/wizard_bt2.png diff --git a/legacy/elementary/data/themes/img/O/wizard_pattern.png b/data/elementary/themes/img/O/wizard_pattern.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wizard_pattern.png rename to data/elementary/themes/img/O/wizard_pattern.png diff --git a/legacy/elementary/data/themes/img/O/wp-bot1.png b/data/elementary/themes/img/O/wp-bot1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-bot1.png rename to data/elementary/themes/img/O/wp-bot1.png diff --git a/legacy/elementary/data/themes/img/O/wp-bot2.png b/data/elementary/themes/img/O/wp-bot2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-bot2.png rename to data/elementary/themes/img/O/wp-bot2.png diff --git a/legacy/elementary/data/themes/img/O/wp-tb1.png b/data/elementary/themes/img/O/wp-tb1.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-tb1.png rename to data/elementary/themes/img/O/wp-tb1.png diff --git a/legacy/elementary/data/themes/img/O/wp-tb2.png b/data/elementary/themes/img/O/wp-tb2.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-tb2.png rename to data/elementary/themes/img/O/wp-tb2.png diff --git a/legacy/elementary/data/themes/img/O/wp-tb3.png b/data/elementary/themes/img/O/wp-tb3.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-tb3.png rename to data/elementary/themes/img/O/wp-tb3.png diff --git a/legacy/elementary/data/themes/img/O/wp-tbs.png b/data/elementary/themes/img/O/wp-tbs.png similarity index 100% rename from legacy/elementary/data/themes/img/O/wp-tbs.png rename to data/elementary/themes/img/O/wp-tbs.png diff --git a/legacy/elementary/data/themes/img/access_glow.png b/data/elementary/themes/img/access_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/access_glow.png rename to data/elementary/themes/img/access_glow.png diff --git a/legacy/elementary/data/themes/img/add_glow_small.png b/data/elementary/themes/img/add_glow_small.png similarity index 100% rename from legacy/elementary/data/themes/img/add_glow_small.png rename to data/elementary/themes/img/add_glow_small.png diff --git a/legacy/elementary/data/themes/img/ball_small_glow.png b/data/elementary/themes/img/ball_small_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/ball_small_glow.png rename to data/elementary/themes/img/ball_small_glow.png diff --git a/legacy/elementary/data/themes/img/ball_small_glow_intense.png b/data/elementary/themes/img/ball_small_glow_intense.png similarity index 100% rename from legacy/elementary/data/themes/img/ball_small_glow_intense.png rename to data/elementary/themes/img/ball_small_glow_intense.png diff --git a/legacy/elementary/data/themes/img/bar_shine.png b/data/elementary/themes/img/bar_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/bar_shine.png rename to data/elementary/themes/img/bar_shine.png diff --git a/legacy/elementary/data/themes/img/bat_base.png b/data/elementary/themes/img/bat_base.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_base.png rename to data/elementary/themes/img/bat_base.png diff --git a/legacy/elementary/data/themes/img/bat_bottom0.png b/data/elementary/themes/img/bat_bottom0.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_bottom0.png rename to data/elementary/themes/img/bat_bottom0.png diff --git a/legacy/elementary/data/themes/img/bat_bottom1.png b/data/elementary/themes/img/bat_bottom1.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_bottom1.png rename to data/elementary/themes/img/bat_bottom1.png diff --git a/legacy/elementary/data/themes/img/bat_shadow.png b/data/elementary/themes/img/bat_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_shadow.png rename to data/elementary/themes/img/bat_shadow.png diff --git a/legacy/elementary/data/themes/img/bat_shine.png b/data/elementary/themes/img/bat_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_shine.png rename to data/elementary/themes/img/bat_shine.png diff --git a/legacy/elementary/data/themes/img/bat_top0.png b/data/elementary/themes/img/bat_top0.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_top0.png rename to data/elementary/themes/img/bat_top0.png diff --git a/legacy/elementary/data/themes/img/bat_top1.png b/data/elementary/themes/img/bat_top1.png similarity index 100% rename from legacy/elementary/data/themes/img/bat_top1.png rename to data/elementary/themes/img/bat_top1.png diff --git a/legacy/elementary/data/themes/img/bevel_curved_horiz_out.png b/data/elementary/themes/img/bevel_curved_horiz_out.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_curved_horiz_out.png rename to data/elementary/themes/img/bevel_curved_horiz_out.png diff --git a/legacy/elementary/data/themes/img/bevel_curved_vert_out.png b/data/elementary/themes/img/bevel_curved_vert_out.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_curved_vert_out.png rename to data/elementary/themes/img/bevel_curved_vert_out.png diff --git a/legacy/elementary/data/themes/img/bevel_dark_in.png b/data/elementary/themes/img/bevel_dark_in.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_dark_in.png rename to data/elementary/themes/img/bevel_dark_in.png diff --git a/legacy/elementary/data/themes/img/bevel_dark_out.png b/data/elementary/themes/img/bevel_dark_out.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_dark_out.png rename to data/elementary/themes/img/bevel_dark_out.png diff --git a/legacy/elementary/data/themes/img/bevel_horiz_out.png b/data/elementary/themes/img/bevel_horiz_out.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_horiz_out.png rename to data/elementary/themes/img/bevel_horiz_out.png diff --git a/legacy/elementary/data/themes/img/bevel_in.png b/data/elementary/themes/img/bevel_in.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_in.png rename to data/elementary/themes/img/bevel_in.png diff --git a/legacy/elementary/data/themes/img/bevel_out.png b/data/elementary/themes/img/bevel_out.png similarity index 100% rename from legacy/elementary/data/themes/img/bevel_out.png rename to data/elementary/themes/img/bevel_out.png diff --git a/legacy/elementary/data/themes/img/bg_glow_in.png b/data/elementary/themes/img/bg_glow_in.png similarity index 100% rename from legacy/elementary/data/themes/img/bg_glow_in.png rename to data/elementary/themes/img/bg_glow_in.png diff --git a/legacy/elementary/data/themes/img/bg_radgrad.png b/data/elementary/themes/img/bg_radgrad.png similarity index 100% rename from legacy/elementary/data/themes/img/bg_radgrad.png rename to data/elementary/themes/img/bg_radgrad.png diff --git a/legacy/elementary/data/themes/img/big_arrow_down.png b/data/elementary/themes/img/big_arrow_down.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_down.png rename to data/elementary/themes/img/big_arrow_down.png diff --git a/legacy/elementary/data/themes/img/big_arrow_down_shadow.png b/data/elementary/themes/img/big_arrow_down_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_down_shadow.png rename to data/elementary/themes/img/big_arrow_down_shadow.png diff --git a/legacy/elementary/data/themes/img/big_arrow_left.png b/data/elementary/themes/img/big_arrow_left.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_left.png rename to data/elementary/themes/img/big_arrow_left.png diff --git a/legacy/elementary/data/themes/img/big_arrow_left_shadow.png b/data/elementary/themes/img/big_arrow_left_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_left_shadow.png rename to data/elementary/themes/img/big_arrow_left_shadow.png diff --git a/legacy/elementary/data/themes/img/big_arrow_right.png b/data/elementary/themes/img/big_arrow_right.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_right.png rename to data/elementary/themes/img/big_arrow_right.png diff --git a/legacy/elementary/data/themes/img/big_arrow_right_shadow.png b/data/elementary/themes/img/big_arrow_right_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_right_shadow.png rename to data/elementary/themes/img/big_arrow_right_shadow.png diff --git a/legacy/elementary/data/themes/img/big_arrow_up.png b/data/elementary/themes/img/big_arrow_up.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_up.png rename to data/elementary/themes/img/big_arrow_up.png diff --git a/legacy/elementary/data/themes/img/big_arrow_up_shadow.png b/data/elementary/themes/img/big_arrow_up_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/big_arrow_up_shadow.png rename to data/elementary/themes/img/big_arrow_up_shadow.png diff --git a/legacy/elementary/data/themes/img/box_glow.png b/data/elementary/themes/img/box_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/box_glow.png rename to data/elementary/themes/img/box_glow.png diff --git a/legacy/elementary/data/themes/img/box_outline.png b/data/elementary/themes/img/box_outline.png similarity index 100% rename from legacy/elementary/data/themes/img/box_outline.png rename to data/elementary/themes/img/box_outline.png diff --git a/legacy/elementary/data/themes/img/bt_base.png b/data/elementary/themes/img/bt_base.png similarity index 100% rename from legacy/elementary/data/themes/img/bt_base.png rename to data/elementary/themes/img/bt_base.png diff --git a/legacy/elementary/data/themes/img/bt_sig_1.png b/data/elementary/themes/img/bt_sig_1.png similarity index 100% rename from legacy/elementary/data/themes/img/bt_sig_1.png rename to data/elementary/themes/img/bt_sig_1.png diff --git a/legacy/elementary/data/themes/img/bt_sig_2.png b/data/elementary/themes/img/bt_sig_2.png similarity index 100% rename from legacy/elementary/data/themes/img/bt_sig_2.png rename to data/elementary/themes/img/bt_sig_2.png diff --git a/legacy/elementary/data/themes/img/btn_round_0.png b/data/elementary/themes/img/btn_round_0.png similarity index 100% rename from legacy/elementary/data/themes/img/btn_round_0.png rename to data/elementary/themes/img/btn_round_0.png diff --git a/legacy/elementary/data/themes/img/btn_round_1.png b/data/elementary/themes/img/btn_round_1.png similarity index 100% rename from legacy/elementary/data/themes/img/btn_round_1.png rename to data/elementary/themes/img/btn_round_1.png diff --git a/legacy/elementary/data/themes/img/btn_round_2.png b/data/elementary/themes/img/btn_round_2.png similarity index 100% rename from legacy/elementary/data/themes/img/btn_round_2.png rename to data/elementary/themes/img/btn_round_2.png diff --git a/legacy/elementary/data/themes/img/bub_base_b0.png b/data/elementary/themes/img/bub_base_b0.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_b0.png rename to data/elementary/themes/img/bub_base_b0.png diff --git a/legacy/elementary/data/themes/img/bub_base_b1.png b/data/elementary/themes/img/bub_base_b1.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_b1.png rename to data/elementary/themes/img/bub_base_b1.png diff --git a/legacy/elementary/data/themes/img/bub_base_b2.png b/data/elementary/themes/img/bub_base_b2.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_b2.png rename to data/elementary/themes/img/bub_base_b2.png diff --git a/legacy/elementary/data/themes/img/bub_base_bl.png b/data/elementary/themes/img/bub_base_bl.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_bl.png rename to data/elementary/themes/img/bub_base_bl.png diff --git a/legacy/elementary/data/themes/img/bub_base_br.png b/data/elementary/themes/img/bub_base_br.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_br.png rename to data/elementary/themes/img/bub_base_br.png diff --git a/legacy/elementary/data/themes/img/bub_base_tl.png b/data/elementary/themes/img/bub_base_tl.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_tl.png rename to data/elementary/themes/img/bub_base_tl.png diff --git a/legacy/elementary/data/themes/img/bub_base_tr.png b/data/elementary/themes/img/bub_base_tr.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_base_tr.png rename to data/elementary/themes/img/bub_base_tr.png diff --git a/legacy/elementary/data/themes/img/bub_over_bot.png b/data/elementary/themes/img/bub_over_bot.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_over_bot.png rename to data/elementary/themes/img/bub_over_bot.png diff --git a/legacy/elementary/data/themes/img/bub_over_top.png b/data/elementary/themes/img/bub_over_top.png similarity index 100% rename from legacy/elementary/data/themes/img/bub_over_top.png rename to data/elementary/themes/img/bub_over_top.png diff --git a/legacy/elementary/data/themes/img/bulb_glow.png b/data/elementary/themes/img/bulb_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/bulb_glow.png rename to data/elementary/themes/img/bulb_glow.png diff --git a/legacy/elementary/data/themes/img/bulb_off.png b/data/elementary/themes/img/bulb_off.png similarity index 100% rename from legacy/elementary/data/themes/img/bulb_off.png rename to data/elementary/themes/img/bulb_off.png diff --git a/legacy/elementary/data/themes/img/bulb_on.png b/data/elementary/themes/img/bulb_on.png similarity index 100% rename from legacy/elementary/data/themes/img/bulb_on.png rename to data/elementary/themes/img/bulb_on.png diff --git a/legacy/elementary/data/themes/img/bulb_over.png b/data/elementary/themes/img/bulb_over.png similarity index 100% rename from legacy/elementary/data/themes/img/bulb_over.png rename to data/elementary/themes/img/bulb_over.png diff --git a/legacy/elementary/data/themes/img/button_clicked.png b/data/elementary/themes/img/button_clicked.png similarity index 100% rename from legacy/elementary/data/themes/img/button_clicked.png rename to data/elementary/themes/img/button_clicked.png diff --git a/legacy/elementary/data/themes/img/button_normal.png b/data/elementary/themes/img/button_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/button_normal.png rename to data/elementary/themes/img/button_normal.png diff --git a/legacy/elementary/data/themes/img/cell_base.png b/data/elementary/themes/img/cell_base.png similarity index 100% rename from legacy/elementary/data/themes/img/cell_base.png rename to data/elementary/themes/img/cell_base.png diff --git a/legacy/elementary/data/themes/img/cell_sig_1.png b/data/elementary/themes/img/cell_sig_1.png similarity index 100% rename from legacy/elementary/data/themes/img/cell_sig_1.png rename to data/elementary/themes/img/cell_sig_1.png diff --git a/legacy/elementary/data/themes/img/cell_sig_2.png b/data/elementary/themes/img/cell_sig_2.png similarity index 100% rename from legacy/elementary/data/themes/img/cell_sig_2.png rename to data/elementary/themes/img/cell_sig_2.png diff --git a/legacy/elementary/data/themes/img/cell_sig_3.png b/data/elementary/themes/img/cell_sig_3.png similarity index 100% rename from legacy/elementary/data/themes/img/cell_sig_3.png rename to data/elementary/themes/img/cell_sig_3.png diff --git a/legacy/elementary/data/themes/img/cell_sig_4.png b/data/elementary/themes/img/cell_sig_4.png similarity index 100% rename from legacy/elementary/data/themes/img/cell_sig_4.png rename to data/elementary/themes/img/cell_sig_4.png diff --git a/legacy/elementary/data/themes/img/clock_base.png b/data/elementary/themes/img/clock_base.png similarity index 100% rename from legacy/elementary/data/themes/img/clock_base.png rename to data/elementary/themes/img/clock_base.png diff --git a/legacy/elementary/data/themes/img/col_sel_end_bottom.png b/data/elementary/themes/img/col_sel_end_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/col_sel_end_bottom.png rename to data/elementary/themes/img/col_sel_end_bottom.png diff --git a/legacy/elementary/data/themes/img/col_sel_end_left.png b/data/elementary/themes/img/col_sel_end_left.png similarity index 100% rename from legacy/elementary/data/themes/img/col_sel_end_left.png rename to data/elementary/themes/img/col_sel_end_left.png diff --git a/legacy/elementary/data/themes/img/col_sel_end_right.png b/data/elementary/themes/img/col_sel_end_right.png similarity index 100% rename from legacy/elementary/data/themes/img/col_sel_end_right.png rename to data/elementary/themes/img/col_sel_end_right.png diff --git a/legacy/elementary/data/themes/img/col_sel_end_top.png b/data/elementary/themes/img/col_sel_end_top.png similarity index 100% rename from legacy/elementary/data/themes/img/col_sel_end_top.png rename to data/elementary/themes/img/col_sel_end_top.png diff --git a/legacy/elementary/data/themes/img/color_picker_alpha.png b/data/elementary/themes/img/color_picker_alpha.png similarity index 100% rename from legacy/elementary/data/themes/img/color_picker_alpha.png rename to data/elementary/themes/img/color_picker_alpha.png diff --git a/legacy/elementary/data/themes/img/color_picker_brightness.png b/data/elementary/themes/img/color_picker_brightness.png similarity index 100% rename from legacy/elementary/data/themes/img/color_picker_brightness.png rename to data/elementary/themes/img/color_picker_brightness.png diff --git a/legacy/elementary/data/themes/img/color_picker_color.png b/data/elementary/themes/img/color_picker_color.png similarity index 100% rename from legacy/elementary/data/themes/img/color_picker_color.png rename to data/elementary/themes/img/color_picker_color.png diff --git a/legacy/elementary/data/themes/img/color_picker_opacity.png b/data/elementary/themes/img/color_picker_opacity.png similarity index 100% rename from legacy/elementary/data/themes/img/color_picker_opacity.png rename to data/elementary/themes/img/color_picker_opacity.png diff --git a/legacy/elementary/data/themes/img/darken_rounded_square.png b/data/elementary/themes/img/darken_rounded_square.png similarity index 100% rename from legacy/elementary/data/themes/img/darken_rounded_square.png rename to data/elementary/themes/img/darken_rounded_square.png diff --git a/legacy/elementary/data/themes/img/darken_rounded_square_half.png b/data/elementary/themes/img/darken_rounded_square_half.png similarity index 100% rename from legacy/elementary/data/themes/img/darken_rounded_square_half.png rename to data/elementary/themes/img/darken_rounded_square_half.png diff --git a/legacy/elementary/data/themes/img/darken_rounded_square_half_h.png b/data/elementary/themes/img/darken_rounded_square_half_h.png similarity index 100% rename from legacy/elementary/data/themes/img/darken_rounded_square_half_h.png rename to data/elementary/themes/img/darken_rounded_square_half_h.png diff --git a/legacy/elementary/data/themes/img/darken_square.png b/data/elementary/themes/img/darken_square.png similarity index 100% rename from legacy/elementary/data/themes/img/darken_square.png rename to data/elementary/themes/img/darken_square.png diff --git a/legacy/elementary/data/themes/img/day_left_normal.png b/data/elementary/themes/img/day_left_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/day_left_normal.png rename to data/elementary/themes/img/day_left_normal.png diff --git a/legacy/elementary/data/themes/img/day_left_press.png b/data/elementary/themes/img/day_left_press.png similarity index 100% rename from legacy/elementary/data/themes/img/day_left_press.png rename to data/elementary/themes/img/day_left_press.png diff --git a/legacy/elementary/data/themes/img/day_left_selected.png b/data/elementary/themes/img/day_left_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/day_left_selected.png rename to data/elementary/themes/img/day_left_selected.png diff --git a/legacy/elementary/data/themes/img/day_middle_normal.png b/data/elementary/themes/img/day_middle_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/day_middle_normal.png rename to data/elementary/themes/img/day_middle_normal.png diff --git a/legacy/elementary/data/themes/img/day_middle_press.png b/data/elementary/themes/img/day_middle_press.png similarity index 100% rename from legacy/elementary/data/themes/img/day_middle_press.png rename to data/elementary/themes/img/day_middle_press.png diff --git a/legacy/elementary/data/themes/img/day_middle_selected.png b/data/elementary/themes/img/day_middle_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/day_middle_selected.png rename to data/elementary/themes/img/day_middle_selected.png diff --git a/legacy/elementary/data/themes/img/day_right_normal.png b/data/elementary/themes/img/day_right_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/day_right_normal.png rename to data/elementary/themes/img/day_right_normal.png diff --git a/legacy/elementary/data/themes/img/day_right_press.png b/data/elementary/themes/img/day_right_press.png similarity index 100% rename from legacy/elementary/data/themes/img/day_right_press.png rename to data/elementary/themes/img/day_right_press.png diff --git a/legacy/elementary/data/themes/img/day_right_selected.png b/data/elementary/themes/img/day_right_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/day_right_selected.png rename to data/elementary/themes/img/day_right_selected.png diff --git a/legacy/elementary/data/themes/img/day_single_normal.png b/data/elementary/themes/img/day_single_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/day_single_normal.png rename to data/elementary/themes/img/day_single_normal.png diff --git a/legacy/elementary/data/themes/img/day_single_press.png b/data/elementary/themes/img/day_single_press.png similarity index 100% rename from legacy/elementary/data/themes/img/day_single_press.png rename to data/elementary/themes/img/day_single_press.png diff --git a/legacy/elementary/data/themes/img/day_single_selected.png b/data/elementary/themes/img/day_single_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/day_single_selected.png rename to data/elementary/themes/img/day_single_selected.png diff --git a/legacy/elementary/data/themes/img/diagonal_stripes.png b/data/elementary/themes/img/diagonal_stripes.png similarity index 100% rename from legacy/elementary/data/themes/img/diagonal_stripes.png rename to data/elementary/themes/img/diagonal_stripes.png diff --git a/legacy/elementary/data/themes/img/digit_0.png b/data/elementary/themes/img/digit_0.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_0.png rename to data/elementary/themes/img/digit_0.png diff --git a/legacy/elementary/data/themes/img/digit_1.png b/data/elementary/themes/img/digit_1.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_1.png rename to data/elementary/themes/img/digit_1.png diff --git a/legacy/elementary/data/themes/img/digit_2.png b/data/elementary/themes/img/digit_2.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_2.png rename to data/elementary/themes/img/digit_2.png diff --git a/legacy/elementary/data/themes/img/digit_3.png b/data/elementary/themes/img/digit_3.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_3.png rename to data/elementary/themes/img/digit_3.png diff --git a/legacy/elementary/data/themes/img/digit_4.png b/data/elementary/themes/img/digit_4.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_4.png rename to data/elementary/themes/img/digit_4.png diff --git a/legacy/elementary/data/themes/img/digit_5.png b/data/elementary/themes/img/digit_5.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_5.png rename to data/elementary/themes/img/digit_5.png diff --git a/legacy/elementary/data/themes/img/digit_6.png b/data/elementary/themes/img/digit_6.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_6.png rename to data/elementary/themes/img/digit_6.png diff --git a/legacy/elementary/data/themes/img/digit_7.png b/data/elementary/themes/img/digit_7.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_7.png rename to data/elementary/themes/img/digit_7.png diff --git a/legacy/elementary/data/themes/img/digit_8.png b/data/elementary/themes/img/digit_8.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_8.png rename to data/elementary/themes/img/digit_8.png diff --git a/legacy/elementary/data/themes/img/digit_9.png b/data/elementary/themes/img/digit_9.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_9.png rename to data/elementary/themes/img/digit_9.png diff --git a/legacy/elementary/data/themes/img/digit_am.png b/data/elementary/themes/img/digit_am.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_am.png rename to data/elementary/themes/img/digit_am.png diff --git a/legacy/elementary/data/themes/img/digit_na.png b/data/elementary/themes/img/digit_na.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_na.png rename to data/elementary/themes/img/digit_na.png diff --git a/legacy/elementary/data/themes/img/digit_nm.png b/data/elementary/themes/img/digit_nm.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_nm.png rename to data/elementary/themes/img/digit_nm.png diff --git a/legacy/elementary/data/themes/img/digit_pm.png b/data/elementary/themes/img/digit_pm.png similarity index 100% rename from legacy/elementary/data/themes/img/digit_pm.png rename to data/elementary/themes/img/digit_pm.png diff --git a/legacy/elementary/data/themes/img/dot_pattern.png b/data/elementary/themes/img/dot_pattern.png similarity index 100% rename from legacy/elementary/data/themes/img/dot_pattern.png rename to data/elementary/themes/img/dot_pattern.png diff --git a/legacy/elementary/data/themes/img/downlight_glow.png b/data/elementary/themes/img/downlight_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/downlight_glow.png rename to data/elementary/themes/img/downlight_glow.png diff --git a/legacy/elementary/data/themes/img/downlight_glow_left.png b/data/elementary/themes/img/downlight_glow_left.png similarity index 100% rename from legacy/elementary/data/themes/img/downlight_glow_left.png rename to data/elementary/themes/img/downlight_glow_left.png diff --git a/legacy/elementary/data/themes/img/downlight_glow_right.png b/data/elementary/themes/img/downlight_glow_right.png similarity index 100% rename from legacy/elementary/data/themes/img/downlight_glow_right.png rename to data/elementary/themes/img/downlight_glow_right.png diff --git a/legacy/elementary/data/themes/img/downlight_glow_up.png b/data/elementary/themes/img/downlight_glow_up.png similarity index 100% rename from legacy/elementary/data/themes/img/downlight_glow_up.png rename to data/elementary/themes/img/downlight_glow_up.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_base.png b/data/elementary/themes/img/efm_generic_icon_base.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_base.png rename to data/elementary/themes/img/efm_generic_icon_base.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_base_empty.png b/data/elementary/themes/img/efm_generic_icon_base_empty.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_base_empty.png rename to data/elementary/themes/img/efm_generic_icon_base_empty.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_audio.png b/data/elementary/themes/img/efm_generic_icon_content_audio.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_audio.png rename to data/elementary/themes/img/efm_generic_icon_content_audio.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_cad.png b/data/elementary/themes/img/efm_generic_icon_content_cad.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_cad.png rename to data/elementary/themes/img/efm_generic_icon_content_cad.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_code.png b/data/elementary/themes/img/efm_generic_icon_content_code.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_code.png rename to data/elementary/themes/img/efm_generic_icon_content_code.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_db.png b/data/elementary/themes/img/efm_generic_icon_content_db.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_db.png rename to data/elementary/themes/img/efm_generic_icon_content_db.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_doc.png b/data/elementary/themes/img/efm_generic_icon_content_doc.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_doc.png rename to data/elementary/themes/img/efm_generic_icon_content_doc.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_draw.png b/data/elementary/themes/img/efm_generic_icon_content_draw.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_draw.png rename to data/elementary/themes/img/efm_generic_icon_content_draw.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_executable.png b/data/elementary/themes/img/efm_generic_icon_content_executable.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_executable.png rename to data/elementary/themes/img/efm_generic_icon_content_executable.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_font.png b/data/elementary/themes/img/efm_generic_icon_content_font.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_font.png rename to data/elementary/themes/img/efm_generic_icon_content_font.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_formula.png b/data/elementary/themes/img/efm_generic_icon_content_formula.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_formula.png rename to data/elementary/themes/img/efm_generic_icon_content_formula.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_image.png b/data/elementary/themes/img/efm_generic_icon_content_image.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_image.png rename to data/elementary/themes/img/efm_generic_icon_content_image.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_block.png b/data/elementary/themes/img/efm_generic_icon_content_inode_block.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_block.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_block.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_char.png b/data/elementary/themes/img/efm_generic_icon_content_inode_char.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_char.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_char.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_dir.png b/data/elementary/themes/img/efm_generic_icon_content_inode_dir.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_dir.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_dir.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_fifo.png b/data/elementary/themes/img/efm_generic_icon_content_inode_fifo.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_fifo.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_fifo.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_file.png b/data/elementary/themes/img/efm_generic_icon_content_inode_file.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_file.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_file.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_inode_socket.png b/data/elementary/themes/img/efm_generic_icon_content_inode_socket.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_inode_socket.png rename to data/elementary/themes/img/efm_generic_icon_content_inode_socket.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_install.png b/data/elementary/themes/img/efm_generic_icon_content_install.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_install.png rename to data/elementary/themes/img/efm_generic_icon_content_install.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_iso.png b/data/elementary/themes/img/efm_generic_icon_content_iso.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_iso.png rename to data/elementary/themes/img/efm_generic_icon_content_iso.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_lib.png b/data/elementary/themes/img/efm_generic_icon_content_lib.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_lib.png rename to data/elementary/themes/img/efm_generic_icon_content_lib.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_lo.png b/data/elementary/themes/img/efm_generic_icon_content_lo.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_lo.png rename to data/elementary/themes/img/efm_generic_icon_content_lo.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_logo.png b/data/elementary/themes/img/efm_generic_icon_content_logo.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_logo.png rename to data/elementary/themes/img/efm_generic_icon_content_logo.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_pdf.png b/data/elementary/themes/img/efm_generic_icon_content_pdf.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_pdf.png rename to data/elementary/themes/img/efm_generic_icon_content_pdf.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_perl.png b/data/elementary/themes/img/efm_generic_icon_content_perl.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_perl.png rename to data/elementary/themes/img/efm_generic_icon_content_perl.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_pres.png b/data/elementary/themes/img/efm_generic_icon_content_pres.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_pres.png rename to data/elementary/themes/img/efm_generic_icon_content_pres.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_ps.png b/data/elementary/themes/img/efm_generic_icon_content_ps.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_ps.png rename to data/elementary/themes/img/efm_generic_icon_content_ps.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_python.png b/data/elementary/themes/img/efm_generic_icon_content_python.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_python.png rename to data/elementary/themes/img/efm_generic_icon_content_python.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_ruby.png b/data/elementary/themes/img/efm_generic_icon_content_ruby.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_ruby.png rename to data/elementary/themes/img/efm_generic_icon_content_ruby.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_script.png b/data/elementary/themes/img/efm_generic_icon_content_script.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_script.png rename to data/elementary/themes/img/efm_generic_icon_content_script.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_spread.png b/data/elementary/themes/img/efm_generic_icon_content_spread.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_spread.png rename to data/elementary/themes/img/efm_generic_icon_content_spread.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_template.png b/data/elementary/themes/img/efm_generic_icon_content_template.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_template.png rename to data/elementary/themes/img/efm_generic_icon_content_template.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_text.png b/data/elementary/themes/img/efm_generic_icon_content_text.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_text.png rename to data/elementary/themes/img/efm_generic_icon_content_text.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_translate.png b/data/elementary/themes/img/efm_generic_icon_content_translate.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_translate.png rename to data/elementary/themes/img/efm_generic_icon_content_translate.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_trash.png b/data/elementary/themes/img/efm_generic_icon_content_trash.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_trash.png rename to data/elementary/themes/img/efm_generic_icon_content_trash.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_unknown.png b/data/elementary/themes/img/efm_generic_icon_content_unknown.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_unknown.png rename to data/elementary/themes/img/efm_generic_icon_content_unknown.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_video.png b/data/elementary/themes/img/efm_generic_icon_content_video.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_video.png rename to data/elementary/themes/img/efm_generic_icon_content_video.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_content_web.png b/data/elementary/themes/img/efm_generic_icon_content_web.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_content_web.png rename to data/elementary/themes/img/efm_generic_icon_content_web.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_over.png b/data/elementary/themes/img/efm_generic_icon_over.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_over.png rename to data/elementary/themes/img/efm_generic_icon_over.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_over_empty.png b/data/elementary/themes/img/efm_generic_icon_over_empty.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_over_empty.png rename to data/elementary/themes/img/efm_generic_icon_over_empty.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_shadow.png b/data/elementary/themes/img/efm_generic_icon_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_shadow.png rename to data/elementary/themes/img/efm_generic_icon_shadow.png diff --git a/legacy/elementary/data/themes/img/efm_generic_icon_shadow_empty.png b/data/elementary/themes/img/efm_generic_icon_shadow_empty.png similarity index 100% rename from legacy/elementary/data/themes/img/efm_generic_icon_shadow_empty.png rename to data/elementary/themes/img/efm_generic_icon_shadow_empty.png diff --git a/legacy/elementary/data/themes/img/emo-angry-shout.png b/data/elementary/themes/img/emo-angry-shout.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-angry-shout.png rename to data/elementary/themes/img/emo-angry-shout.png diff --git a/legacy/elementary/data/themes/img/emo-angry.png b/data/elementary/themes/img/emo-angry.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-angry.png rename to data/elementary/themes/img/emo-angry.png diff --git a/legacy/elementary/data/themes/img/emo-crazy-laugh.png b/data/elementary/themes/img/emo-crazy-laugh.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-crazy-laugh.png rename to data/elementary/themes/img/emo-crazy-laugh.png diff --git a/legacy/elementary/data/themes/img/emo-evil-laugh.png b/data/elementary/themes/img/emo-evil-laugh.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-evil-laugh.png rename to data/elementary/themes/img/emo-evil-laugh.png diff --git a/legacy/elementary/data/themes/img/emo-evil.png b/data/elementary/themes/img/emo-evil.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-evil.png rename to data/elementary/themes/img/emo-evil.png diff --git a/legacy/elementary/data/themes/img/emo-goggle-smile.png b/data/elementary/themes/img/emo-goggle-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-goggle-smile.png rename to data/elementary/themes/img/emo-goggle-smile.png diff --git a/legacy/elementary/data/themes/img/emo-grumpy-smile.png b/data/elementary/themes/img/emo-grumpy-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-grumpy-smile.png rename to data/elementary/themes/img/emo-grumpy-smile.png diff --git a/legacy/elementary/data/themes/img/emo-grumpy.png b/data/elementary/themes/img/emo-grumpy.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-grumpy.png rename to data/elementary/themes/img/emo-grumpy.png diff --git a/legacy/elementary/data/themes/img/emo-guilty-smile.png b/data/elementary/themes/img/emo-guilty-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-guilty-smile.png rename to data/elementary/themes/img/emo-guilty-smile.png diff --git a/legacy/elementary/data/themes/img/emo-guilty.png b/data/elementary/themes/img/emo-guilty.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-guilty.png rename to data/elementary/themes/img/emo-guilty.png diff --git a/legacy/elementary/data/themes/img/emo-haha.png b/data/elementary/themes/img/emo-haha.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-haha.png rename to data/elementary/themes/img/emo-haha.png diff --git a/legacy/elementary/data/themes/img/emo-half-smile.png b/data/elementary/themes/img/emo-half-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-half-smile.png rename to data/elementary/themes/img/emo-half-smile.png diff --git a/legacy/elementary/data/themes/img/emo-happy-panting.png b/data/elementary/themes/img/emo-happy-panting.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-happy-panting.png rename to data/elementary/themes/img/emo-happy-panting.png diff --git a/legacy/elementary/data/themes/img/emo-happy.png b/data/elementary/themes/img/emo-happy.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-happy.png rename to data/elementary/themes/img/emo-happy.png diff --git a/legacy/elementary/data/themes/img/emo-indifferent.png b/data/elementary/themes/img/emo-indifferent.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-indifferent.png rename to data/elementary/themes/img/emo-indifferent.png diff --git a/legacy/elementary/data/themes/img/emo-kiss.png b/data/elementary/themes/img/emo-kiss.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-kiss.png rename to data/elementary/themes/img/emo-kiss.png diff --git a/legacy/elementary/data/themes/img/emo-knowing-grin.png b/data/elementary/themes/img/emo-knowing-grin.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-knowing-grin.png rename to data/elementary/themes/img/emo-knowing-grin.png diff --git a/legacy/elementary/data/themes/img/emo-laugh.png b/data/elementary/themes/img/emo-laugh.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-laugh.png rename to data/elementary/themes/img/emo-laugh.png diff --git a/legacy/elementary/data/themes/img/emo-little-bit-sorry.png b/data/elementary/themes/img/emo-little-bit-sorry.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-little-bit-sorry.png rename to data/elementary/themes/img/emo-little-bit-sorry.png diff --git a/legacy/elementary/data/themes/img/emo-love-lots.png b/data/elementary/themes/img/emo-love-lots.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-love-lots.png rename to data/elementary/themes/img/emo-love-lots.png diff --git a/legacy/elementary/data/themes/img/emo-love.png b/data/elementary/themes/img/emo-love.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-love.png rename to data/elementary/themes/img/emo-love.png diff --git a/legacy/elementary/data/themes/img/emo-minimal-smile.png b/data/elementary/themes/img/emo-minimal-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-minimal-smile.png rename to data/elementary/themes/img/emo-minimal-smile.png diff --git a/legacy/elementary/data/themes/img/emo-not-happy.png b/data/elementary/themes/img/emo-not-happy.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-not-happy.png rename to data/elementary/themes/img/emo-not-happy.png diff --git a/legacy/elementary/data/themes/img/emo-not-impressed.png b/data/elementary/themes/img/emo-not-impressed.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-not-impressed.png rename to data/elementary/themes/img/emo-not-impressed.png diff --git a/legacy/elementary/data/themes/img/emo-omg.png b/data/elementary/themes/img/emo-omg.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-omg.png rename to data/elementary/themes/img/emo-omg.png diff --git a/legacy/elementary/data/themes/img/emo-opensmile.png b/data/elementary/themes/img/emo-opensmile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-opensmile.png rename to data/elementary/themes/img/emo-opensmile.png diff --git a/legacy/elementary/data/themes/img/emo-smile.png b/data/elementary/themes/img/emo-smile.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-smile.png rename to data/elementary/themes/img/emo-smile.png diff --git a/legacy/elementary/data/themes/img/emo-sorry.png b/data/elementary/themes/img/emo-sorry.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-sorry.png rename to data/elementary/themes/img/emo-sorry.png diff --git a/legacy/elementary/data/themes/img/emo-squint-laugh.png b/data/elementary/themes/img/emo-squint-laugh.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-squint-laugh.png rename to data/elementary/themes/img/emo-squint-laugh.png diff --git a/legacy/elementary/data/themes/img/emo-surprised.png b/data/elementary/themes/img/emo-surprised.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-surprised.png rename to data/elementary/themes/img/emo-surprised.png diff --git a/legacy/elementary/data/themes/img/emo-suspicious.png b/data/elementary/themes/img/emo-suspicious.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-suspicious.png rename to data/elementary/themes/img/emo-suspicious.png diff --git a/legacy/elementary/data/themes/img/emo-tongue-dangling.png b/data/elementary/themes/img/emo-tongue-dangling.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-tongue-dangling.png rename to data/elementary/themes/img/emo-tongue-dangling.png diff --git a/legacy/elementary/data/themes/img/emo-tongue-poke.png b/data/elementary/themes/img/emo-tongue-poke.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-tongue-poke.png rename to data/elementary/themes/img/emo-tongue-poke.png diff --git a/legacy/elementary/data/themes/img/emo-uh.png b/data/elementary/themes/img/emo-uh.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-uh.png rename to data/elementary/themes/img/emo-uh.png diff --git a/legacy/elementary/data/themes/img/emo-unhappy.png b/data/elementary/themes/img/emo-unhappy.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-unhappy.png rename to data/elementary/themes/img/emo-unhappy.png diff --git a/legacy/elementary/data/themes/img/emo-very-sorry.png b/data/elementary/themes/img/emo-very-sorry.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-very-sorry.png rename to data/elementary/themes/img/emo-very-sorry.png diff --git a/legacy/elementary/data/themes/img/emo-what.png b/data/elementary/themes/img/emo-what.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-what.png rename to data/elementary/themes/img/emo-what.png diff --git a/legacy/elementary/data/themes/img/emo-wink.png b/data/elementary/themes/img/emo-wink.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-wink.png rename to data/elementary/themes/img/emo-wink.png diff --git a/legacy/elementary/data/themes/img/emo-worried.png b/data/elementary/themes/img/emo-worried.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-worried.png rename to data/elementary/themes/img/emo-worried.png diff --git a/legacy/elementary/data/themes/img/emo-wtf.png b/data/elementary/themes/img/emo-wtf.png similarity index 100% rename from legacy/elementary/data/themes/img/emo-wtf.png rename to data/elementary/themes/img/emo-wtf.png diff --git a/legacy/elementary/data/themes/img/eth.png b/data/elementary/themes/img/eth.png similarity index 100% rename from legacy/elementary/data/themes/img/eth.png rename to data/elementary/themes/img/eth.png diff --git a/legacy/elementary/data/themes/img/exlclam.png b/data/elementary/themes/img/exlclam.png similarity index 100% rename from legacy/elementary/data/themes/img/exlclam.png rename to data/elementary/themes/img/exlclam.png diff --git a/legacy/elementary/data/themes/img/flip_base_shad.png b/data/elementary/themes/img/flip_base_shad.png similarity index 100% rename from legacy/elementary/data/themes/img/flip_base_shad.png rename to data/elementary/themes/img/flip_base_shad.png diff --git a/legacy/elementary/data/themes/img/flip_shad.png b/data/elementary/themes/img/flip_shad.png similarity index 100% rename from legacy/elementary/data/themes/img/flip_shad.png rename to data/elementary/themes/img/flip_shad.png diff --git a/legacy/elementary/data/themes/img/frame_rounded.png b/data/elementary/themes/img/frame_rounded.png similarity index 100% rename from legacy/elementary/data/themes/img/frame_rounded.png rename to data/elementary/themes/img/frame_rounded.png diff --git a/legacy/elementary/data/themes/img/glow_exclam.png b/data/elementary/themes/img/glow_exclam.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_exclam.png rename to data/elementary/themes/img/glow_exclam.png diff --git a/legacy/elementary/data/themes/img/glow_lock_double.png b/data/elementary/themes/img/glow_lock_double.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_lock_double.png rename to data/elementary/themes/img/glow_lock_double.png diff --git a/legacy/elementary/data/themes/img/glow_lock_locked.png b/data/elementary/themes/img/glow_lock_locked.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_lock_locked.png rename to data/elementary/themes/img/glow_lock_locked.png diff --git a/legacy/elementary/data/themes/img/glow_lock_unlocked.png b/data/elementary/themes/img/glow_lock_unlocked.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_lock_unlocked.png rename to data/elementary/themes/img/glow_lock_unlocked.png diff --git a/legacy/elementary/data/themes/img/glow_med_white.png b/data/elementary/themes/img/glow_med_white.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_med_white.png rename to data/elementary/themes/img/glow_med_white.png diff --git a/legacy/elementary/data/themes/img/glow_round_corners.png b/data/elementary/themes/img/glow_round_corners.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_round_corners.png rename to data/elementary/themes/img/glow_round_corners.png diff --git a/legacy/elementary/data/themes/img/glow_round_corners_small.png b/data/elementary/themes/img/glow_round_corners_small.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_round_corners_small.png rename to data/elementary/themes/img/glow_round_corners_small.png diff --git a/legacy/elementary/data/themes/img/glow_small.png b/data/elementary/themes/img/glow_small.png similarity index 100% rename from legacy/elementary/data/themes/img/glow_small.png rename to data/elementary/themes/img/glow_small.png diff --git a/legacy/elementary/data/themes/img/handle_pick_up_left.png b/data/elementary/themes/img/handle_pick_up_left.png similarity index 100% rename from legacy/elementary/data/themes/img/handle_pick_up_left.png rename to data/elementary/themes/img/handle_pick_up_left.png diff --git a/legacy/elementary/data/themes/img/handle_pick_up_right.png b/data/elementary/themes/img/handle_pick_up_right.png similarity index 100% rename from legacy/elementary/data/themes/img/handle_pick_up_right.png rename to data/elementary/themes/img/handle_pick_up_right.png diff --git a/legacy/elementary/data/themes/img/hole_pixel.png b/data/elementary/themes/img/hole_pixel.png similarity index 100% rename from legacy/elementary/data/themes/img/hole_pixel.png rename to data/elementary/themes/img/hole_pixel.png diff --git a/legacy/elementary/data/themes/img/hole_tiny.png b/data/elementary/themes/img/hole_tiny.png similarity index 100% rename from legacy/elementary/data/themes/img/hole_tiny.png rename to data/elementary/themes/img/hole_tiny.png diff --git a/legacy/elementary/data/themes/img/holes_horiz.png b/data/elementary/themes/img/holes_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_horiz.png rename to data/elementary/themes/img/holes_horiz.png diff --git a/legacy/elementary/data/themes/img/holes_tiny_glow_horiz.png b/data/elementary/themes/img/holes_tiny_glow_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_tiny_glow_horiz.png rename to data/elementary/themes/img/holes_tiny_glow_horiz.png diff --git a/legacy/elementary/data/themes/img/holes_tiny_glow_vert.png b/data/elementary/themes/img/holes_tiny_glow_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_tiny_glow_vert.png rename to data/elementary/themes/img/holes_tiny_glow_vert.png diff --git a/legacy/elementary/data/themes/img/holes_tiny_horiz.png b/data/elementary/themes/img/holes_tiny_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_tiny_horiz.png rename to data/elementary/themes/img/holes_tiny_horiz.png diff --git a/legacy/elementary/data/themes/img/holes_tiny_vert.png b/data/elementary/themes/img/holes_tiny_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_tiny_vert.png rename to data/elementary/themes/img/holes_tiny_vert.png diff --git a/legacy/elementary/data/themes/img/holes_vert.png b/data/elementary/themes/img/holes_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/holes_vert.png rename to data/elementary/themes/img/holes_vert.png diff --git a/legacy/elementary/data/themes/img/home_glow.png b/data/elementary/themes/img/home_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/home_glow.png rename to data/elementary/themes/img/home_glow.png diff --git a/legacy/elementary/data/themes/img/home_hilight.png b/data/elementary/themes/img/home_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/home_hilight.png rename to data/elementary/themes/img/home_hilight.png diff --git a/legacy/elementary/data/themes/img/home_inset.png b/data/elementary/themes/img/home_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/home_inset.png rename to data/elementary/themes/img/home_inset.png diff --git a/legacy/elementary/data/themes/img/horiz_bar_inset.png b/data/elementary/themes/img/horiz_bar_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/horiz_bar_inset.png rename to data/elementary/themes/img/horiz_bar_inset.png diff --git a/legacy/elementary/data/themes/img/horiz_glow_run.png b/data/elementary/themes/img/horiz_glow_run.png similarity index 100% rename from legacy/elementary/data/themes/img/horiz_glow_run.png rename to data/elementary/themes/img/horiz_glow_run.png diff --git a/legacy/elementary/data/themes/img/horiz_glow_run_big.png b/data/elementary/themes/img/horiz_glow_run_big.png similarity index 100% rename from legacy/elementary/data/themes/img/horiz_glow_run_big.png rename to data/elementary/themes/img/horiz_glow_run_big.png diff --git a/legacy/elementary/data/themes/img/horiz_glow_run_rev.png b/data/elementary/themes/img/horiz_glow_run_rev.png similarity index 100% rename from legacy/elementary/data/themes/img/horiz_glow_run_rev.png rename to data/elementary/themes/img/horiz_glow_run_rev.png diff --git a/legacy/elementary/data/themes/img/horizontal_separated_bar_glow.png b/data/elementary/themes/img/horizontal_separated_bar_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/horizontal_separated_bar_glow.png rename to data/elementary/themes/img/horizontal_separated_bar_glow.png diff --git a/legacy/elementary/data/themes/img/horizontal_separated_bar_small_glow.png b/data/elementary/themes/img/horizontal_separated_bar_small_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/horizontal_separated_bar_small_glow.png rename to data/elementary/themes/img/horizontal_separated_bar_small_glow.png diff --git a/legacy/elementary/data/themes/img/ic_win_move.png b/data/elementary/themes/img/ic_win_move.png similarity index 100% rename from legacy/elementary/data/themes/img/ic_win_move.png rename to data/elementary/themes/img/ic_win_move.png diff --git a/legacy/elementary/data/themes/img/ic_win_resize.png b/data/elementary/themes/img/ic_win_resize.png similarity index 100% rename from legacy/elementary/data/themes/img/ic_win_resize.png rename to data/elementary/themes/img/ic_win_resize.png diff --git a/legacy/elementary/data/themes/img/icon_apps.png b/data/elementary/themes/img/icon_apps.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_apps.png rename to data/elementary/themes/img/icon_apps.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_down.png b/data/elementary/themes/img/icon_arrow_down.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_down.png rename to data/elementary/themes/img/icon_arrow_down.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_down_left.png b/data/elementary/themes/img/icon_arrow_down_left.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_down_left.png rename to data/elementary/themes/img/icon_arrow_down_left.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_down_right.png b/data/elementary/themes/img/icon_arrow_down_right.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_down_right.png rename to data/elementary/themes/img/icon_arrow_down_right.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_left.png b/data/elementary/themes/img/icon_arrow_left.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_left.png rename to data/elementary/themes/img/icon_arrow_left.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_right.png b/data/elementary/themes/img/icon_arrow_right.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_right.png rename to data/elementary/themes/img/icon_arrow_right.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_up.png b/data/elementary/themes/img/icon_arrow_up.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_up.png rename to data/elementary/themes/img/icon_arrow_up.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_up_left.png b/data/elementary/themes/img/icon_arrow_up_left.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_up_left.png rename to data/elementary/themes/img/icon_arrow_up_left.png diff --git a/legacy/elementary/data/themes/img/icon_arrow_up_right.png b/data/elementary/themes/img/icon_arrow_up_right.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_arrow_up_right.png rename to data/elementary/themes/img/icon_arrow_up_right.png diff --git a/legacy/elementary/data/themes/img/icon_border_border.png b/data/elementary/themes/img/icon_border_border.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_border.png rename to data/elementary/themes/img/icon_border_border.png diff --git a/legacy/elementary/data/themes/img/icon_border_close.png b/data/elementary/themes/img/icon_border_close.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_close.png rename to data/elementary/themes/img/icon_border_close.png diff --git a/legacy/elementary/data/themes/img/icon_border_kill.png b/data/elementary/themes/img/icon_border_kill.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_kill.png rename to data/elementary/themes/img/icon_border_kill.png diff --git a/legacy/elementary/data/themes/img/icon_border_lock.png b/data/elementary/themes/img/icon_border_lock.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_lock.png rename to data/elementary/themes/img/icon_border_lock.png diff --git a/legacy/elementary/data/themes/img/icon_border_maximize.png b/data/elementary/themes/img/icon_border_maximize.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_maximize.png rename to data/elementary/themes/img/icon_border_maximize.png diff --git a/legacy/elementary/data/themes/img/icon_border_minimize.png b/data/elementary/themes/img/icon_border_minimize.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_minimize.png rename to data/elementary/themes/img/icon_border_minimize.png diff --git a/legacy/elementary/data/themes/img/icon_border_more.png b/data/elementary/themes/img/icon_border_more.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_more.png rename to data/elementary/themes/img/icon_border_more.png diff --git a/legacy/elementary/data/themes/img/icon_border_move.png b/data/elementary/themes/img/icon_border_move.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_move.png rename to data/elementary/themes/img/icon_border_move.png diff --git a/legacy/elementary/data/themes/img/icon_border_pager.png b/data/elementary/themes/img/icon_border_pager.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_pager.png rename to data/elementary/themes/img/icon_border_pager.png diff --git a/legacy/elementary/data/themes/img/icon_border_pin.png b/data/elementary/themes/img/icon_border_pin.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_pin.png rename to data/elementary/themes/img/icon_border_pin.png diff --git a/legacy/elementary/data/themes/img/icon_border_properties.png b/data/elementary/themes/img/icon_border_properties.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_properties.png rename to data/elementary/themes/img/icon_border_properties.png diff --git a/legacy/elementary/data/themes/img/icon_border_remember.png b/data/elementary/themes/img/icon_border_remember.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_remember.png rename to data/elementary/themes/img/icon_border_remember.png diff --git a/legacy/elementary/data/themes/img/icon_border_resize.png b/data/elementary/themes/img/icon_border_resize.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_resize.png rename to data/elementary/themes/img/icon_border_resize.png diff --git a/legacy/elementary/data/themes/img/icon_border_sendto.png b/data/elementary/themes/img/icon_border_sendto.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_sendto.png rename to data/elementary/themes/img/icon_border_sendto.png diff --git a/legacy/elementary/data/themes/img/icon_border_shaded.png b/data/elementary/themes/img/icon_border_shaded.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_shaded.png rename to data/elementary/themes/img/icon_border_shaded.png diff --git a/legacy/elementary/data/themes/img/icon_border_skip.png b/data/elementary/themes/img/icon_border_skip.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_skip.png rename to data/elementary/themes/img/icon_border_skip.png diff --git a/legacy/elementary/data/themes/img/icon_border_stack_bot.png b/data/elementary/themes/img/icon_border_stack_bot.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_stack_bot.png rename to data/elementary/themes/img/icon_border_stack_bot.png diff --git a/legacy/elementary/data/themes/img/icon_border_stack_norm.png b/data/elementary/themes/img/icon_border_stack_norm.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_stack_norm.png rename to data/elementary/themes/img/icon_border_stack_norm.png diff --git a/legacy/elementary/data/themes/img/icon_border_stack_top.png b/data/elementary/themes/img/icon_border_stack_top.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_border_stack_top.png rename to data/elementary/themes/img/icon_border_stack_top.png diff --git a/legacy/elementary/data/themes/img/icon_chat.png b/data/elementary/themes/img/icon_chat.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_chat.png rename to data/elementary/themes/img/icon_chat.png diff --git a/legacy/elementary/data/themes/img/icon_clock.png b/data/elementary/themes/img/icon_clock.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_clock.png rename to data/elementary/themes/img/icon_clock.png diff --git a/legacy/elementary/data/themes/img/icon_close.png b/data/elementary/themes/img/icon_close.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_close.png rename to data/elementary/themes/img/icon_close.png diff --git a/legacy/elementary/data/themes/img/icon_delete.png b/data/elementary/themes/img/icon_delete.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_delete.png rename to data/elementary/themes/img/icon_delete.png diff --git a/legacy/elementary/data/themes/img/icon_edit.png b/data/elementary/themes/img/icon_edit.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_edit.png rename to data/elementary/themes/img/icon_edit.png diff --git a/legacy/elementary/data/themes/img/icon_eject.png b/data/elementary/themes/img/icon_eject.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_eject.png rename to data/elementary/themes/img/icon_eject.png diff --git a/legacy/elementary/data/themes/img/icon_eject_mono.png b/data/elementary/themes/img/icon_eject_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_eject_mono.png rename to data/elementary/themes/img/icon_eject_mono.png diff --git a/legacy/elementary/data/themes/img/icon_enlightenment.png b/data/elementary/themes/img/icon_enlightenment.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_enlightenment.png rename to data/elementary/themes/img/icon_enlightenment.png diff --git a/legacy/elementary/data/themes/img/icon_file.png b/data/elementary/themes/img/icon_file.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_file.png rename to data/elementary/themes/img/icon_file.png diff --git a/legacy/elementary/data/themes/img/icon_folder.png b/data/elementary/themes/img/icon_folder.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_folder.png rename to data/elementary/themes/img/icon_folder.png diff --git a/legacy/elementary/data/themes/img/icon_forward.png b/data/elementary/themes/img/icon_forward.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_forward.png rename to data/elementary/themes/img/icon_forward.png diff --git a/legacy/elementary/data/themes/img/icon_forward_mono.png b/data/elementary/themes/img/icon_forward_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_forward_mono.png rename to data/elementary/themes/img/icon_forward_mono.png diff --git a/legacy/elementary/data/themes/img/icon_head.png b/data/elementary/themes/img/icon_head.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_head.png rename to data/elementary/themes/img/icon_head.png diff --git a/legacy/elementary/data/themes/img/icon_home.png b/data/elementary/themes/img/icon_home.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_home.png rename to data/elementary/themes/img/icon_home.png diff --git a/legacy/elementary/data/themes/img/icon_info.png b/data/elementary/themes/img/icon_info.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_info.png rename to data/elementary/themes/img/icon_info.png diff --git a/legacy/elementary/data/themes/img/icon_info_mono.png b/data/elementary/themes/img/icon_info_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_info_mono.png rename to data/elementary/themes/img/icon_info_mono.png diff --git a/legacy/elementary/data/themes/img/icon_mute.png b/data/elementary/themes/img/icon_mute.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_mute.png rename to data/elementary/themes/img/icon_mute.png diff --git a/legacy/elementary/data/themes/img/icon_mute_mono.png b/data/elementary/themes/img/icon_mute_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_mute_mono.png rename to data/elementary/themes/img/icon_mute_mono.png diff --git a/legacy/elementary/data/themes/img/icon_next.png b/data/elementary/themes/img/icon_next.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_next.png rename to data/elementary/themes/img/icon_next.png diff --git a/legacy/elementary/data/themes/img/icon_next_mono.png b/data/elementary/themes/img/icon_next_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_next_mono.png rename to data/elementary/themes/img/icon_next_mono.png diff --git a/legacy/elementary/data/themes/img/icon_pause.png b/data/elementary/themes/img/icon_pause.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_pause.png rename to data/elementary/themes/img/icon_pause.png diff --git a/legacy/elementary/data/themes/img/icon_pause_mono.png b/data/elementary/themes/img/icon_pause_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_pause_mono.png rename to data/elementary/themes/img/icon_pause_mono.png diff --git a/legacy/elementary/data/themes/img/icon_play.png b/data/elementary/themes/img/icon_play.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_play.png rename to data/elementary/themes/img/icon_play.png diff --git a/legacy/elementary/data/themes/img/icon_play_mono.png b/data/elementary/themes/img/icon_play_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_play_mono.png rename to data/elementary/themes/img/icon_play_mono.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-applications-personal.png b/data/elementary/themes/img/icon_preferences-applications-personal.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-applications-personal.png rename to data/elementary/themes/img/icon_preferences-applications-personal.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-applications-screen-lock.png b/data/elementary/themes/img/icon_preferences-applications-screen-lock.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-applications-screen-lock.png rename to data/elementary/themes/img/icon_preferences-applications-screen-lock.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-applications-screen-unlock.png b/data/elementary/themes/img/icon_preferences-applications-screen-unlock.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-applications-screen-unlock.png rename to data/elementary/themes/img/icon_preferences-applications-screen-unlock.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-composite.png b/data/elementary/themes/img/icon_preferences-composite.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-composite.png rename to data/elementary/themes/img/icon_preferences-composite.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-desklock-locale.png b/data/elementary/themes/img/icon_preferences-desklock-locale.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-desklock-locale.png rename to data/elementary/themes/img/icon_preferences-desklock-locale.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-desktop-environments.png b/data/elementary/themes/img/icon_preferences-desktop-environments.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-desktop-environments.png rename to data/elementary/themes/img/icon_preferences-desktop-environments.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-desktop-signal-bindings.png b/data/elementary/themes/img/icon_preferences-desktop-signal-bindings.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-desktop-signal-bindings.png rename to data/elementary/themes/img/icon_preferences-desktop-signal-bindings.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-interaction.png b/data/elementary/themes/img/icon_preferences-interaction.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-interaction.png rename to data/elementary/themes/img/icon_preferences-interaction.png diff --git a/legacy/elementary/data/themes/img/icon_preferences-variables.png b/data/elementary/themes/img/icon_preferences-variables.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_preferences-variables.png rename to data/elementary/themes/img/icon_preferences-variables.png diff --git a/legacy/elementary/data/themes/img/icon_prev.png b/data/elementary/themes/img/icon_prev.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_prev.png rename to data/elementary/themes/img/icon_prev.png diff --git a/legacy/elementary/data/themes/img/icon_prev_mono.png b/data/elementary/themes/img/icon_prev_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_prev_mono.png rename to data/elementary/themes/img/icon_prev_mono.png diff --git a/legacy/elementary/data/themes/img/icon_refresh.png b/data/elementary/themes/img/icon_refresh.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_refresh.png rename to data/elementary/themes/img/icon_refresh.png diff --git a/legacy/elementary/data/themes/img/icon_rewind.png b/data/elementary/themes/img/icon_rewind.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_rewind.png rename to data/elementary/themes/img/icon_rewind.png diff --git a/legacy/elementary/data/themes/img/icon_rewind_mono.png b/data/elementary/themes/img/icon_rewind_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_rewind_mono.png rename to data/elementary/themes/img/icon_rewind_mono.png diff --git a/legacy/elementary/data/themes/img/icon_search.png b/data/elementary/themes/img/icon_search.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_search.png rename to data/elementary/themes/img/icon_search.png diff --git a/legacy/elementary/data/themes/img/icon_spanner.png b/data/elementary/themes/img/icon_spanner.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_spanner.png rename to data/elementary/themes/img/icon_spanner.png diff --git a/legacy/elementary/data/themes/img/icon_splat.png b/data/elementary/themes/img/icon_splat.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_splat.png rename to data/elementary/themes/img/icon_splat.png diff --git a/legacy/elementary/data/themes/img/icon_splat_half.png b/data/elementary/themes/img/icon_splat_half.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_splat_half.png rename to data/elementary/themes/img/icon_splat_half.png diff --git a/legacy/elementary/data/themes/img/icon_stop.png b/data/elementary/themes/img/icon_stop.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_stop.png rename to data/elementary/themes/img/icon_stop.png diff --git a/legacy/elementary/data/themes/img/icon_stop_mono.png b/data/elementary/themes/img/icon_stop_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_stop_mono.png rename to data/elementary/themes/img/icon_stop_mono.png diff --git a/legacy/elementary/data/themes/img/icon_system-lock-screen.png b/data/elementary/themes/img/icon_system-lock-screen.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-lock-screen.png rename to data/elementary/themes/img/icon_system-lock-screen.png diff --git a/legacy/elementary/data/themes/img/icon_system-log-out.png b/data/elementary/themes/img/icon_system-log-out.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-log-out.png rename to data/elementary/themes/img/icon_system-log-out.png diff --git a/legacy/elementary/data/themes/img/icon_system-restart.png b/data/elementary/themes/img/icon_system-restart.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-restart.png rename to data/elementary/themes/img/icon_system-restart.png diff --git a/legacy/elementary/data/themes/img/icon_system-shutdown.png b/data/elementary/themes/img/icon_system-shutdown.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-shutdown.png rename to data/elementary/themes/img/icon_system-shutdown.png diff --git a/legacy/elementary/data/themes/img/icon_system-suspend-hibernate.png b/data/elementary/themes/img/icon_system-suspend-hibernate.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-suspend-hibernate.png rename to data/elementary/themes/img/icon_system-suspend-hibernate.png diff --git a/legacy/elementary/data/themes/img/icon_system-suspend.png b/data/elementary/themes/img/icon_system-suspend.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system-suspend.png rename to data/elementary/themes/img/icon_system-suspend.png diff --git a/legacy/elementary/data/themes/img/icon_system.png b/data/elementary/themes/img/icon_system.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_system.png rename to data/elementary/themes/img/icon_system.png diff --git a/legacy/elementary/data/themes/img/icon_volume.png b/data/elementary/themes/img/icon_volume.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_volume.png rename to data/elementary/themes/img/icon_volume.png diff --git a/legacy/elementary/data/themes/img/icon_volume_mono.png b/data/elementary/themes/img/icon_volume_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_volume_mono.png rename to data/elementary/themes/img/icon_volume_mono.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_center.png b/data/elementary/themes/img/icon_wallpaper_center.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_center.png rename to data/elementary/themes/img/icon_wallpaper_center.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_fill.png b/data/elementary/themes/img/icon_wallpaper_fill.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_fill.png rename to data/elementary/themes/img/icon_wallpaper_fill.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_pan.png b/data/elementary/themes/img/icon_wallpaper_pan.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_pan.png rename to data/elementary/themes/img/icon_wallpaper_pan.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_stretch.png b/data/elementary/themes/img/icon_wallpaper_stretch.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_stretch.png rename to data/elementary/themes/img/icon_wallpaper_stretch.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_tile.png b/data/elementary/themes/img/icon_wallpaper_tile.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_tile.png rename to data/elementary/themes/img/icon_wallpaper_tile.png diff --git a/legacy/elementary/data/themes/img/icon_wallpaper_within.png b/data/elementary/themes/img/icon_wallpaper_within.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_wallpaper_within.png rename to data/elementary/themes/img/icon_wallpaper_within.png diff --git a/legacy/elementary/data/themes/img/icon_warning.png b/data/elementary/themes/img/icon_warning.png similarity index 100% rename from legacy/elementary/data/themes/img/icon_warning.png rename to data/elementary/themes/img/icon_warning.png diff --git a/legacy/elementary/data/themes/img/img_example_1.png b/data/elementary/themes/img/img_example_1.png similarity index 100% rename from legacy/elementary/data/themes/img/img_example_1.png rename to data/elementary/themes/img/img_example_1.png diff --git a/legacy/elementary/data/themes/img/img_example_2.png b/data/elementary/themes/img/img_example_2.png similarity index 100% rename from legacy/elementary/data/themes/img/img_example_2.png rename to data/elementary/themes/img/img_example_2.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_base.png b/data/elementary/themes/img/inset_bar_horiz_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_base.png rename to data/elementary/themes/img/inset_bar_horiz_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_base.png b/data/elementary/themes/img/inset_bar_horiz_glow_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_base.png rename to data/elementary/themes/img/inset_bar_horiz_glow_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_base_double.png b/data/elementary/themes/img/inset_bar_horiz_glow_base_double.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_base_double.png rename to data/elementary/themes/img/inset_bar_horiz_glow_base_double.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_base.png b/data/elementary/themes/img/inset_bar_horiz_glow_inv_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_base.png rename to data/elementary/themes/img/inset_bar_horiz_glow_inv_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_base_double.png b/data/elementary/themes/img/inset_bar_horiz_glow_inv_base_double.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_base_double.png rename to data/elementary/themes/img/inset_bar_horiz_glow_inv_base_double.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_light.png b/data/elementary/themes/img/inset_bar_horiz_glow_inv_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_inv_light.png rename to data/elementary/themes/img/inset_bar_horiz_glow_inv_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_light.png b/data/elementary/themes/img/inset_bar_horiz_glow_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_light.png rename to data/elementary/themes/img/inset_bar_horiz_glow_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_mid_base.png b/data/elementary/themes/img/inset_bar_horiz_glow_mid_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_mid_base.png rename to data/elementary/themes/img/inset_bar_horiz_glow_mid_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_glow_mid_light.png b/data/elementary/themes/img/inset_bar_horiz_glow_mid_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_glow_mid_light.png rename to data/elementary/themes/img/inset_bar_horiz_glow_mid_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_inside_base.png b/data/elementary/themes/img/inset_bar_horiz_inside_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_inside_base.png rename to data/elementary/themes/img/inset_bar_horiz_inside_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_inside_light.png b/data/elementary/themes/img/inset_bar_horiz_inside_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_inside_light.png rename to data/elementary/themes/img/inset_bar_horiz_inside_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_horiz_light.png b/data/elementary/themes/img/inset_bar_horiz_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_horiz_light.png rename to data/elementary/themes/img/inset_bar_horiz_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_base.png b/data/elementary/themes/img/inset_bar_vert_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_base.png rename to data/elementary/themes/img/inset_bar_vert_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_base.png b/data/elementary/themes/img/inset_bar_vert_glow_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_base.png rename to data/elementary/themes/img/inset_bar_vert_glow_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_base_double.png b/data/elementary/themes/img/inset_bar_vert_glow_base_double.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_base_double.png rename to data/elementary/themes/img/inset_bar_vert_glow_base_double.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_base.png b/data/elementary/themes/img/inset_bar_vert_glow_inv_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_base.png rename to data/elementary/themes/img/inset_bar_vert_glow_inv_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_base_double.png b/data/elementary/themes/img/inset_bar_vert_glow_inv_base_double.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_base_double.png rename to data/elementary/themes/img/inset_bar_vert_glow_inv_base_double.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_light.png b/data/elementary/themes/img/inset_bar_vert_glow_inv_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_inv_light.png rename to data/elementary/themes/img/inset_bar_vert_glow_inv_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_light.png b/data/elementary/themes/img/inset_bar_vert_glow_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_light.png rename to data/elementary/themes/img/inset_bar_vert_glow_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_mid_base.png b/data/elementary/themes/img/inset_bar_vert_glow_mid_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_mid_base.png rename to data/elementary/themes/img/inset_bar_vert_glow_mid_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_glow_mid_light.png b/data/elementary/themes/img/inset_bar_vert_glow_mid_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_glow_mid_light.png rename to data/elementary/themes/img/inset_bar_vert_glow_mid_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_inside_base.png b/data/elementary/themes/img/inset_bar_vert_inside_base.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_inside_base.png rename to data/elementary/themes/img/inset_bar_vert_inside_base.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_inside_light.png b/data/elementary/themes/img/inset_bar_vert_inside_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_inside_light.png rename to data/elementary/themes/img/inset_bar_vert_inside_light.png diff --git a/legacy/elementary/data/themes/img/inset_bar_vert_light.png b/data/elementary/themes/img/inset_bar_vert_light.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_bar_vert_light.png rename to data/elementary/themes/img/inset_bar_vert_light.png diff --git a/legacy/elementary/data/themes/img/inset_circle_tiny.png b/data/elementary/themes/img/inset_circle_tiny.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_circle_tiny.png rename to data/elementary/themes/img/inset_circle_tiny.png diff --git a/legacy/elementary/data/themes/img/inset_round_hilight.png b/data/elementary/themes/img/inset_round_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_round_hilight.png rename to data/elementary/themes/img/inset_round_hilight.png diff --git a/legacy/elementary/data/themes/img/inset_round_shading.png b/data/elementary/themes/img/inset_round_shading.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_round_shading.png rename to data/elementary/themes/img/inset_round_shading.png diff --git a/legacy/elementary/data/themes/img/inset_round_shadow.png b/data/elementary/themes/img/inset_round_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_round_shadow.png rename to data/elementary/themes/img/inset_round_shadow.png diff --git a/legacy/elementary/data/themes/img/inset_shadow.png b/data/elementary/themes/img/inset_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_shadow.png rename to data/elementary/themes/img/inset_shadow.png diff --git a/legacy/elementary/data/themes/img/inset_shadow_circle_tiny.png b/data/elementary/themes/img/inset_shadow_circle_tiny.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_shadow_circle_tiny.png rename to data/elementary/themes/img/inset_shadow_circle_tiny.png diff --git a/legacy/elementary/data/themes/img/inset_shadow_tiny.png b/data/elementary/themes/img/inset_shadow_tiny.png similarity index 100% rename from legacy/elementary/data/themes/img/inset_shadow_tiny.png rename to data/elementary/themes/img/inset_shadow_tiny.png diff --git a/legacy/elementary/data/themes/img/kbd_glow.png b/data/elementary/themes/img/kbd_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/kbd_glow.png rename to data/elementary/themes/img/kbd_glow.png diff --git a/legacy/elementary/data/themes/img/kbd_hilight.png b/data/elementary/themes/img/kbd_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/kbd_hilight.png rename to data/elementary/themes/img/kbd_hilight.png diff --git a/legacy/elementary/data/themes/img/kbd_inset.png b/data/elementary/themes/img/kbd_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/kbd_inset.png rename to data/elementary/themes/img/kbd_inset.png diff --git a/legacy/elementary/data/themes/img/knob_round_busy.png b/data/elementary/themes/img/knob_round_busy.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_round_busy.png rename to data/elementary/themes/img/knob_round_busy.png diff --git a/legacy/elementary/data/themes/img/knob_round_small_busy.png b/data/elementary/themes/img/knob_round_small_busy.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_round_small_busy.png rename to data/elementary/themes/img/knob_round_small_busy.png diff --git a/legacy/elementary/data/themes/img/knob_round_small_normal.png b/data/elementary/themes/img/knob_round_small_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_round_small_normal.png rename to data/elementary/themes/img/knob_round_small_normal.png diff --git a/legacy/elementary/data/themes/img/knob_round_small_selected.png b/data/elementary/themes/img/knob_round_small_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_round_small_selected.png rename to data/elementary/themes/img/knob_round_small_selected.png diff --git a/legacy/elementary/data/themes/img/knob_sz_04.png b/data/elementary/themes/img/knob_sz_04.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_04.png rename to data/elementary/themes/img/knob_sz_04.png diff --git a/legacy/elementary/data/themes/img/knob_sz_06.png b/data/elementary/themes/img/knob_sz_06.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_06.png rename to data/elementary/themes/img/knob_sz_06.png diff --git a/legacy/elementary/data/themes/img/knob_sz_08.png b/data/elementary/themes/img/knob_sz_08.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_08.png rename to data/elementary/themes/img/knob_sz_08.png diff --git a/legacy/elementary/data/themes/img/knob_sz_10.png b/data/elementary/themes/img/knob_sz_10.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_10.png rename to data/elementary/themes/img/knob_sz_10.png diff --git a/legacy/elementary/data/themes/img/knob_sz_12.png b/data/elementary/themes/img/knob_sz_12.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_12.png rename to data/elementary/themes/img/knob_sz_12.png diff --git a/legacy/elementary/data/themes/img/knob_sz_14.png b/data/elementary/themes/img/knob_sz_14.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_14.png rename to data/elementary/themes/img/knob_sz_14.png diff --git a/legacy/elementary/data/themes/img/knob_sz_16.png b/data/elementary/themes/img/knob_sz_16.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_16.png rename to data/elementary/themes/img/knob_sz_16.png diff --git a/legacy/elementary/data/themes/img/knob_sz_18.png b/data/elementary/themes/img/knob_sz_18.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_18.png rename to data/elementary/themes/img/knob_sz_18.png diff --git a/legacy/elementary/data/themes/img/knob_sz_20.png b/data/elementary/themes/img/knob_sz_20.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_20.png rename to data/elementary/themes/img/knob_sz_20.png diff --git a/legacy/elementary/data/themes/img/knob_sz_22.png b/data/elementary/themes/img/knob_sz_22.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_22.png rename to data/elementary/themes/img/knob_sz_22.png diff --git a/legacy/elementary/data/themes/img/knob_sz_24.png b/data/elementary/themes/img/knob_sz_24.png similarity index 100% rename from legacy/elementary/data/themes/img/knob_sz_24.png rename to data/elementary/themes/img/knob_sz_24.png diff --git a/legacy/elementary/data/themes/img/led_dark.png b/data/elementary/themes/img/led_dark.png similarity index 100% rename from legacy/elementary/data/themes/img/led_dark.png rename to data/elementary/themes/img/led_dark.png diff --git a/legacy/elementary/data/themes/img/led_dot_white.png b/data/elementary/themes/img/led_dot_white.png similarity index 100% rename from legacy/elementary/data/themes/img/led_dot_white.png rename to data/elementary/themes/img/led_dot_white.png diff --git a/legacy/elementary/data/themes/img/led_light.png b/data/elementary/themes/img/led_light.png similarity index 100% rename from legacy/elementary/data/themes/img/led_light.png rename to data/elementary/themes/img/led_light.png diff --git a/legacy/elementary/data/themes/img/led_red_light.png b/data/elementary/themes/img/led_red_light.png similarity index 100% rename from legacy/elementary/data/themes/img/led_red_light.png rename to data/elementary/themes/img/led_red_light.png diff --git a/legacy/elementary/data/themes/img/led_square_base.png b/data/elementary/themes/img/led_square_base.png similarity index 100% rename from legacy/elementary/data/themes/img/led_square_base.png rename to data/elementary/themes/img/led_square_base.png diff --git a/legacy/elementary/data/themes/img/led_square_glow.png b/data/elementary/themes/img/led_square_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/led_square_glow.png rename to data/elementary/themes/img/led_square_glow.png diff --git a/legacy/elementary/data/themes/img/led_square_shading.png b/data/elementary/themes/img/led_square_shading.png similarity index 100% rename from legacy/elementary/data/themes/img/led_square_shading.png rename to data/elementary/themes/img/led_square_shading.png diff --git a/legacy/elementary/data/themes/img/led_square_shadow.png b/data/elementary/themes/img/led_square_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/led_square_shadow.png rename to data/elementary/themes/img/led_square_shadow.png diff --git a/legacy/elementary/data/themes/img/led_square_shine.png b/data/elementary/themes/img/led_square_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/led_square_shine.png rename to data/elementary/themes/img/led_square_shine.png diff --git a/legacy/elementary/data/themes/img/led_strobe.png b/data/elementary/themes/img/led_strobe.png similarity index 100% rename from legacy/elementary/data/themes/img/led_strobe.png rename to data/elementary/themes/img/led_strobe.png diff --git a/legacy/elementary/data/themes/img/led_tiny_blue.png b/data/elementary/themes/img/led_tiny_blue.png similarity index 100% rename from legacy/elementary/data/themes/img/led_tiny_blue.png rename to data/elementary/themes/img/led_tiny_blue.png diff --git a/legacy/elementary/data/themes/img/led_tiny_green.png b/data/elementary/themes/img/led_tiny_green.png similarity index 100% rename from legacy/elementary/data/themes/img/led_tiny_green.png rename to data/elementary/themes/img/led_tiny_green.png diff --git a/legacy/elementary/data/themes/img/led_tiny_orange.png b/data/elementary/themes/img/led_tiny_orange.png similarity index 100% rename from legacy/elementary/data/themes/img/led_tiny_orange.png rename to data/elementary/themes/img/led_tiny_orange.png diff --git a/legacy/elementary/data/themes/img/lock_insecure.png b/data/elementary/themes/img/lock_insecure.png similarity index 100% rename from legacy/elementary/data/themes/img/lock_insecure.png rename to data/elementary/themes/img/lock_insecure.png diff --git a/legacy/elementary/data/themes/img/lock_locked.png b/data/elementary/themes/img/lock_locked.png similarity index 100% rename from legacy/elementary/data/themes/img/lock_locked.png rename to data/elementary/themes/img/lock_locked.png diff --git a/legacy/elementary/data/themes/img/logo_blue_bottom.png b/data/elementary/themes/img/logo_blue_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/logo_blue_bottom.png rename to data/elementary/themes/img/logo_blue_bottom.png diff --git a/legacy/elementary/data/themes/img/logo_blue_small.png b/data/elementary/themes/img/logo_blue_small.png similarity index 100% rename from legacy/elementary/data/themes/img/logo_blue_small.png rename to data/elementary/themes/img/logo_blue_small.png diff --git a/legacy/elementary/data/themes/img/logo_blue_small_glow.png b/data/elementary/themes/img/logo_blue_small_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/logo_blue_small_glow.png rename to data/elementary/themes/img/logo_blue_small_glow.png diff --git a/legacy/elementary/data/themes/img/map_circle.png b/data/elementary/themes/img/map_circle.png similarity index 100% rename from legacy/elementary/data/themes/img/map_circle.png rename to data/elementary/themes/img/map_circle.png diff --git a/legacy/elementary/data/themes/img/map_marker.png b/data/elementary/themes/img/map_marker.png similarity index 100% rename from legacy/elementary/data/themes/img/map_marker.png rename to data/elementary/themes/img/map_marker.png diff --git a/legacy/elementary/data/themes/img/map_scale.png b/data/elementary/themes/img/map_scale.png similarity index 100% rename from legacy/elementary/data/themes/img/map_scale.png rename to data/elementary/themes/img/map_scale.png diff --git a/legacy/elementary/data/themes/img/media_busy_progress.png b/data/elementary/themes/img/media_busy_progress.png similarity index 100% rename from legacy/elementary/data/themes/img/media_busy_progress.png rename to data/elementary/themes/img/media_busy_progress.png diff --git a/legacy/elementary/data/themes/img/mini_blue_glow_arrow_0.png b/data/elementary/themes/img/mini_blue_glow_arrow_0.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_blue_glow_arrow_0.png rename to data/elementary/themes/img/mini_blue_glow_arrow_0.png diff --git a/legacy/elementary/data/themes/img/mini_blue_glow_arrow_1.png b/data/elementary/themes/img/mini_blue_glow_arrow_1.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_blue_glow_arrow_1.png rename to data/elementary/themes/img/mini_blue_glow_arrow_1.png diff --git a/legacy/elementary/data/themes/img/mini_blue_glow_arrow_2.png b/data/elementary/themes/img/mini_blue_glow_arrow_2.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_blue_glow_arrow_2.png rename to data/elementary/themes/img/mini_blue_glow_arrow_2.png diff --git a/legacy/elementary/data/themes/img/mini_blue_glow_arrow_3.png b/data/elementary/themes/img/mini_blue_glow_arrow_3.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_blue_glow_arrow_3.png rename to data/elementary/themes/img/mini_blue_glow_arrow_3.png diff --git a/legacy/elementary/data/themes/img/mini_box_bevel_shadow.png b/data/elementary/themes/img/mini_box_bevel_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_box_bevel_shadow.png rename to data/elementary/themes/img/mini_box_bevel_shadow.png diff --git a/legacy/elementary/data/themes/img/mini_box_glow.png b/data/elementary/themes/img/mini_box_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/mini_box_glow.png rename to data/elementary/themes/img/mini_box_glow.png diff --git a/legacy/elementary/data/themes/img/music_control_icon.png b/data/elementary/themes/img/music_control_icon.png similarity index 100% rename from legacy/elementary/data/themes/img/music_control_icon.png rename to data/elementary/themes/img/music_control_icon.png diff --git a/legacy/elementary/data/themes/img/outline_glow.png b/data/elementary/themes/img/outline_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/outline_glow.png rename to data/elementary/themes/img/outline_glow.png diff --git a/legacy/elementary/data/themes/img/packagekit_base.png b/data/elementary/themes/img/packagekit_base.png similarity index 100% rename from legacy/elementary/data/themes/img/packagekit_base.png rename to data/elementary/themes/img/packagekit_base.png diff --git a/legacy/elementary/data/themes/img/pointer.png b/data/elementary/themes/img/pointer.png similarity index 100% rename from legacy/elementary/data/themes/img/pointer.png rename to data/elementary/themes/img/pointer.png diff --git a/legacy/elementary/data/themes/img/pointer_entry_bar.png b/data/elementary/themes/img/pointer_entry_bar.png similarity index 100% rename from legacy/elementary/data/themes/img/pointer_entry_bar.png rename to data/elementary/themes/img/pointer_entry_bar.png diff --git a/legacy/elementary/data/themes/img/pointer_glow.png b/data/elementary/themes/img/pointer_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/pointer_glow.png rename to data/elementary/themes/img/pointer_glow.png diff --git a/legacy/elementary/data/themes/img/pointer_hand1.png b/data/elementary/themes/img/pointer_hand1.png similarity index 100% rename from legacy/elementary/data/themes/img/pointer_hand1.png rename to data/elementary/themes/img/pointer_hand1.png diff --git a/legacy/elementary/data/themes/img/pointer_mono.png b/data/elementary/themes/img/pointer_mono.png similarity index 100% rename from legacy/elementary/data/themes/img/pointer_mono.png rename to data/elementary/themes/img/pointer_mono.png diff --git a/legacy/elementary/data/themes/img/ring_shadow.png b/data/elementary/themes/img/ring_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/ring_shadow.png rename to data/elementary/themes/img/ring_shadow.png diff --git a/legacy/elementary/data/themes/img/ring_white_blue_glow.png b/data/elementary/themes/img/ring_white_blue_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/ring_white_blue_glow.png rename to data/elementary/themes/img/ring_white_blue_glow.png diff --git a/legacy/elementary/data/themes/img/ring_white_middle.png b/data/elementary/themes/img/ring_white_middle.png similarity index 100% rename from legacy/elementary/data/themes/img/ring_white_middle.png rename to data/elementary/themes/img/ring_white_middle.png diff --git a/legacy/elementary/data/themes/img/rounded_square.png b/data/elementary/themes/img/rounded_square.png similarity index 100% rename from legacy/elementary/data/themes/img/rounded_square.png rename to data/elementary/themes/img/rounded_square.png diff --git a/legacy/elementary/data/themes/img/runner_glow_horiz.png b/data/elementary/themes/img/runner_glow_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/runner_glow_horiz.png rename to data/elementary/themes/img/runner_glow_horiz.png diff --git a/legacy/elementary/data/themes/img/runner_glow_vert.png b/data/elementary/themes/img/runner_glow_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/runner_glow_vert.png rename to data/elementary/themes/img/runner_glow_vert.png diff --git a/legacy/elementary/data/themes/img/runner_horiz.png b/data/elementary/themes/img/runner_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/runner_horiz.png rename to data/elementary/themes/img/runner_horiz.png diff --git a/legacy/elementary/data/themes/img/runner_vert.png b/data/elementary/themes/img/runner_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/runner_vert.png rename to data/elementary/themes/img/runner_vert.png diff --git a/legacy/elementary/data/themes/img/screen_base.png b/data/elementary/themes/img/screen_base.png similarity index 100% rename from legacy/elementary/data/themes/img/screen_base.png rename to data/elementary/themes/img/screen_base.png diff --git a/legacy/elementary/data/themes/img/screen_bg.png b/data/elementary/themes/img/screen_bg.png similarity index 100% rename from legacy/elementary/data/themes/img/screen_bg.png rename to data/elementary/themes/img/screen_bg.png diff --git a/legacy/elementary/data/themes/img/screen_circular_shadow.png b/data/elementary/themes/img/screen_circular_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/screen_circular_shadow.png rename to data/elementary/themes/img/screen_circular_shadow.png diff --git a/legacy/elementary/data/themes/img/screen_fg.png b/data/elementary/themes/img/screen_fg.png similarity index 100% rename from legacy/elementary/data/themes/img/screen_fg.png rename to data/elementary/themes/img/screen_fg.png diff --git a/legacy/elementary/data/themes/img/separator_horiz.png b/data/elementary/themes/img/separator_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/separator_horiz.png rename to data/elementary/themes/img/separator_horiz.png diff --git a/legacy/elementary/data/themes/img/shadow_angled_in_light.png b/data/elementary/themes/img/shadow_angled_in_light.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_angled_in_light.png rename to data/elementary/themes/img/shadow_angled_in_light.png diff --git a/legacy/elementary/data/themes/img/shadow_angled_in_sides.png b/data/elementary/themes/img/shadow_angled_in_sides.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_angled_in_sides.png rename to data/elementary/themes/img/shadow_angled_in_sides.png diff --git a/legacy/elementary/data/themes/img/shadow_horiz.png b/data/elementary/themes/img/shadow_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_horiz.png rename to data/elementary/themes/img/shadow_horiz.png diff --git a/legacy/elementary/data/themes/img/shadow_inset_bevels.png b/data/elementary/themes/img/shadow_inset_bevels.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_inset_bevels.png rename to data/elementary/themes/img/shadow_inset_bevels.png diff --git a/legacy/elementary/data/themes/img/shadow_inset_light.png b/data/elementary/themes/img/shadow_inset_light.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_inset_light.png rename to data/elementary/themes/img/shadow_inset_light.png diff --git a/legacy/elementary/data/themes/img/shadow_rounded_horiz.png b/data/elementary/themes/img/shadow_rounded_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_rounded_horiz.png rename to data/elementary/themes/img/shadow_rounded_horiz.png diff --git a/legacy/elementary/data/themes/img/shadow_rounded_vert.png b/data/elementary/themes/img/shadow_rounded_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_rounded_vert.png rename to data/elementary/themes/img/shadow_rounded_vert.png diff --git a/legacy/elementary/data/themes/img/shadow_square_tiny.png b/data/elementary/themes/img/shadow_square_tiny.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_square_tiny.png rename to data/elementary/themes/img/shadow_square_tiny.png diff --git a/legacy/elementary/data/themes/img/shadow_vert.png b/data/elementary/themes/img/shadow_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_vert.png rename to data/elementary/themes/img/shadow_vert.png diff --git a/legacy/elementary/data/themes/img/shadow_vertical_dark.png b/data/elementary/themes/img/shadow_vertical_dark.png similarity index 100% rename from legacy/elementary/data/themes/img/shadow_vertical_dark.png rename to data/elementary/themes/img/shadow_vertical_dark.png diff --git a/legacy/elementary/data/themes/img/shine.png b/data/elementary/themes/img/shine.png similarity index 100% rename from legacy/elementary/data/themes/img/shine.png rename to data/elementary/themes/img/shine.png diff --git a/legacy/elementary/data/themes/img/slider_run_base_horiz.png b/data/elementary/themes/img/slider_run_base_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_base_horiz.png rename to data/elementary/themes/img/slider_run_base_horiz.png diff --git a/legacy/elementary/data/themes/img/slider_run_base_light_horiz.png b/data/elementary/themes/img/slider_run_base_light_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_base_light_horiz.png rename to data/elementary/themes/img/slider_run_base_light_horiz.png diff --git a/legacy/elementary/data/themes/img/slider_run_base_light_vert.png b/data/elementary/themes/img/slider_run_base_light_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_base_light_vert.png rename to data/elementary/themes/img/slider_run_base_light_vert.png diff --git a/legacy/elementary/data/themes/img/slider_run_base_vert.png b/data/elementary/themes/img/slider_run_base_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_base_vert.png rename to data/elementary/themes/img/slider_run_base_vert.png diff --git a/legacy/elementary/data/themes/img/slider_run_bevel_horiz.png b/data/elementary/themes/img/slider_run_bevel_horiz.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_bevel_horiz.png rename to data/elementary/themes/img/slider_run_bevel_horiz.png diff --git a/legacy/elementary/data/themes/img/slider_run_bevel_vert.png b/data/elementary/themes/img/slider_run_bevel_vert.png similarity index 100% rename from legacy/elementary/data/themes/img/slider_run_bevel_vert.png rename to data/elementary/themes/img/slider_run_bevel_vert.png diff --git a/legacy/elementary/data/themes/img/slot_horiz_bottom.png b/data/elementary/themes/img/slot_horiz_bottom.png similarity index 100% rename from legacy/elementary/data/themes/img/slot_horiz_bottom.png rename to data/elementary/themes/img/slot_horiz_bottom.png diff --git a/legacy/elementary/data/themes/img/slot_horiz_top.png b/data/elementary/themes/img/slot_horiz_top.png similarity index 100% rename from legacy/elementary/data/themes/img/slot_horiz_top.png rename to data/elementary/themes/img/slot_horiz_top.png diff --git a/legacy/elementary/data/themes/img/spanner_glow.png b/data/elementary/themes/img/spanner_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/spanner_glow.png rename to data/elementary/themes/img/spanner_glow.png diff --git a/legacy/elementary/data/themes/img/spanner_hilight.png b/data/elementary/themes/img/spanner_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/spanner_hilight.png rename to data/elementary/themes/img/spanner_hilight.png diff --git a/legacy/elementary/data/themes/img/spanner_inset.png b/data/elementary/themes/img/spanner_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/spanner_inset.png rename to data/elementary/themes/img/spanner_inset.png diff --git a/legacy/elementary/data/themes/img/speaker.png b/data/elementary/themes/img/speaker.png similarity index 100% rename from legacy/elementary/data/themes/img/speaker.png rename to data/elementary/themes/img/speaker.png diff --git a/legacy/elementary/data/themes/img/split_h_glow.png b/data/elementary/themes/img/split_h_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/split_h_glow.png rename to data/elementary/themes/img/split_h_glow.png diff --git a/legacy/elementary/data/themes/img/split_h_hilight.png b/data/elementary/themes/img/split_h_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/split_h_hilight.png rename to data/elementary/themes/img/split_h_hilight.png diff --git a/legacy/elementary/data/themes/img/split_h_inset.png b/data/elementary/themes/img/split_h_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/split_h_inset.png rename to data/elementary/themes/img/split_h_inset.png diff --git a/legacy/elementary/data/themes/img/split_none_glow.png b/data/elementary/themes/img/split_none_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/split_none_glow.png rename to data/elementary/themes/img/split_none_glow.png diff --git a/legacy/elementary/data/themes/img/split_none_hilight.png b/data/elementary/themes/img/split_none_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/split_none_hilight.png rename to data/elementary/themes/img/split_none_hilight.png diff --git a/legacy/elementary/data/themes/img/split_none_inset.png b/data/elementary/themes/img/split_none_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/split_none_inset.png rename to data/elementary/themes/img/split_none_inset.png diff --git a/legacy/elementary/data/themes/img/split_v_glow.png b/data/elementary/themes/img/split_v_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/split_v_glow.png rename to data/elementary/themes/img/split_v_glow.png diff --git a/legacy/elementary/data/themes/img/split_v_hilight.png b/data/elementary/themes/img/split_v_hilight.png similarity index 100% rename from legacy/elementary/data/themes/img/split_v_hilight.png rename to data/elementary/themes/img/split_v_hilight.png diff --git a/legacy/elementary/data/themes/img/split_v_inset.png b/data/elementary/themes/img/split_v_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/split_v_inset.png rename to data/elementary/themes/img/split_v_inset.png diff --git a/legacy/elementary/data/themes/img/sym_check_alum.png b/data/elementary/themes/img/sym_check_alum.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_check_alum.png rename to data/elementary/themes/img/sym_check_alum.png diff --git a/legacy/elementary/data/themes/img/sym_close_dark_normal.png b/data/elementary/themes/img/sym_close_dark_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_close_dark_normal.png rename to data/elementary/themes/img/sym_close_dark_normal.png diff --git a/legacy/elementary/data/themes/img/sym_close_dark_selected.png b/data/elementary/themes/img/sym_close_dark_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_close_dark_selected.png rename to data/elementary/themes/img/sym_close_dark_selected.png diff --git a/legacy/elementary/data/themes/img/sym_close_light_normal.png b/data/elementary/themes/img/sym_close_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_close_light_normal.png rename to data/elementary/themes/img/sym_close_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_close_light_selected.png b/data/elementary/themes/img/sym_close_light_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_close_light_selected.png rename to data/elementary/themes/img/sym_close_light_selected.png diff --git a/legacy/elementary/data/themes/img/sym_down_dark_normal.png b/data/elementary/themes/img/sym_down_dark_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_down_dark_normal.png rename to data/elementary/themes/img/sym_down_dark_normal.png diff --git a/legacy/elementary/data/themes/img/sym_down_dark_selected.png b/data/elementary/themes/img/sym_down_dark_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_down_dark_selected.png rename to data/elementary/themes/img/sym_down_dark_selected.png diff --git a/legacy/elementary/data/themes/img/sym_down_glow_normal.png b/data/elementary/themes/img/sym_down_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_down_glow_normal.png rename to data/elementary/themes/img/sym_down_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_down_light_normal.png b/data/elementary/themes/img/sym_down_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_down_light_normal.png rename to data/elementary/themes/img/sym_down_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_down_light_selected.png b/data/elementary/themes/img/sym_down_light_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_down_light_selected.png rename to data/elementary/themes/img/sym_down_light_selected.png diff --git a/legacy/elementary/data/themes/img/sym_heart_glow_normal.png b/data/elementary/themes/img/sym_heart_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_heart_glow_normal.png rename to data/elementary/themes/img/sym_heart_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_heart_light_normal.png b/data/elementary/themes/img/sym_heart_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_heart_light_normal.png rename to data/elementary/themes/img/sym_heart_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_icon_op_ask.png b/data/elementary/themes/img/sym_icon_op_ask.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_icon_op_ask.png rename to data/elementary/themes/img/sym_icon_op_ask.png diff --git a/legacy/elementary/data/themes/img/sym_icon_op_copy.png b/data/elementary/themes/img/sym_icon_op_copy.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_icon_op_copy.png rename to data/elementary/themes/img/sym_icon_op_copy.png diff --git a/legacy/elementary/data/themes/img/sym_icon_op_move.png b/data/elementary/themes/img/sym_icon_op_move.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_icon_op_move.png rename to data/elementary/themes/img/sym_icon_op_move.png diff --git a/legacy/elementary/data/themes/img/sym_left_dark_normal.png b/data/elementary/themes/img/sym_left_dark_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_left_dark_normal.png rename to data/elementary/themes/img/sym_left_dark_normal.png diff --git a/legacy/elementary/data/themes/img/sym_left_glow_normal.png b/data/elementary/themes/img/sym_left_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_left_glow_normal.png rename to data/elementary/themes/img/sym_left_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_left_light_normal.png b/data/elementary/themes/img/sym_left_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_left_light_normal.png rename to data/elementary/themes/img/sym_left_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_radio_alum.png b/data/elementary/themes/img/sym_radio_alum.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_radio_alum.png rename to data/elementary/themes/img/sym_radio_alum.png diff --git a/legacy/elementary/data/themes/img/sym_reload_glow_normal.png b/data/elementary/themes/img/sym_reload_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_reload_glow_normal.png rename to data/elementary/themes/img/sym_reload_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_reload_light_normal.png b/data/elementary/themes/img/sym_reload_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_reload_light_normal.png rename to data/elementary/themes/img/sym_reload_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_right_dark_normal.png b/data/elementary/themes/img/sym_right_dark_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_right_dark_normal.png rename to data/elementary/themes/img/sym_right_dark_normal.png diff --git a/legacy/elementary/data/themes/img/sym_right_glow_normal.png b/data/elementary/themes/img/sym_right_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_right_glow_normal.png rename to data/elementary/themes/img/sym_right_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_right_light_normal.png b/data/elementary/themes/img/sym_right_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_right_light_normal.png rename to data/elementary/themes/img/sym_right_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_up_dark_normal.png b/data/elementary/themes/img/sym_up_dark_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_up_dark_normal.png rename to data/elementary/themes/img/sym_up_dark_normal.png diff --git a/legacy/elementary/data/themes/img/sym_up_dark_selected.png b/data/elementary/themes/img/sym_up_dark_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_up_dark_selected.png rename to data/elementary/themes/img/sym_up_dark_selected.png diff --git a/legacy/elementary/data/themes/img/sym_up_glow_normal.png b/data/elementary/themes/img/sym_up_glow_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_up_glow_normal.png rename to data/elementary/themes/img/sym_up_glow_normal.png diff --git a/legacy/elementary/data/themes/img/sym_up_light_normal.png b/data/elementary/themes/img/sym_up_light_normal.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_up_light_normal.png rename to data/elementary/themes/img/sym_up_light_normal.png diff --git a/legacy/elementary/data/themes/img/sym_up_light_selected.png b/data/elementary/themes/img/sym_up_light_selected.png similarity index 100% rename from legacy/elementary/data/themes/img/sym_up_light_selected.png rename to data/elementary/themes/img/sym_up_light_selected.png diff --git a/legacy/elementary/data/themes/img/tacho_base.png b/data/elementary/themes/img/tacho_base.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_base.png rename to data/elementary/themes/img/tacho_base.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_big.png b/data/elementary/themes/img/tacho_hand_big.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_big.png rename to data/elementary/themes/img/tacho_hand_big.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_big2.png b/data/elementary/themes/img/tacho_hand_big2.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_big2.png rename to data/elementary/themes/img/tacho_hand_big2.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_big3.png b/data/elementary/themes/img/tacho_hand_big3.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_big3.png rename to data/elementary/themes/img/tacho_hand_big3.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_big4.png b/data/elementary/themes/img/tacho_hand_big4.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_big4.png rename to data/elementary/themes/img/tacho_hand_big4.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_big_shadow.png b/data/elementary/themes/img/tacho_hand_big_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_big_shadow.png rename to data/elementary/themes/img/tacho_hand_big_shadow.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_small_min.png b/data/elementary/themes/img/tacho_hand_small_min.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_small_min.png rename to data/elementary/themes/img/tacho_hand_small_min.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_small_min2.png b/data/elementary/themes/img/tacho_hand_small_min2.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_small_min2.png rename to data/elementary/themes/img/tacho_hand_small_min2.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_small_min3.png b/data/elementary/themes/img/tacho_hand_small_min3.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_small_min3.png rename to data/elementary/themes/img/tacho_hand_small_min3.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_small_min4.png b/data/elementary/themes/img/tacho_hand_small_min4.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_small_min4.png rename to data/elementary/themes/img/tacho_hand_small_min4.png diff --git a/legacy/elementary/data/themes/img/tacho_hand_small_shadow.png b/data/elementary/themes/img/tacho_hand_small_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/tacho_hand_small_shadow.png rename to data/elementary/themes/img/tacho_hand_small_shadow.png diff --git a/legacy/elementary/data/themes/img/therm_content.png b/data/elementary/themes/img/therm_content.png similarity index 100% rename from legacy/elementary/data/themes/img/therm_content.png rename to data/elementary/themes/img/therm_content.png diff --git a/legacy/elementary/data/themes/img/therm_shadow.png b/data/elementary/themes/img/therm_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/therm_shadow.png rename to data/elementary/themes/img/therm_shadow.png diff --git a/legacy/elementary/data/themes/img/therm_shine.png b/data/elementary/themes/img/therm_shine.png similarity index 100% rename from legacy/elementary/data/themes/img/therm_shine.png rename to data/elementary/themes/img/therm_shine.png diff --git a/legacy/elementary/data/themes/img/tooltip-base.png b/data/elementary/themes/img/tooltip-base.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-base.png rename to data/elementary/themes/img/tooltip-base.png diff --git a/legacy/elementary/data/themes/img/tooltip-corner-bottom-left-tip.png b/data/elementary/themes/img/tooltip-corner-bottom-left-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-corner-bottom-left-tip.png rename to data/elementary/themes/img/tooltip-corner-bottom-left-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-corner-bottom-right-tip.png b/data/elementary/themes/img/tooltip-corner-bottom-right-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-corner-bottom-right-tip.png rename to data/elementary/themes/img/tooltip-corner-bottom-right-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-corner-top-left-tip.png b/data/elementary/themes/img/tooltip-corner-top-left-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-corner-top-left-tip.png rename to data/elementary/themes/img/tooltip-corner-top-left-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-corner-top-right-tip.png b/data/elementary/themes/img/tooltip-corner-top-right-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-corner-top-right-tip.png rename to data/elementary/themes/img/tooltip-corner-top-right-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-edge-bottom-tip.png b/data/elementary/themes/img/tooltip-edge-bottom-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-edge-bottom-tip.png rename to data/elementary/themes/img/tooltip-edge-bottom-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-edge-left-tip.png b/data/elementary/themes/img/tooltip-edge-left-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-edge-left-tip.png rename to data/elementary/themes/img/tooltip-edge-left-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-edge-right-tip.png b/data/elementary/themes/img/tooltip-edge-right-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-edge-right-tip.png rename to data/elementary/themes/img/tooltip-edge-right-tip.png diff --git a/legacy/elementary/data/themes/img/tooltip-edge-top-tip.png b/data/elementary/themes/img/tooltip-edge-top-tip.png similarity index 100% rename from legacy/elementary/data/themes/img/tooltip-edge-top-tip.png rename to data/elementary/themes/img/tooltip-edge-top-tip.png diff --git a/legacy/elementary/data/themes/img/vert_bar_inset.png b/data/elementary/themes/img/vert_bar_inset.png similarity index 100% rename from legacy/elementary/data/themes/img/vert_bar_inset.png rename to data/elementary/themes/img/vert_bar_inset.png diff --git a/legacy/elementary/data/themes/img/vert_glow_run.png b/data/elementary/themes/img/vert_glow_run.png similarity index 100% rename from legacy/elementary/data/themes/img/vert_glow_run.png rename to data/elementary/themes/img/vert_glow_run.png diff --git a/legacy/elementary/data/themes/img/vert_glow_run_rev.png b/data/elementary/themes/img/vert_glow_run_rev.png similarity index 100% rename from legacy/elementary/data/themes/img/vert_glow_run_rev.png rename to data/elementary/themes/img/vert_glow_run_rev.png diff --git a/legacy/elementary/data/themes/img/vertical_separated_bar_disabled.png b/data/elementary/themes/img/vertical_separated_bar_disabled.png similarity index 100% rename from legacy/elementary/data/themes/img/vertical_separated_bar_disabled.png rename to data/elementary/themes/img/vertical_separated_bar_disabled.png diff --git a/legacy/elementary/data/themes/img/vertical_separated_bar_glow.png b/data/elementary/themes/img/vertical_separated_bar_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/vertical_separated_bar_glow.png rename to data/elementary/themes/img/vertical_separated_bar_glow.png diff --git a/legacy/elementary/data/themes/img/vgrad_med.png b/data/elementary/themes/img/vgrad_med.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med.png rename to data/elementary/themes/img/vgrad_med.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_curved.png b/data/elementary/themes/img/vgrad_med_curved.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_curved.png rename to data/elementary/themes/img/vgrad_med_curved.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_dark.png b/data/elementary/themes/img/vgrad_med_dark.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_dark.png rename to data/elementary/themes/img/vgrad_med_dark.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_dark_sparkle.png b/data/elementary/themes/img/vgrad_med_dark_sparkle.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_dark_sparkle.png rename to data/elementary/themes/img/vgrad_med_dark_sparkle.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_darker.png b/data/elementary/themes/img/vgrad_med_darker.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_darker.png rename to data/elementary/themes/img/vgrad_med_darker.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_lighter.png b/data/elementary/themes/img/vgrad_med_lighter.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_lighter.png rename to data/elementary/themes/img/vgrad_med_lighter.png diff --git a/legacy/elementary/data/themes/img/vgrad_med_lighter_sparkle.png b/data/elementary/themes/img/vgrad_med_lighter_sparkle.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_med_lighter_sparkle.png rename to data/elementary/themes/img/vgrad_med_lighter_sparkle.png diff --git a/legacy/elementary/data/themes/img/vgrad_shadow_bi.png b/data/elementary/themes/img/vgrad_shadow_bi.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_shadow_bi.png rename to data/elementary/themes/img/vgrad_shadow_bi.png diff --git a/legacy/elementary/data/themes/img/vgrad_tall.png b/data/elementary/themes/img/vgrad_tall.png similarity index 100% rename from legacy/elementary/data/themes/img/vgrad_tall.png rename to data/elementary/themes/img/vgrad_tall.png diff --git a/legacy/elementary/data/themes/img/white_bar_vert_glow.png b/data/elementary/themes/img/white_bar_vert_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/white_bar_vert_glow.png rename to data/elementary/themes/img/white_bar_vert_glow.png diff --git a/legacy/elementary/data/themes/img/wifi_base.png b/data/elementary/themes/img/wifi_base.png similarity index 100% rename from legacy/elementary/data/themes/img/wifi_base.png rename to data/elementary/themes/img/wifi_base.png diff --git a/legacy/elementary/data/themes/img/wifi_shadow.png b/data/elementary/themes/img/wifi_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/wifi_shadow.png rename to data/elementary/themes/img/wifi_shadow.png diff --git a/legacy/elementary/data/themes/img/wifi_sig_1.png b/data/elementary/themes/img/wifi_sig_1.png similarity index 100% rename from legacy/elementary/data/themes/img/wifi_sig_1.png rename to data/elementary/themes/img/wifi_sig_1.png diff --git a/legacy/elementary/data/themes/img/wifi_sig_2.png b/data/elementary/themes/img/wifi_sig_2.png similarity index 100% rename from legacy/elementary/data/themes/img/wifi_sig_2.png rename to data/elementary/themes/img/wifi_sig_2.png diff --git a/legacy/elementary/data/themes/img/wifi_sig_3.png b/data/elementary/themes/img/wifi_sig_3.png similarity index 100% rename from legacy/elementary/data/themes/img/wifi_sig_3.png rename to data/elementary/themes/img/wifi_sig_3.png diff --git a/legacy/elementary/data/themes/img/win_glow.png b/data/elementary/themes/img/win_glow.png similarity index 100% rename from legacy/elementary/data/themes/img/win_glow.png rename to data/elementary/themes/img/win_glow.png diff --git a/legacy/elementary/data/themes/img/win_shadow.png b/data/elementary/themes/img/win_shadow.png similarity index 100% rename from legacy/elementary/data/themes/img/win_shadow.png rename to data/elementary/themes/img/win_shadow.png diff --git a/legacy/elementary/data/themes/macros.edc b/data/elementary/themes/macros.edc similarity index 100% rename from legacy/elementary/data/themes/macros.edc rename to data/elementary/themes/macros.edc diff --git a/legacy/elementary/data/themes/orig/ampm.svgz b/data/elementary/themes/orig/ampm.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/ampm.svgz rename to data/elementary/themes/orig/ampm.svgz diff --git a/legacy/elementary/data/themes/orig/battery.svgz b/data/elementary/themes/orig/battery.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/battery.svgz rename to data/elementary/themes/orig/battery.svgz diff --git a/legacy/elementary/data/themes/orig/bulb.svgz b/data/elementary/themes/orig/bulb.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/bulb.svgz rename to data/elementary/themes/orig/bulb.svgz diff --git a/legacy/elementary/data/themes/orig/copy.svgz b/data/elementary/themes/orig/copy.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/copy.svgz rename to data/elementary/themes/orig/copy.svgz diff --git a/legacy/elementary/data/themes/orig/desktops.svgz b/data/elementary/themes/orig/desktops.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/desktops.svgz rename to data/elementary/themes/orig/desktops.svgz diff --git a/legacy/elementary/data/themes/orig/digits.svgz b/data/elementary/themes/orig/digits.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/digits.svgz rename to data/elementary/themes/orig/digits.svgz diff --git a/legacy/elementary/data/themes/orig/e-logo-blue-glow.svgz b/data/elementary/themes/orig/e-logo-blue-glow.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/e-logo-blue-glow.svgz rename to data/elementary/themes/orig/e-logo-blue-glow.svgz diff --git a/legacy/elementary/data/themes/orig/eject.svgz b/data/elementary/themes/orig/eject.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/eject.svgz rename to data/elementary/themes/orig/eject.svgz diff --git a/legacy/elementary/data/themes/orig/env-vars.svgz b/data/elementary/themes/orig/env-vars.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/env-vars.svgz rename to data/elementary/themes/orig/env-vars.svgz diff --git a/legacy/elementary/data/themes/orig/icon-bt.svgz b/data/elementary/themes/orig/icon-bt.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/icon-bt.svgz rename to data/elementary/themes/orig/icon-bt.svgz diff --git a/legacy/elementary/data/themes/orig/icon-cell.svgz b/data/elementary/themes/orig/icon-cell.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/icon-cell.svgz rename to data/elementary/themes/orig/icon-cell.svgz diff --git a/legacy/elementary/data/themes/orig/icon-err-exclam.png b/data/elementary/themes/orig/icon-err-exclam.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-err-exclam.png rename to data/elementary/themes/orig/icon-err-exclam.png diff --git a/legacy/elementary/data/themes/orig/icon-err-exclam.svgz b/data/elementary/themes/orig/icon-err-exclam.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/icon-err-exclam.svgz rename to data/elementary/themes/orig/icon-err-exclam.svgz diff --git a/legacy/elementary/data/themes/orig/icon-eth.png b/data/elementary/themes/orig/icon-eth.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-eth.png rename to data/elementary/themes/orig/icon-eth.png diff --git a/legacy/elementary/data/themes/orig/icon-eth.svgz b/data/elementary/themes/orig/icon-eth.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/icon-eth.svgz rename to data/elementary/themes/orig/icon-eth.svgz diff --git a/legacy/elementary/data/themes/orig/icon-wifi-1.png b/data/elementary/themes/orig/icon-wifi-1.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi-1.png rename to data/elementary/themes/orig/icon-wifi-1.png diff --git a/legacy/elementary/data/themes/orig/icon-wifi-2.png b/data/elementary/themes/orig/icon-wifi-2.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi-2.png rename to data/elementary/themes/orig/icon-wifi-2.png diff --git a/legacy/elementary/data/themes/orig/icon-wifi-3.png b/data/elementary/themes/orig/icon-wifi-3.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi-3.png rename to data/elementary/themes/orig/icon-wifi-3.png diff --git a/legacy/elementary/data/themes/orig/icon-wifi-base.png b/data/elementary/themes/orig/icon-wifi-base.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi-base.png rename to data/elementary/themes/orig/icon-wifi-base.png diff --git a/legacy/elementary/data/themes/orig/icon-wifi.png b/data/elementary/themes/orig/icon-wifi.png similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi.png rename to data/elementary/themes/orig/icon-wifi.png diff --git a/legacy/elementary/data/themes/orig/icon-wifi.svgz b/data/elementary/themes/orig/icon-wifi.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/icon-wifi.svgz rename to data/elementary/themes/orig/icon-wifi.svgz diff --git a/legacy/elementary/data/themes/orig/info.svgz b/data/elementary/themes/orig/info.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/info.svgz rename to data/elementary/themes/orig/info.svgz diff --git a/legacy/elementary/data/themes/orig/lock-apps.svgz b/data/elementary/themes/orig/lock-apps.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/lock-apps.svgz rename to data/elementary/themes/orig/lock-apps.svgz diff --git a/legacy/elementary/data/themes/orig/lock-lang.svgz b/data/elementary/themes/orig/lock-lang.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/lock-lang.svgz rename to data/elementary/themes/orig/lock-lang.svgz diff --git a/legacy/elementary/data/themes/orig/lock.svgz b/data/elementary/themes/orig/lock.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/lock.svgz rename to data/elementary/themes/orig/lock.svgz diff --git a/legacy/elementary/data/themes/orig/mock-01.xcf.gz b/data/elementary/themes/orig/mock-01.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-01.xcf.gz rename to data/elementary/themes/orig/mock-01.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-02.xcf.gz b/data/elementary/themes/orig/mock-02.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-02.xcf.gz rename to data/elementary/themes/orig/mock-02.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-03.xcf.gz b/data/elementary/themes/orig/mock-03.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-03.xcf.gz rename to data/elementary/themes/orig/mock-03.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-04.xcf.gz b/data/elementary/themes/orig/mock-04.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-04.xcf.gz rename to data/elementary/themes/orig/mock-04.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-05.xcf.gz b/data/elementary/themes/orig/mock-05.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-05.xcf.gz rename to data/elementary/themes/orig/mock-05.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-06.xcf.gz b/data/elementary/themes/orig/mock-06.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-06.xcf.gz rename to data/elementary/themes/orig/mock-06.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-07.xcf.gz b/data/elementary/themes/orig/mock-07.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-07.xcf.gz rename to data/elementary/themes/orig/mock-07.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-08.xcf.gz b/data/elementary/themes/orig/mock-08.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-08.xcf.gz rename to data/elementary/themes/orig/mock-08.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-09.xcf.gz b/data/elementary/themes/orig/mock-09.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-09.xcf.gz rename to data/elementary/themes/orig/mock-09.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-10.xcf.gz b/data/elementary/themes/orig/mock-10.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-10.xcf.gz rename to data/elementary/themes/orig/mock-10.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-11.xcf.gz b/data/elementary/themes/orig/mock-11.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-11.xcf.gz rename to data/elementary/themes/orig/mock-11.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-12.xcf.gz b/data/elementary/themes/orig/mock-12.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-12.xcf.gz rename to data/elementary/themes/orig/mock-12.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-13.xcf.gz b/data/elementary/themes/orig/mock-13.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-13.xcf.gz rename to data/elementary/themes/orig/mock-13.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-14.xcf.gz b/data/elementary/themes/orig/mock-14.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-14.xcf.gz rename to data/elementary/themes/orig/mock-14.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-15.xcf.gz b/data/elementary/themes/orig/mock-15.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-15.xcf.gz rename to data/elementary/themes/orig/mock-15.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-16.xcf.gz b/data/elementary/themes/orig/mock-16.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-16.xcf.gz rename to data/elementary/themes/orig/mock-16.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-17.xcf.gz b/data/elementary/themes/orig/mock-17.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-17.xcf.gz rename to data/elementary/themes/orig/mock-17.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-18.xcf.gz b/data/elementary/themes/orig/mock-18.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-18.xcf.gz rename to data/elementary/themes/orig/mock-18.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-19.xcf.gz b/data/elementary/themes/orig/mock-19.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-19.xcf.gz rename to data/elementary/themes/orig/mock-19.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-20.xcf.gz b/data/elementary/themes/orig/mock-20.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-20.xcf.gz rename to data/elementary/themes/orig/mock-20.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-21.xcf.gz b/data/elementary/themes/orig/mock-21.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-21.xcf.gz rename to data/elementary/themes/orig/mock-21.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-22.xcf.gz b/data/elementary/themes/orig/mock-22.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-22.xcf.gz rename to data/elementary/themes/orig/mock-22.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mock-23.xcf.gz b/data/elementary/themes/orig/mock-23.xcf.gz similarity index 100% rename from legacy/elementary/data/themes/orig/mock-23.xcf.gz rename to data/elementary/themes/orig/mock-23.xcf.gz diff --git a/legacy/elementary/data/themes/orig/mute.svgz b/data/elementary/themes/orig/mute.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/mute.svgz rename to data/elementary/themes/orig/mute.svgz diff --git a/legacy/elementary/data/themes/orig/package.svgz b/data/elementary/themes/orig/package.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/package.svgz rename to data/elementary/themes/orig/package.svgz diff --git a/legacy/elementary/data/themes/orig/personal-apps.svgz b/data/elementary/themes/orig/personal-apps.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/personal-apps.svgz rename to data/elementary/themes/orig/personal-apps.svgz diff --git a/legacy/elementary/data/themes/orig/pointer.svgz b/data/elementary/themes/orig/pointer.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/pointer.svgz rename to data/elementary/themes/orig/pointer.svgz diff --git a/legacy/elementary/data/themes/orig/power.svgz b/data/elementary/themes/orig/power.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/power.svgz rename to data/elementary/themes/orig/power.svgz diff --git a/legacy/elementary/data/themes/orig/screen.svgz b/data/elementary/themes/orig/screen.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/screen.svgz rename to data/elementary/themes/orig/screen.svgz diff --git a/legacy/elementary/data/themes/orig/signal-bindings.svgz b/data/elementary/themes/orig/signal-bindings.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/signal-bindings.svgz rename to data/elementary/themes/orig/signal-bindings.svgz diff --git a/legacy/elementary/data/themes/orig/speaker.svgz b/data/elementary/themes/orig/speaker.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/speaker.svgz rename to data/elementary/themes/orig/speaker.svgz diff --git a/legacy/elementary/data/themes/orig/splat.svgz b/data/elementary/themes/orig/splat.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/splat.svgz rename to data/elementary/themes/orig/splat.svgz diff --git a/legacy/elementary/data/themes/orig/splat2.svgz b/data/elementary/themes/orig/splat2.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/splat2.svgz rename to data/elementary/themes/orig/splat2.svgz diff --git a/legacy/elementary/data/themes/orig/tacho.svgz b/data/elementary/themes/orig/tacho.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/tacho.svgz rename to data/elementary/themes/orig/tacho.svgz diff --git a/legacy/elementary/data/themes/orig/touch.svgz b/data/elementary/themes/orig/touch.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/touch.svgz rename to data/elementary/themes/orig/touch.svgz diff --git a/legacy/elementary/data/themes/orig/unlock-apps.svgz b/data/elementary/themes/orig/unlock-apps.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/unlock-apps.svgz rename to data/elementary/themes/orig/unlock-apps.svgz diff --git a/legacy/elementary/data/themes/orig/warn.svgz b/data/elementary/themes/orig/warn.svgz similarity index 100% rename from legacy/elementary/data/themes/orig/warn.svgz rename to data/elementary/themes/orig/warn.svgz diff --git a/legacy/elementary/data/themes/snd/kbd-tap.wav b/data/elementary/themes/snd/kbd-tap.wav similarity index 100% rename from legacy/elementary/data/themes/snd/kbd-tap.wav rename to data/elementary/themes/snd/kbd-tap.wav diff --git a/legacy/elementary/data/themes/snd/kbd-tap2.wav b/data/elementary/themes/snd/kbd-tap2.wav similarity index 100% rename from legacy/elementary/data/themes/snd/kbd-tap2.wav rename to data/elementary/themes/snd/kbd-tap2.wav diff --git a/legacy/elementary/data/themes/snd/kbd-tap3.wav b/data/elementary/themes/snd/kbd-tap3.wav similarity index 100% rename from legacy/elementary/data/themes/snd/kbd-tap3.wav rename to data/elementary/themes/snd/kbd-tap3.wav diff --git a/legacy/elementary/data/themes/snd/kbd-tap4.wav b/data/elementary/themes/snd/kbd-tap4.wav similarity index 100% rename from legacy/elementary/data/themes/snd/kbd-tap4.wav rename to data/elementary/themes/snd/kbd-tap4.wav diff --git a/legacy/elementary/data/themes/snd/kbd-tap5.wav b/data/elementary/themes/snd/kbd-tap5.wav similarity index 100% rename from legacy/elementary/data/themes/snd/kbd-tap5.wav rename to data/elementary/themes/snd/kbd-tap5.wav diff --git a/legacy/elementary/doc/examples.dox b/doc/elementary_examples.dox similarity index 100% rename from legacy/elementary/doc/examples.dox rename to doc/elementary_examples.dox diff --git a/legacy/elementary/doc/examples-cxx.dox b/doc/elementary_examples_cxx.dox similarity index 100% rename from legacy/elementary/doc/examples-cxx.dox rename to doc/elementary_examples_cxx.dox diff --git a/legacy/elementary/doc/examples-js.dox b/doc/elementary_examples_js.dox similarity index 100% rename from legacy/elementary/doc/examples-js.dox rename to doc/elementary_examples_js.dox diff --git a/legacy/elementary/doc/img/actionslider_inheritance_tree.eps b/doc/img/actionslider_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/actionslider_inheritance_tree.eps rename to doc/img/actionslider_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/actionslider_inheritance_tree.png b/doc/img/actionslider_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/actionslider_inheritance_tree.png rename to doc/img/actionslider_inheritance_tree.png diff --git a/legacy/elementary/doc/img/bg_inheritance_tree.eps b/doc/img/bg_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/bg_inheritance_tree.eps rename to doc/img/bg_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/bg_inheritance_tree.png b/doc/img/bg_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/bg_inheritance_tree.png rename to doc/img/bg_inheritance_tree.png diff --git a/legacy/elementary/doc/img/box.eps b/doc/img/box.eps similarity index 100% rename from legacy/elementary/doc/img/box.eps rename to doc/img/box.eps diff --git a/legacy/elementary/doc/img/box.png b/doc/img/box.png similarity index 100% rename from legacy/elementary/doc/img/box.png rename to doc/img/box.png diff --git a/legacy/elementary/doc/img/box_inheritance_tree.eps b/doc/img/box_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/box_inheritance_tree.eps rename to doc/img/box_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/box_inheritance_tree.png b/doc/img/box_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/box_inheritance_tree.png rename to doc/img/box_inheritance_tree.png diff --git a/legacy/elementary/doc/img/bubble_inheritance_tree.eps b/doc/img/bubble_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/bubble_inheritance_tree.eps rename to doc/img/bubble_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/bubble_inheritance_tree.png b/doc/img/bubble_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/bubble_inheritance_tree.png rename to doc/img/bubble_inheritance_tree.png diff --git a/legacy/elementary/doc/img/button_inheritance_tree.eps b/doc/img/button_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/button_inheritance_tree.eps rename to doc/img/button_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/button_inheritance_tree.png b/doc/img/button_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/button_inheritance_tree.png rename to doc/img/button_inheritance_tree.png diff --git a/legacy/elementary/doc/img/calendar_inheritance_tree.eps b/doc/img/calendar_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/calendar_inheritance_tree.eps rename to doc/img/calendar_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/calendar_inheritance_tree.png b/doc/img/calendar_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/calendar_inheritance_tree.png rename to doc/img/calendar_inheritance_tree.png diff --git a/legacy/elementary/doc/img/check_inheritance_tree.eps b/doc/img/check_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/check_inheritance_tree.eps rename to doc/img/check_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/check_inheritance_tree.png b/doc/img/check_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/check_inheritance_tree.png rename to doc/img/check_inheritance_tree.png diff --git a/legacy/elementary/doc/img/clock_inheritance_tree.eps b/doc/img/clock_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/clock_inheritance_tree.eps rename to doc/img/clock_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/clock_inheritance_tree.png b/doc/img/clock_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/clock_inheritance_tree.png rename to doc/img/clock_inheritance_tree.png diff --git a/legacy/elementary/doc/img/colorselector_inheritance_tree.eps b/doc/img/colorselector_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/colorselector_inheritance_tree.eps rename to doc/img/colorselector_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/colorselector_inheritance_tree.png b/doc/img/colorselector_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/colorselector_inheritance_tree.png rename to doc/img/colorselector_inheritance_tree.png diff --git a/legacy/elementary/doc/img/conformant.eps b/doc/img/conformant.eps similarity index 100% rename from legacy/elementary/doc/img/conformant.eps rename to doc/img/conformant.eps diff --git a/legacy/elementary/doc/img/conformant.png b/doc/img/conformant.png similarity index 100% rename from legacy/elementary/doc/img/conformant.png rename to doc/img/conformant.png diff --git a/legacy/elementary/doc/img/conformant_inheritance_tree.eps b/doc/img/conformant_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/conformant_inheritance_tree.eps rename to doc/img/conformant_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/conformant_inheritance_tree.png b/doc/img/conformant_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/conformant_inheritance_tree.png rename to doc/img/conformant_inheritance_tree.png diff --git a/legacy/elementary/doc/img/container_inheritance_tree.eps b/doc/img/container_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/container_inheritance_tree.eps rename to doc/img/container_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/container_inheritance_tree.png b/doc/img/container_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/container_inheritance_tree.png rename to doc/img/container_inheritance_tree.png diff --git a/legacy/elementary/doc/img/ctxpopup_inheritance_tree.eps b/doc/img/ctxpopup_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/ctxpopup_inheritance_tree.eps rename to doc/img/ctxpopup_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/ctxpopup_inheritance_tree.png b/doc/img/ctxpopup_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/ctxpopup_inheritance_tree.png rename to doc/img/ctxpopup_inheritance_tree.png diff --git a/legacy/elementary/doc/img/datetime_inheritance_tree.eps b/doc/img/datetime_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/datetime_inheritance_tree.eps rename to doc/img/datetime_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/datetime_inheritance_tree.png b/doc/img/datetime_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/datetime_inheritance_tree.png rename to doc/img/datetime_inheritance_tree.png diff --git a/legacy/elementary/doc/img/dayselector_inheritance_tree.eps b/doc/img/dayselector_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/dayselector_inheritance_tree.eps rename to doc/img/dayselector_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/dayselector_inheritance_tree.png b/doc/img/dayselector_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/dayselector_inheritance_tree.png rename to doc/img/dayselector_inheritance_tree.png diff --git a/legacy/elementary/doc/img/diskselector_inheritance_tree.eps b/doc/img/diskselector_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/diskselector_inheritance_tree.eps rename to doc/img/diskselector_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/diskselector_inheritance_tree.png b/doc/img/diskselector_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/diskselector_inheritance_tree.png rename to doc/img/diskselector_inheritance_tree.png diff --git a/legacy/elementary/doc/img/elementary.png b/doc/img/elementary.png similarity index 100% rename from legacy/elementary/doc/img/elementary.png rename to doc/img/elementary.png diff --git a/legacy/elementary/doc/img/elm-widget-hierarchy.eps b/doc/img/elm-widget-hierarchy.eps similarity index 100% rename from legacy/elementary/doc/img/elm-widget-hierarchy.eps rename to doc/img/elm-widget-hierarchy.eps diff --git a/legacy/elementary/doc/img/elm-widget-hierarchy.png b/doc/img/elm-widget-hierarchy.png similarity index 100% rename from legacy/elementary/doc/img/elm-widget-hierarchy.png rename to doc/img/elm-widget-hierarchy.png diff --git a/legacy/elementary/doc/img/elm-widget-tree.eps b/doc/img/elm-widget-tree.eps similarity index 100% rename from legacy/elementary/doc/img/elm-widget-tree.eps rename to doc/img/elm-widget-tree.eps diff --git a/legacy/elementary/doc/img/elm-widget-tree.png b/doc/img/elm-widget-tree.png similarity index 100% rename from legacy/elementary/doc/img/elm-widget-tree.png rename to doc/img/elm-widget-tree.png diff --git a/legacy/elementary/doc/img/elm_animator_curve_style.eps b/doc/img/elm_animator_curve_style.eps similarity index 100% rename from legacy/elementary/doc/img/elm_animator_curve_style.eps rename to doc/img/elm_animator_curve_style.eps diff --git a/legacy/elementary/doc/img/elm_animator_curve_style.png b/doc/img/elm_animator_curve_style.png similarity index 100% rename from legacy/elementary/doc/img/elm_animator_curve_style.png rename to doc/img/elm_animator_curve_style.png diff --git a/legacy/elementary/doc/img/elm_flip.eps b/doc/img/elm_flip.eps similarity index 100% rename from legacy/elementary/doc/img/elm_flip.eps rename to doc/img/elm_flip.eps diff --git a/legacy/elementary/doc/img/elm_flip.png b/doc/img/elm_flip.png similarity index 100% rename from legacy/elementary/doc/img/elm_flip.png rename to doc/img/elm_flip.png diff --git a/legacy/elementary/doc/img/elm_image_orient_set.eps b/doc/img/elm_image_orient_set.eps similarity index 100% rename from legacy/elementary/doc/img/elm_image_orient_set.eps rename to doc/img/elm_image_orient_set.eps diff --git a/legacy/elementary/doc/img/elm_image_orient_set.png b/doc/img/elm_image_orient_set.png similarity index 100% rename from legacy/elementary/doc/img/elm_image_orient_set.png rename to doc/img/elm_image_orient_set.png diff --git a/legacy/elementary/doc/img/entry_inheritance_tree.eps b/doc/img/entry_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/entry_inheritance_tree.eps rename to doc/img/entry_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/entry_inheritance_tree.png b/doc/img/entry_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/entry_inheritance_tree.png rename to doc/img/entry_inheritance_tree.png diff --git a/legacy/elementary/doc/img/entry_item.eps b/doc/img/entry_item.eps similarity index 100% rename from legacy/elementary/doc/img/entry_item.eps rename to doc/img/entry_item.eps diff --git a/legacy/elementary/doc/img/entry_item.png b/doc/img/entry_item.png similarity index 100% rename from legacy/elementary/doc/img/entry_item.png rename to doc/img/entry_item.png diff --git a/legacy/elementary/doc/img/entry_item_scale.eps b/doc/img/entry_item_scale.eps similarity index 100% rename from legacy/elementary/doc/img/entry_item_scale.eps rename to doc/img/entry_item_scale.eps diff --git a/legacy/elementary/doc/img/entry_item_scale.png b/doc/img/entry_item_scale.png similarity index 100% rename from legacy/elementary/doc/img/entry_item_scale.png rename to doc/img/entry_item_scale.png diff --git a/legacy/elementary/doc/img/fileselector_button_inheritance_tree.eps b/doc/img/fileselector_button_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/fileselector_button_inheritance_tree.eps rename to doc/img/fileselector_button_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/fileselector_button_inheritance_tree.png b/doc/img/fileselector_button_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/fileselector_button_inheritance_tree.png rename to doc/img/fileselector_button_inheritance_tree.png diff --git a/legacy/elementary/doc/img/fileselector_entry_inheritance_tree.eps b/doc/img/fileselector_entry_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/fileselector_entry_inheritance_tree.eps rename to doc/img/fileselector_entry_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/fileselector_entry_inheritance_tree.png b/doc/img/fileselector_entry_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/fileselector_entry_inheritance_tree.png rename to doc/img/fileselector_entry_inheritance_tree.png diff --git a/legacy/elementary/doc/img/fileselector_inheritance_tree.eps b/doc/img/fileselector_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/fileselector_inheritance_tree.eps rename to doc/img/fileselector_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/fileselector_inheritance_tree.png b/doc/img/fileselector_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/fileselector_inheritance_tree.png rename to doc/img/fileselector_inheritance_tree.png diff --git a/legacy/elementary/doc/img/flip_inheritance_tree.eps b/doc/img/flip_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/flip_inheritance_tree.eps rename to doc/img/flip_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/flip_inheritance_tree.png b/doc/img/flip_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/flip_inheritance_tree.png rename to doc/img/flip_inheritance_tree.png diff --git a/legacy/elementary/doc/img/flipselector_inheritance_tree.eps b/doc/img/flipselector_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/flipselector_inheritance_tree.eps rename to doc/img/flipselector_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/flipselector_inheritance_tree.png b/doc/img/flipselector_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/flipselector_inheritance_tree.png rename to doc/img/flipselector_inheritance_tree.png diff --git a/legacy/elementary/doc/img/frame_inheritance_tree.eps b/doc/img/frame_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/frame_inheritance_tree.eps rename to doc/img/frame_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/frame_inheritance_tree.png b/doc/img/frame_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/frame_inheritance_tree.png rename to doc/img/frame_inheritance_tree.png diff --git a/legacy/elementary/doc/img/gengrid_inheritance_tree.eps b/doc/img/gengrid_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/gengrid_inheritance_tree.eps rename to doc/img/gengrid_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/gengrid_inheritance_tree.png b/doc/img/gengrid_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/gengrid_inheritance_tree.png rename to doc/img/gengrid_inheritance_tree.png diff --git a/legacy/elementary/doc/img/genlist.eps b/doc/img/genlist.eps similarity index 100% rename from legacy/elementary/doc/img/genlist.eps rename to doc/img/genlist.eps diff --git a/legacy/elementary/doc/img/genlist.png b/doc/img/genlist.png similarity index 100% rename from legacy/elementary/doc/img/genlist.png rename to doc/img/genlist.png diff --git a/legacy/elementary/doc/img/genlist_inheritance_tree.eps b/doc/img/genlist_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/genlist_inheritance_tree.eps rename to doc/img/genlist_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/genlist_inheritance_tree.png b/doc/img/genlist_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/genlist_inheritance_tree.png rename to doc/img/genlist_inheritance_tree.png diff --git a/legacy/elementary/doc/img/gesture_layer_inheritance_tree.eps b/doc/img/gesture_layer_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/gesture_layer_inheritance_tree.eps rename to doc/img/gesture_layer_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/gesture_layer_inheritance_tree.png b/doc/img/gesture_layer_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/gesture_layer_inheritance_tree.png rename to doc/img/gesture_layer_inheritance_tree.png diff --git a/legacy/elementary/doc/img/glview_inheritance_tree.eps b/doc/img/glview_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/glview_inheritance_tree.eps rename to doc/img/glview_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/glview_inheritance_tree.png b/doc/img/glview_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/glview_inheritance_tree.png rename to doc/img/glview_inheritance_tree.png diff --git a/legacy/elementary/doc/img/grid_inheritance_tree.eps b/doc/img/grid_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/grid_inheritance_tree.eps rename to doc/img/grid_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/grid_inheritance_tree.png b/doc/img/grid_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/grid_inheritance_tree.png rename to doc/img/grid_inheritance_tree.png diff --git a/legacy/elementary/doc/img/hover_inheritance_tree.eps b/doc/img/hover_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/hover_inheritance_tree.eps rename to doc/img/hover_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/hover_inheritance_tree.png b/doc/img/hover_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/hover_inheritance_tree.png rename to doc/img/hover_inheritance_tree.png diff --git a/legacy/elementary/doc/img/hoversel_inheritance_tree.eps b/doc/img/hoversel_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/hoversel_inheritance_tree.eps rename to doc/img/hoversel_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/hoversel_inheritance_tree.png b/doc/img/hoversel_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/hoversel_inheritance_tree.png rename to doc/img/hoversel_inheritance_tree.png diff --git a/legacy/elementary/doc/img/icon_inheritance_tree.eps b/doc/img/icon_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/icon_inheritance_tree.eps rename to doc/img/icon_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/icon_inheritance_tree.png b/doc/img/icon_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/icon_inheritance_tree.png rename to doc/img/icon_inheritance_tree.png diff --git a/legacy/elementary/doc/img/image_inheritance_tree.eps b/doc/img/image_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/image_inheritance_tree.eps rename to doc/img/image_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/image_inheritance_tree.png b/doc/img/image_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/image_inheritance_tree.png rename to doc/img/image_inheritance_tree.png diff --git a/legacy/elementary/doc/img/index_inheritance_tree.eps b/doc/img/index_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/index_inheritance_tree.eps rename to doc/img/index_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/index_inheritance_tree.png b/doc/img/index_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/index_inheritance_tree.png rename to doc/img/index_inheritance_tree.png diff --git a/legacy/elementary/doc/img/inwin_inheritance_tree.eps b/doc/img/inwin_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/inwin_inheritance_tree.eps rename to doc/img/inwin_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/inwin_inheritance_tree.png b/doc/img/inwin_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/inwin_inheritance_tree.png rename to doc/img/inwin_inheritance_tree.png diff --git a/legacy/elementary/doc/img/label_inheritance_tree.eps b/doc/img/label_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/label_inheritance_tree.eps rename to doc/img/label_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/label_inheritance_tree.png b/doc/img/label_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/label_inheritance_tree.png rename to doc/img/label_inheritance_tree.png diff --git a/legacy/elementary/doc/img/layout-predefined.eps b/doc/img/layout-predefined.eps similarity index 100% rename from legacy/elementary/doc/img/layout-predefined.eps rename to doc/img/layout-predefined.eps diff --git a/legacy/elementary/doc/img/layout-predefined.png b/doc/img/layout-predefined.png similarity index 100% rename from legacy/elementary/doc/img/layout-predefined.png rename to doc/img/layout-predefined.png diff --git a/legacy/elementary/doc/img/layout_box.eps b/doc/img/layout_box.eps similarity index 100% rename from legacy/elementary/doc/img/layout_box.eps rename to doc/img/layout_box.eps diff --git a/legacy/elementary/doc/img/layout_box.png b/doc/img/layout_box.png similarity index 100% rename from legacy/elementary/doc/img/layout_box.png rename to doc/img/layout_box.png diff --git a/legacy/elementary/doc/img/layout_colspan.eps b/doc/img/layout_colspan.eps similarity index 100% rename from legacy/elementary/doc/img/layout_colspan.eps rename to doc/img/layout_colspan.eps diff --git a/legacy/elementary/doc/img/layout_colspan.png b/doc/img/layout_colspan.png similarity index 100% rename from legacy/elementary/doc/img/layout_colspan.png rename to doc/img/layout_colspan.png diff --git a/legacy/elementary/doc/img/layout_inheritance_tree.eps b/doc/img/layout_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/layout_inheritance_tree.eps rename to doc/img/layout_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/layout_inheritance_tree.png b/doc/img/layout_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/layout_inheritance_tree.png rename to doc/img/layout_inheritance_tree.png diff --git a/legacy/elementary/doc/img/layout_swallow.eps b/doc/img/layout_swallow.eps similarity index 100% rename from legacy/elementary/doc/img/layout_swallow.eps rename to doc/img/layout_swallow.eps diff --git a/legacy/elementary/doc/img/layout_swallow.png b/doc/img/layout_swallow.png similarity index 100% rename from legacy/elementary/doc/img/layout_swallow.png rename to doc/img/layout_swallow.png diff --git a/legacy/elementary/doc/img/layout_table.eps b/doc/img/layout_table.eps similarity index 100% rename from legacy/elementary/doc/img/layout_table.eps rename to doc/img/layout_table.eps diff --git a/legacy/elementary/doc/img/layout_table.png b/doc/img/layout_table.png similarity index 100% rename from legacy/elementary/doc/img/layout_table.png rename to doc/img/layout_table.png diff --git a/legacy/elementary/doc/img/list.eps b/doc/img/list.eps similarity index 100% rename from legacy/elementary/doc/img/list.eps rename to doc/img/list.eps diff --git a/legacy/elementary/doc/img/list.png b/doc/img/list.png similarity index 100% rename from legacy/elementary/doc/img/list.png rename to doc/img/list.png diff --git a/legacy/elementary/doc/img/list_inheritance_tree.eps b/doc/img/list_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/list_inheritance_tree.eps rename to doc/img/list_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/list_inheritance_tree.png b/doc/img/list_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/list_inheritance_tree.png rename to doc/img/list_inheritance_tree.png diff --git a/legacy/elementary/doc/img/map_inheritance_tree.eps b/doc/img/map_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/map_inheritance_tree.eps rename to doc/img/map_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/map_inheritance_tree.png b/doc/img/map_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/map_inheritance_tree.png rename to doc/img/map_inheritance_tree.png diff --git a/legacy/elementary/doc/img/mapbuf_inheritance_tree.eps b/doc/img/mapbuf_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/mapbuf_inheritance_tree.eps rename to doc/img/mapbuf_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/mapbuf_inheritance_tree.png b/doc/img/mapbuf_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/mapbuf_inheritance_tree.png rename to doc/img/mapbuf_inheritance_tree.png diff --git a/legacy/elementary/doc/img/menu_inheritance_tree.eps b/doc/img/menu_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/menu_inheritance_tree.eps rename to doc/img/menu_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/menu_inheritance_tree.png b/doc/img/menu_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/menu_inheritance_tree.png rename to doc/img/menu_inheritance_tree.png diff --git a/legacy/elementary/doc/img/multibuttonentry_inheritance_tree.eps b/doc/img/multibuttonentry_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/multibuttonentry_inheritance_tree.eps rename to doc/img/multibuttonentry_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/multibuttonentry_inheritance_tree.png b/doc/img/multibuttonentry_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/multibuttonentry_inheritance_tree.png rename to doc/img/multibuttonentry_inheritance_tree.png diff --git a/legacy/elementary/doc/img/naviframe_inheritance_tree.eps b/doc/img/naviframe_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/naviframe_inheritance_tree.eps rename to doc/img/naviframe_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/naviframe_inheritance_tree.png b/doc/img/naviframe_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/naviframe_inheritance_tree.png rename to doc/img/naviframe_inheritance_tree.png diff --git a/legacy/elementary/doc/img/notify_inheritance_tree.eps b/doc/img/notify_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/notify_inheritance_tree.eps rename to doc/img/notify_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/notify_inheritance_tree.png b/doc/img/notify_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/notify_inheritance_tree.png rename to doc/img/notify_inheritance_tree.png diff --git a/legacy/elementary/doc/img/panel_inheritance_tree.eps b/doc/img/panel_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/panel_inheritance_tree.eps rename to doc/img/panel_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/panel_inheritance_tree.png b/doc/img/panel_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/panel_inheritance_tree.png rename to doc/img/panel_inheritance_tree.png diff --git a/legacy/elementary/doc/img/panes.eps b/doc/img/panes.eps similarity index 100% rename from legacy/elementary/doc/img/panes.eps rename to doc/img/panes.eps diff --git a/legacy/elementary/doc/img/panes.png b/doc/img/panes.png similarity index 100% rename from legacy/elementary/doc/img/panes.png rename to doc/img/panes.png diff --git a/legacy/elementary/doc/img/panes_inheritance_tree.eps b/doc/img/panes_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/panes_inheritance_tree.eps rename to doc/img/panes_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/panes_inheritance_tree.png b/doc/img/panes_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/panes_inheritance_tree.png rename to doc/img/panes_inheritance_tree.png diff --git a/legacy/elementary/doc/img/photo_inheritance_tree.eps b/doc/img/photo_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/photo_inheritance_tree.eps rename to doc/img/photo_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/photo_inheritance_tree.png b/doc/img/photo_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/photo_inheritance_tree.png rename to doc/img/photo_inheritance_tree.png diff --git a/legacy/elementary/doc/img/photocam_inheritance_tree.eps b/doc/img/photocam_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/photocam_inheritance_tree.eps rename to doc/img/photocam_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/photocam_inheritance_tree.png b/doc/img/photocam_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/photocam_inheritance_tree.png rename to doc/img/photocam_inheritance_tree.png diff --git a/legacy/elementary/doc/img/player_inheritance_tree.eps b/doc/img/player_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/player_inheritance_tree.eps rename to doc/img/player_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/player_inheritance_tree.png b/doc/img/player_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/player_inheritance_tree.png rename to doc/img/player_inheritance_tree.png diff --git a/legacy/elementary/doc/img/plug_inheritance_tree.eps b/doc/img/plug_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/plug_inheritance_tree.eps rename to doc/img/plug_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/plug_inheritance_tree.png b/doc/img/plug_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/plug_inheritance_tree.png rename to doc/img/plug_inheritance_tree.png diff --git a/legacy/elementary/doc/img/popup_inheritance_tree.eps b/doc/img/popup_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/popup_inheritance_tree.eps rename to doc/img/popup_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/popup_inheritance_tree.png b/doc/img/popup_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/popup_inheritance_tree.png rename to doc/img/popup_inheritance_tree.png diff --git a/legacy/elementary/doc/img/prefs.eps b/doc/img/prefs.eps similarity index 100% rename from legacy/elementary/doc/img/prefs.eps rename to doc/img/prefs.eps diff --git a/legacy/elementary/doc/img/prefs.png b/doc/img/prefs.png similarity index 100% rename from legacy/elementary/doc/img/prefs.png rename to doc/img/prefs.png diff --git a/legacy/elementary/doc/img/prefs_inheritance_tree.eps b/doc/img/prefs_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/prefs_inheritance_tree.eps rename to doc/img/prefs_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/prefs_inheritance_tree.png b/doc/img/prefs_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/prefs_inheritance_tree.png rename to doc/img/prefs_inheritance_tree.png diff --git a/legacy/elementary/doc/img/progressbar_inheritance_tree.eps b/doc/img/progressbar_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/progressbar_inheritance_tree.eps rename to doc/img/progressbar_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/progressbar_inheritance_tree.png b/doc/img/progressbar_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/progressbar_inheritance_tree.png rename to doc/img/progressbar_inheritance_tree.png diff --git a/legacy/elementary/doc/img/radio_inheritance_tree.eps b/doc/img/radio_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/radio_inheritance_tree.eps rename to doc/img/radio_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/radio_inheritance_tree.png b/doc/img/radio_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/radio_inheritance_tree.png rename to doc/img/radio_inheritance_tree.png diff --git a/legacy/elementary/doc/img/route_inheritance_tree.eps b/doc/img/route_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/route_inheritance_tree.eps rename to doc/img/route_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/route_inheritance_tree.png b/doc/img/route_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/route_inheritance_tree.png rename to doc/img/route_inheritance_tree.png diff --git a/legacy/elementary/doc/img/screenshots/anchorblock_01.eps b/doc/img/screenshots/anchorblock_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/anchorblock_01.eps rename to doc/img/screenshots/anchorblock_01.eps diff --git a/legacy/elementary/doc/img/screenshots/anchorblock_01.png b/doc/img/screenshots/anchorblock_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/anchorblock_01.png rename to doc/img/screenshots/anchorblock_01.png diff --git a/legacy/elementary/doc/img/screenshots/check_example_01.eps b/doc/img/screenshots/check_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/check_example_01.eps rename to doc/img/screenshots/check_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/check_example_01.png b/doc/img/screenshots/check_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/check_example_01.png rename to doc/img/screenshots/check_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01.eps b/doc/img/screenshots/ctxpopup_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01.eps rename to doc/img/screenshots/ctxpopup_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01.png b/doc/img/screenshots/ctxpopup_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01.png rename to doc/img/screenshots/ctxpopup_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01_a.eps b/doc/img/screenshots/ctxpopup_example_01_a.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01_a.eps rename to doc/img/screenshots/ctxpopup_example_01_a.eps diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01_a.png b/doc/img/screenshots/ctxpopup_example_01_a.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01_a.png rename to doc/img/screenshots/ctxpopup_example_01_a.png diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01_b.eps b/doc/img/screenshots/ctxpopup_example_01_b.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01_b.eps rename to doc/img/screenshots/ctxpopup_example_01_b.eps diff --git a/legacy/elementary/doc/img/screenshots/ctxpopup_example_01_b.png b/doc/img/screenshots/ctxpopup_example_01_b.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/ctxpopup_example_01_b.png rename to doc/img/screenshots/ctxpopup_example_01_b.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_00.eps b/doc/img/screenshots/fileselector_button_example_00.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_00.eps rename to doc/img/screenshots/fileselector_button_example_00.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_00.png b/doc/img/screenshots/fileselector_button_example_00.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_00.png rename to doc/img/screenshots/fileselector_button_example_00.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_01.eps b/doc/img/screenshots/fileselector_button_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_01.eps rename to doc/img/screenshots/fileselector_button_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_01.png b/doc/img/screenshots/fileselector_button_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_01.png rename to doc/img/screenshots/fileselector_button_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_02.eps b/doc/img/screenshots/fileselector_button_example_02.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_02.eps rename to doc/img/screenshots/fileselector_button_example_02.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_02.png b/doc/img/screenshots/fileselector_button_example_02.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_02.png rename to doc/img/screenshots/fileselector_button_example_02.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_03.eps b/doc/img/screenshots/fileselector_button_example_03.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_03.eps rename to doc/img/screenshots/fileselector_button_example_03.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_button_example_03.png b/doc/img/screenshots/fileselector_button_example_03.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_button_example_03.png rename to doc/img/screenshots/fileselector_button_example_03.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_00.eps b/doc/img/screenshots/fileselector_entry_example_00.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_00.eps rename to doc/img/screenshots/fileselector_entry_example_00.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_00.png b/doc/img/screenshots/fileselector_entry_example_00.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_00.png rename to doc/img/screenshots/fileselector_entry_example_00.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_01.eps b/doc/img/screenshots/fileselector_entry_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_01.eps rename to doc/img/screenshots/fileselector_entry_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_01.png b/doc/img/screenshots/fileselector_entry_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_01.png rename to doc/img/screenshots/fileselector_entry_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_02.eps b/doc/img/screenshots/fileselector_entry_example_02.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_02.eps rename to doc/img/screenshots/fileselector_entry_example_02.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_02.png b/doc/img/screenshots/fileselector_entry_example_02.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_02.png rename to doc/img/screenshots/fileselector_entry_example_02.png diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_03.eps b/doc/img/screenshots/fileselector_entry_example_03.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_03.eps rename to doc/img/screenshots/fileselector_entry_example_03.eps diff --git a/legacy/elementary/doc/img/screenshots/fileselector_entry_example_03.png b/doc/img/screenshots/fileselector_entry_example_03.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/fileselector_entry_example_03.png rename to doc/img/screenshots/fileselector_entry_example_03.png diff --git a/legacy/elementary/doc/img/screenshots/hover_example_01_a.eps b/doc/img/screenshots/hover_example_01_a.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/hover_example_01_a.eps rename to doc/img/screenshots/hover_example_01_a.eps diff --git a/legacy/elementary/doc/img/screenshots/hover_example_01_a.png b/doc/img/screenshots/hover_example_01_a.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/hover_example_01_a.png rename to doc/img/screenshots/hover_example_01_a.png diff --git a/legacy/elementary/doc/img/screenshots/hoversel_example_01_a.eps b/doc/img/screenshots/hoversel_example_01_a.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/hoversel_example_01_a.eps rename to doc/img/screenshots/hoversel_example_01_a.eps diff --git a/legacy/elementary/doc/img/screenshots/hoversel_example_01_a.png b/doc/img/screenshots/hoversel_example_01_a.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/hoversel_example_01_a.png rename to doc/img/screenshots/hoversel_example_01_a.png diff --git a/legacy/elementary/doc/img/screenshots/icon_example_01.eps b/doc/img/screenshots/icon_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/icon_example_01.eps rename to doc/img/screenshots/icon_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/icon_example_01.png b/doc/img/screenshots/icon_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/icon_example_01.png rename to doc/img/screenshots/icon_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/index_example_00.eps b/doc/img/screenshots/index_example_00.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/index_example_00.eps rename to doc/img/screenshots/index_example_00.eps diff --git a/legacy/elementary/doc/img/screenshots/index_example_00.png b/doc/img/screenshots/index_example_00.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/index_example_00.png rename to doc/img/screenshots/index_example_00.png diff --git a/legacy/elementary/doc/img/screenshots/index_example_01.eps b/doc/img/screenshots/index_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/index_example_01.eps rename to doc/img/screenshots/index_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/index_example_01.png b/doc/img/screenshots/index_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/index_example_01.png rename to doc/img/screenshots/index_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/layout_example_01.eps b/doc/img/screenshots/layout_example_01.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_01.eps rename to doc/img/screenshots/layout_example_01.eps diff --git a/legacy/elementary/doc/img/screenshots/layout_example_01.png b/doc/img/screenshots/layout_example_01.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_01.png rename to doc/img/screenshots/layout_example_01.png diff --git a/legacy/elementary/doc/img/screenshots/layout_example_02.eps b/doc/img/screenshots/layout_example_02.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_02.eps rename to doc/img/screenshots/layout_example_02.eps diff --git a/legacy/elementary/doc/img/screenshots/layout_example_02.png b/doc/img/screenshots/layout_example_02.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_02.png rename to doc/img/screenshots/layout_example_02.png diff --git a/legacy/elementary/doc/img/screenshots/layout_example_03.eps b/doc/img/screenshots/layout_example_03.eps similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_03.eps rename to doc/img/screenshots/layout_example_03.eps diff --git a/legacy/elementary/doc/img/screenshots/layout_example_03.png b/doc/img/screenshots/layout_example_03.png similarity index 100% rename from legacy/elementary/doc/img/screenshots/layout_example_03.png rename to doc/img/screenshots/layout_example_03.png diff --git a/legacy/elementary/doc/img/scroller_inheritance_tree.eps b/doc/img/scroller_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/scroller_inheritance_tree.eps rename to doc/img/scroller_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/scroller_inheritance_tree.png b/doc/img/scroller_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/scroller_inheritance_tree.png rename to doc/img/scroller_inheritance_tree.png diff --git a/legacy/elementary/doc/img/segment_control.eps b/doc/img/segment_control.eps similarity index 100% rename from legacy/elementary/doc/img/segment_control.eps rename to doc/img/segment_control.eps diff --git a/legacy/elementary/doc/img/segment_control.png b/doc/img/segment_control.png similarity index 100% rename from legacy/elementary/doc/img/segment_control.png rename to doc/img/segment_control.png diff --git a/legacy/elementary/doc/img/segment_control_inheritance_tree.eps b/doc/img/segment_control_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/segment_control_inheritance_tree.eps rename to doc/img/segment_control_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/segment_control_inheritance_tree.png b/doc/img/segment_control_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/segment_control_inheritance_tree.png rename to doc/img/segment_control_inheritance_tree.png diff --git a/legacy/elementary/doc/img/separator_inheritance_tree.eps b/doc/img/separator_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/separator_inheritance_tree.eps rename to doc/img/separator_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/separator_inheritance_tree.png b/doc/img/separator_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/separator_inheritance_tree.png rename to doc/img/separator_inheritance_tree.png diff --git a/legacy/elementary/doc/img/slider_inheritance_tree.eps b/doc/img/slider_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/slider_inheritance_tree.eps rename to doc/img/slider_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/slider_inheritance_tree.png b/doc/img/slider_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/slider_inheritance_tree.png rename to doc/img/slider_inheritance_tree.png diff --git a/legacy/elementary/doc/img/slideshow_inheritance_tree.eps b/doc/img/slideshow_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/slideshow_inheritance_tree.eps rename to doc/img/slideshow_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/slideshow_inheritance_tree.png b/doc/img/slideshow_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/slideshow_inheritance_tree.png rename to doc/img/slideshow_inheritance_tree.png diff --git a/legacy/elementary/doc/img/spinner_inheritance_tree.eps b/doc/img/spinner_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/spinner_inheritance_tree.eps rename to doc/img/spinner_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/spinner_inheritance_tree.png b/doc/img/spinner_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/spinner_inheritance_tree.png rename to doc/img/spinner_inheritance_tree.png diff --git a/legacy/elementary/doc/img/table_inheritance_tree.eps b/doc/img/table_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/table_inheritance_tree.eps rename to doc/img/table_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/table_inheritance_tree.png b/doc/img/table_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/table_inheritance_tree.png rename to doc/img/table_inheritance_tree.png diff --git a/legacy/elementary/doc/img/thumb_inheritance_tree.eps b/doc/img/thumb_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/thumb_inheritance_tree.eps rename to doc/img/thumb_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/thumb_inheritance_tree.png b/doc/img/thumb_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/thumb_inheritance_tree.png rename to doc/img/thumb_inheritance_tree.png diff --git a/legacy/elementary/doc/img/toolbar.eps b/doc/img/toolbar.eps similarity index 100% rename from legacy/elementary/doc/img/toolbar.eps rename to doc/img/toolbar.eps diff --git a/legacy/elementary/doc/img/toolbar.png b/doc/img/toolbar.png similarity index 100% rename from legacy/elementary/doc/img/toolbar.png rename to doc/img/toolbar.png diff --git a/legacy/elementary/doc/img/toolbar_inheritance_tree.eps b/doc/img/toolbar_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/toolbar_inheritance_tree.eps rename to doc/img/toolbar_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/toolbar_inheritance_tree.png b/doc/img/toolbar_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/toolbar_inheritance_tree.png rename to doc/img/toolbar_inheritance_tree.png diff --git a/legacy/elementary/doc/img/video_inheritance_tree.eps b/doc/img/video_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/video_inheritance_tree.eps rename to doc/img/video_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/video_inheritance_tree.png b/doc/img/video_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/video_inheritance_tree.png rename to doc/img/video_inheritance_tree.png diff --git a/legacy/elementary/doc/img/web_inheritance_tree.eps b/doc/img/web_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/web_inheritance_tree.eps rename to doc/img/web_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/web_inheritance_tree.png b/doc/img/web_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/web_inheritance_tree.png rename to doc/img/web_inheritance_tree.png diff --git a/legacy/elementary/doc/img/win_inheritance_tree.eps b/doc/img/win_inheritance_tree.eps similarity index 100% rename from legacy/elementary/doc/img/win_inheritance_tree.eps rename to doc/img/win_inheritance_tree.eps diff --git a/legacy/elementary/doc/img/win_inheritance_tree.png b/doc/img/win_inheritance_tree.png similarity index 100% rename from legacy/elementary/doc/img/win_inheritance_tree.png rename to doc/img/win_inheritance_tree.png diff --git a/legacy/elementary/doc/shot.sh b/doc/shot.sh similarity index 100% rename from legacy/elementary/doc/shot.sh rename to doc/shot.sh diff --git a/legacy/elementary/doc/widget_hierarchy.py b/doc/widget_hierarchy.py similarity index 100% rename from legacy/elementary/doc/widget_hierarchy.py rename to doc/widget_hierarchy.py diff --git a/legacy/elementary/doc/widgets/Makefile.am b/doc/widgets/Makefile.am similarity index 100% rename from legacy/elementary/doc/widgets/Makefile.am rename to doc/widgets/Makefile.am diff --git a/legacy/elementary/doc/widgets/widget_preview_actionslider.c b/doc/widgets/widget_preview_actionslider.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_actionslider.c rename to doc/widgets/widget_preview_actionslider.c diff --git a/legacy/elementary/doc/widgets/widget_preview_bg.c b/doc/widgets/widget_preview_bg.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_bg.c rename to doc/widgets/widget_preview_bg.c diff --git a/legacy/elementary/doc/widgets/widget_preview_box.c b/doc/widgets/widget_preview_box.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_box.c rename to doc/widgets/widget_preview_box.c diff --git a/legacy/elementary/doc/widgets/widget_preview_bubble1.c b/doc/widgets/widget_preview_bubble1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_bubble1.c rename to doc/widgets/widget_preview_bubble1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_bubble2.c b/doc/widgets/widget_preview_bubble2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_bubble2.c rename to doc/widgets/widget_preview_bubble2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_bubble3.c b/doc/widgets/widget_preview_bubble3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_bubble3.c rename to doc/widgets/widget_preview_bubble3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_button1.c b/doc/widgets/widget_preview_button1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_button1.c rename to doc/widgets/widget_preview_button1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_button2.c b/doc/widgets/widget_preview_button2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_button2.c rename to doc/widgets/widget_preview_button2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_button3.c b/doc/widgets/widget_preview_button3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_button3.c rename to doc/widgets/widget_preview_button3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_calendar.c b/doc/widgets/widget_preview_calendar.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_calendar.c rename to doc/widgets/widget_preview_calendar.c diff --git a/legacy/elementary/doc/widgets/widget_preview_check1.c b/doc/widgets/widget_preview_check1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_check1.c rename to doc/widgets/widget_preview_check1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_check2.c b/doc/widgets/widget_preview_check2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_check2.c rename to doc/widgets/widget_preview_check2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_check3.c b/doc/widgets/widget_preview_check3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_check3.c rename to doc/widgets/widget_preview_check3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_clock.c b/doc/widgets/widget_preview_clock.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_clock.c rename to doc/widgets/widget_preview_clock.c diff --git a/legacy/elementary/doc/widgets/widget_preview_colorselector.c b/doc/widgets/widget_preview_colorselector.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_colorselector.c rename to doc/widgets/widget_preview_colorselector.c diff --git a/legacy/elementary/doc/widgets/widget_preview_combobox.c b/doc/widgets/widget_preview_combobox.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_combobox.c rename to doc/widgets/widget_preview_combobox.c diff --git a/legacy/elementary/doc/widgets/widget_preview_conformant.c b/doc/widgets/widget_preview_conformant.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_conformant.c rename to doc/widgets/widget_preview_conformant.c diff --git a/legacy/elementary/doc/widgets/widget_preview_ctxpopup.c b/doc/widgets/widget_preview_ctxpopup.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_ctxpopup.c rename to doc/widgets/widget_preview_ctxpopup.c diff --git a/legacy/elementary/doc/widgets/widget_preview_datetime1.c b/doc/widgets/widget_preview_datetime1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_datetime1.c rename to doc/widgets/widget_preview_datetime1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_datetime2.c b/doc/widgets/widget_preview_datetime2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_datetime2.c rename to doc/widgets/widget_preview_datetime2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_datetime3.c b/doc/widgets/widget_preview_datetime3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_datetime3.c rename to doc/widgets/widget_preview_datetime3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_dayselector.c b/doc/widgets/widget_preview_dayselector.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_dayselector.c rename to doc/widgets/widget_preview_dayselector.c diff --git a/legacy/elementary/doc/widgets/widget_preview_diskselector.c b/doc/widgets/widget_preview_diskselector.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_diskselector.c rename to doc/widgets/widget_preview_diskselector.c diff --git a/legacy/elementary/doc/widgets/widget_preview_entry1.c b/doc/widgets/widget_preview_entry1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_entry1.c rename to doc/widgets/widget_preview_entry1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_entry2.c b/doc/widgets/widget_preview_entry2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_entry2.c rename to doc/widgets/widget_preview_entry2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_entry3.c b/doc/widgets/widget_preview_entry3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_entry3.c rename to doc/widgets/widget_preview_entry3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_entry4.c b/doc/widgets/widget_preview_entry4.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_entry4.c rename to doc/widgets/widget_preview_entry4.c diff --git a/legacy/elementary/doc/widgets/widget_preview_fileselector.c b/doc/widgets/widget_preview_fileselector.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_fileselector.c rename to doc/widgets/widget_preview_fileselector.c diff --git a/legacy/elementary/doc/widgets/widget_preview_fileselector_button1.c b/doc/widgets/widget_preview_fileselector_button1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_fileselector_button1.c rename to doc/widgets/widget_preview_fileselector_button1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_fileselector_button2.c b/doc/widgets/widget_preview_fileselector_button2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_fileselector_button2.c rename to doc/widgets/widget_preview_fileselector_button2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_fileselector_button3.c b/doc/widgets/widget_preview_fileselector_button3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_fileselector_button3.c rename to doc/widgets/widget_preview_fileselector_button3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_fileselector_entry.c b/doc/widgets/widget_preview_fileselector_entry.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_fileselector_entry.c rename to doc/widgets/widget_preview_fileselector_entry.c diff --git a/legacy/elementary/doc/widgets/widget_preview_flip.c b/doc/widgets/widget_preview_flip.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_flip.c rename to doc/widgets/widget_preview_flip.c diff --git a/legacy/elementary/doc/widgets/widget_preview_flipselector.c b/doc/widgets/widget_preview_flipselector.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_flipselector.c rename to doc/widgets/widget_preview_flipselector.c diff --git a/legacy/elementary/doc/widgets/widget_preview_frame.c b/doc/widgets/widget_preview_frame.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_frame.c rename to doc/widgets/widget_preview_frame.c diff --git a/legacy/elementary/doc/widgets/widget_preview_gengrid.c b/doc/widgets/widget_preview_gengrid.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_gengrid.c rename to doc/widgets/widget_preview_gengrid.c diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist1.c b/doc/widgets/widget_preview_genlist1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_genlist1.c rename to doc/widgets/widget_preview_genlist1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist2.c b/doc/widgets/widget_preview_genlist2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_genlist2.c rename to doc/widgets/widget_preview_genlist2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist3.c b/doc/widgets/widget_preview_genlist3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_genlist3.c rename to doc/widgets/widget_preview_genlist3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist4.c b/doc/widgets/widget_preview_genlist4.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_genlist4.c rename to doc/widgets/widget_preview_genlist4.c diff --git a/legacy/elementary/doc/widgets/widget_preview_genlist5.c b/doc/widgets/widget_preview_genlist5.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_genlist5.c rename to doc/widgets/widget_preview_genlist5.c diff --git a/legacy/elementary/doc/widgets/widget_preview_hover.c b/doc/widgets/widget_preview_hover.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_hover.c rename to doc/widgets/widget_preview_hover.c diff --git a/legacy/elementary/doc/widgets/widget_preview_hoversel.c b/doc/widgets/widget_preview_hoversel.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_hoversel.c rename to doc/widgets/widget_preview_hoversel.c diff --git a/legacy/elementary/doc/widgets/widget_preview_icon.c b/doc/widgets/widget_preview_icon.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_icon.c rename to doc/widgets/widget_preview_icon.c diff --git a/legacy/elementary/doc/widgets/widget_preview_image.c b/doc/widgets/widget_preview_image.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_image.c rename to doc/widgets/widget_preview_image.c diff --git a/legacy/elementary/doc/widgets/widget_preview_index.c b/doc/widgets/widget_preview_index.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_index.c rename to doc/widgets/widget_preview_index.c diff --git a/legacy/elementary/doc/widgets/widget_preview_inwin1.c b/doc/widgets/widget_preview_inwin1.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_inwin1.c rename to doc/widgets/widget_preview_inwin1.c diff --git a/legacy/elementary/doc/widgets/widget_preview_inwin2.c b/doc/widgets/widget_preview_inwin2.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_inwin2.c rename to doc/widgets/widget_preview_inwin2.c diff --git a/legacy/elementary/doc/widgets/widget_preview_inwin3.c b/doc/widgets/widget_preview_inwin3.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_inwin3.c rename to doc/widgets/widget_preview_inwin3.c diff --git a/legacy/elementary/doc/widgets/widget_preview_label.c b/doc/widgets/widget_preview_label.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_label.c rename to doc/widgets/widget_preview_label.c diff --git a/legacy/elementary/doc/widgets/widget_preview_layout.c b/doc/widgets/widget_preview_layout.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_layout.c rename to doc/widgets/widget_preview_layout.c diff --git a/legacy/elementary/doc/widgets/widget_preview_list.c b/doc/widgets/widget_preview_list.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_list.c rename to doc/widgets/widget_preview_list.c diff --git a/legacy/elementary/doc/widgets/widget_preview_map.c b/doc/widgets/widget_preview_map.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_map.c rename to doc/widgets/widget_preview_map.c diff --git a/legacy/elementary/doc/widgets/widget_preview_mapbuf.c b/doc/widgets/widget_preview_mapbuf.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_mapbuf.c rename to doc/widgets/widget_preview_mapbuf.c diff --git a/legacy/elementary/doc/widgets/widget_preview_menu.c b/doc/widgets/widget_preview_menu.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_menu.c rename to doc/widgets/widget_preview_menu.c diff --git a/legacy/elementary/doc/widgets/widget_preview_notify.c b/doc/widgets/widget_preview_notify.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_notify.c rename to doc/widgets/widget_preview_notify.c diff --git a/legacy/elementary/doc/widgets/widget_preview_panel.c b/doc/widgets/widget_preview_panel.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_panel.c rename to doc/widgets/widget_preview_panel.c diff --git a/legacy/elementary/doc/widgets/widget_preview_panes.c b/doc/widgets/widget_preview_panes.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_panes.c rename to doc/widgets/widget_preview_panes.c diff --git a/legacy/elementary/doc/widgets/widget_preview_photocam.c b/doc/widgets/widget_preview_photocam.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_photocam.c rename to doc/widgets/widget_preview_photocam.c diff --git a/legacy/elementary/doc/widgets/widget_preview_popup.c b/doc/widgets/widget_preview_popup.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_popup.c rename to doc/widgets/widget_preview_popup.c diff --git a/legacy/elementary/doc/widgets/widget_preview_prefs.c b/doc/widgets/widget_preview_prefs.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_prefs.c rename to doc/widgets/widget_preview_prefs.c diff --git a/legacy/elementary/doc/widgets/widget_preview_prefs.epc b/doc/widgets/widget_preview_prefs.epc similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_prefs.epc rename to doc/widgets/widget_preview_prefs.epc diff --git a/legacy/elementary/doc/widgets/widget_preview_progressbar.c b/doc/widgets/widget_preview_progressbar.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_progressbar.c rename to doc/widgets/widget_preview_progressbar.c diff --git a/legacy/elementary/doc/widgets/widget_preview_radio.c b/doc/widgets/widget_preview_radio.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_radio.c rename to doc/widgets/widget_preview_radio.c diff --git a/legacy/elementary/doc/widgets/widget_preview_scroller.c b/doc/widgets/widget_preview_scroller.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_scroller.c rename to doc/widgets/widget_preview_scroller.c diff --git a/legacy/elementary/doc/widgets/widget_preview_segment_control.c b/doc/widgets/widget_preview_segment_control.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_segment_control.c rename to doc/widgets/widget_preview_segment_control.c diff --git a/legacy/elementary/doc/widgets/widget_preview_separator.c b/doc/widgets/widget_preview_separator.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_separator.c rename to doc/widgets/widget_preview_separator.c diff --git a/legacy/elementary/doc/widgets/widget_preview_slider.c b/doc/widgets/widget_preview_slider.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_slider.c rename to doc/widgets/widget_preview_slider.c diff --git a/legacy/elementary/doc/widgets/widget_preview_slideshow.c b/doc/widgets/widget_preview_slideshow.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_slideshow.c rename to doc/widgets/widget_preview_slideshow.c diff --git a/legacy/elementary/doc/widgets/widget_preview_spinner.c b/doc/widgets/widget_preview_spinner.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_spinner.c rename to doc/widgets/widget_preview_spinner.c diff --git a/legacy/elementary/doc/widgets/widget_preview_table.c b/doc/widgets/widget_preview_table.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_table.c rename to doc/widgets/widget_preview_table.c diff --git a/legacy/elementary/doc/widgets/widget_preview_thumb.c b/doc/widgets/widget_preview_thumb.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_thumb.c rename to doc/widgets/widget_preview_thumb.c diff --git a/legacy/elementary/doc/widgets/widget_preview_tmpl_foot.c b/doc/widgets/widget_preview_tmpl_foot.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_tmpl_foot.c rename to doc/widgets/widget_preview_tmpl_foot.c diff --git a/legacy/elementary/doc/widgets/widget_preview_tmpl_head.c b/doc/widgets/widget_preview_tmpl_head.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_tmpl_head.c rename to doc/widgets/widget_preview_tmpl_head.c diff --git a/legacy/elementary/doc/widgets/widget_preview_toolbar.c b/doc/widgets/widget_preview_toolbar.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_toolbar.c rename to doc/widgets/widget_preview_toolbar.c diff --git a/legacy/elementary/doc/widgets/widget_preview_web.c b/doc/widgets/widget_preview_web.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_web.c rename to doc/widgets/widget_preview_web.c diff --git a/legacy/elementary/doc/widgets/widget_preview_win.c b/doc/widgets/widget_preview_win.c similarity index 100% rename from legacy/elementary/doc/widgets/widget_preview_win.c rename to doc/widgets/widget_preview_win.c diff --git a/legacy/elementary/COMPLIANCE b/legacy/elementary/COMPLIANCE deleted file mode 100644 index 1d98aee3c2..0000000000 --- a/legacy/elementary/COMPLIANCE +++ /dev/null @@ -1,73 +0,0 @@ -Compliance - - This is not a legal notice, so do not treat it as one. This is -intended as "plain English" advice for the average person to ensure -they comply with licenses in this software in the most simple way. It takes -the position of "comply with the MOST restrictive license in this -software and then you will comply with all." If you have any doubts, -please consult the full license COPYING files and a lawyer. Take this -as a rough guide. - -The simple advice - - Do this and you won't go too wrong. - -1. Provide the content of ALL of the COPYING and AUTHORS -files as printed material with your product and/or in a dialog (e.g. -an "about" dialog) in your product user interface. -2. Provide a URL from which to be able to download "tar files" with -ALL of the source of Elementary exactly as it was when used to compile the -binaries for your product that ships Elementary. Keep this URL valid for the -lifetime of the product. -3. If you made changes to Elementary it would be appreciated if you -interacted with us (see http://www.enlightenment.org ) and provided the -changes you made in patch form BEFORE you ship a product, so they may -be reviewed to see if you have made any mistakes and perhaps have -created problems you do not know of yet. - -F.A.Q. - -Q. Where is the licensing information? -A. See the COPYING file here in this directory. This is the proper legal -information you will need. It covers all of elementary, EXCEPT the -theme which is public domain (the text files only - images are not). - -Q. Do I need to make the source public of libraries or applications that I -build on top of Elementary? -A. No. Even the default theme is public domain, which means you can -make your own by copying it and starting from there, and you may -license your copied variation any way you like. - -Q. Do I need to provide the source for Elementary? -A. Yes. In general you do. If you are shipping any of the binaries or -libraries built from Elementary, you must provide the EXACT source code -used to build those binaries. - -Q. If I have to provide source, how should I do this? -A. The best way is to provide a reference in an "about" dialog in the -product that ships the Elementary libraries/tools that gives a URL from -which the source can be downloaded EXACTLY as you used to compile Elementary. -You may not simply point to upstream repositories and pass the problem -to someone else. You MUST provide the source exactly as used. - - You MAY also provide the source code itself on the product itself -(e.g. on its filesystem) (provide the tar archives of the source), or in -place of a download link if you do not believe you will be able to -maintain that download link for the lifetime of the product. - - You MAY also (or instead of the above 2) provide the source on media -(CD, DVD, flash etc.) that accompany the product. - - Choose 1 or more of the above methods and you will be fine. - -Q. Do I need to reproduce the license information in the COPYING file? -A. Yes. You must provide these with your product, and just like the -source code, provide them as part of the user interface in full (e.g. -in a dialog), or as files in the filesystem, on actual printed -material (manuals, papers) that accompany the product or in CD, DVD -etc. media. - -Q. Is there a simpler list of do's and don'ts i can use? -A. Yes. See http://www.tldrlegal.com. specifically: - -http://www.tldrlegal.com/license/gnu-lesser-general-public-license-v2.1-(lgpl-2.1) diff --git a/legacy/elementary/COPYING b/legacy/elementary/COPYING deleted file mode 100644 index 75ee2b319d..0000000000 --- a/legacy/elementary/COPYING +++ /dev/null @@ -1,491 +0,0 @@ -Copyright notice for Elementary: - -Copyright (C) 2008-2014 Carsten Haitzler and various contributors (see AUTHORS) - -This library is free software; you can redistribute it and/or modify it -under the terms of the GNU Lesser General Public License as published by the -Free Software Foundation; version 2.1 of the License. - -This library is distributed in the hope that it will be useful, but WITHOUT -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more -details. - -Below is a copy of the GNU Lesser General Public License that is distributed -along with this library. If you do not have a copy below, write to the Free -Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA - - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent modules, -and to copy and distribute the resulting executable under terms of your -choice, provided that you also meet, for each linked independent module, -the terms and conditions of the license of that module. An independent -module is a module which is not derived from or based on this library. -If you modify this library, you may extend this exception to your version -of the library, but you are not obliged to do so. If you do not wish to -do so, delete this exception statement from your version. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS diff --git a/legacy/elementary/m4/elm_check_backend.m4 b/m4/elm_check_backend.m4 similarity index 100% rename from legacy/elementary/m4/elm_check_backend.m4 rename to m4/elm_check_backend.m4 diff --git a/legacy/elementary/m4/elm_check_option.m4 b/m4/elm_check_option.m4 similarity index 100% rename from legacy/elementary/m4/elm_check_option.m4 rename to m4/elm_check_option.m4 diff --git a/legacy/elementary/m4/elm_quicklaunch.m4 b/m4/elm_quicklaunch.m4 similarity index 100% rename from legacy/elementary/m4/elm_quicklaunch.m4 rename to m4/elm_quicklaunch.m4 diff --git a/legacy/elementary/elementary-cxx.pc.in b/pc/elementary-cxx.pc.in similarity index 100% rename from legacy/elementary/elementary-cxx.pc.in rename to pc/elementary-cxx.pc.in diff --git a/legacy/elementary/elementary.pc.in b/pc/elementary.pc.in similarity index 100% rename from legacy/elementary/elementary.pc.in rename to pc/elementary.pc.in diff --git a/legacy/elementary/src/bin/.gitignore b/src/bin/elementary/.gitignore similarity index 100% rename from legacy/elementary/src/bin/.gitignore rename to src/bin/elementary/.gitignore diff --git a/legacy/elementary/src/bin/Makefile.am b/src/bin/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/bin/Makefile.am rename to src/bin/elementary/Makefile.am diff --git a/legacy/elementary/src/bin/config.c b/src/bin/elementary/config.c similarity index 100% rename from legacy/elementary/src/bin/config.c rename to src/bin/elementary/config.c diff --git a/legacy/elementary/src/bin/elementary_codegen.c b/src/bin/elementary/elementary_codegen.c similarity index 100% rename from legacy/elementary/src/bin/elementary_codegen.c rename to src/bin/elementary/elementary_codegen.c diff --git a/legacy/elementary/src/bin/elm_prefs_cc.c b/src/bin/elementary/elm_prefs_cc.c similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc.c rename to src/bin/elementary/elm_prefs_cc.c diff --git a/legacy/elementary/src/bin/elm_prefs_cc.h b/src/bin/elementary/elm_prefs_cc.h similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc.h rename to src/bin/elementary/elm_prefs_cc.h diff --git a/legacy/elementary/src/bin/elm_prefs_cc_handlers.c b/src/bin/elementary/elm_prefs_cc_handlers.c similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc_handlers.c rename to src/bin/elementary/elm_prefs_cc_handlers.c diff --git a/legacy/elementary/src/bin/elm_prefs_cc_mem.c b/src/bin/elementary/elm_prefs_cc_mem.c similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc_mem.c rename to src/bin/elementary/elm_prefs_cc_mem.c diff --git a/legacy/elementary/src/bin/elm_prefs_cc_out.c b/src/bin/elementary/elm_prefs_cc_out.c similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc_out.c rename to src/bin/elementary/elm_prefs_cc_out.c diff --git a/legacy/elementary/src/bin/elm_prefs_cc_parse.c b/src/bin/elementary/elm_prefs_cc_parse.c similarity index 100% rename from legacy/elementary/src/bin/elm_prefs_cc_parse.c rename to src/bin/elementary/elm_prefs_cc_parse.c diff --git a/legacy/elementary/src/bin/quicklaunch.c b/src/bin/elementary/quicklaunch.c similarity index 100% rename from legacy/elementary/src/bin/quicklaunch.c rename to src/bin/elementary/quicklaunch.c diff --git a/legacy/elementary/src/bin/run.c b/src/bin/elementary/run.c similarity index 100% rename from legacy/elementary/src/bin/run.c rename to src/bin/elementary/run.c diff --git a/legacy/elementary/src/bin/test.c b/src/bin/elementary/test.c similarity index 100% rename from legacy/elementary/src/bin/test.c rename to src/bin/elementary/test.c diff --git a/legacy/elementary/src/bin/test.h b/src/bin/elementary/test.h similarity index 100% rename from legacy/elementary/src/bin/test.h rename to src/bin/elementary/test.h diff --git a/legacy/elementary/src/bin/test_3d.c b/src/bin/elementary/test_3d.c similarity index 100% rename from legacy/elementary/src/bin/test_3d.c rename to src/bin/elementary/test_3d.c diff --git a/legacy/elementary/src/bin/test_access.c b/src/bin/elementary/test_access.c similarity index 100% rename from legacy/elementary/src/bin/test_access.c rename to src/bin/elementary/test_access.c diff --git a/legacy/elementary/src/bin/test_actionslider.c b/src/bin/elementary/test_actionslider.c similarity index 100% rename from legacy/elementary/src/bin/test_actionslider.c rename to src/bin/elementary/test_actionslider.c diff --git a/legacy/elementary/src/bin/test_anim.c b/src/bin/elementary/test_anim.c similarity index 100% rename from legacy/elementary/src/bin/test_anim.c rename to src/bin/elementary/test_anim.c diff --git a/legacy/elementary/src/bin/test_application_server.c b/src/bin/elementary/test_application_server.c similarity index 100% rename from legacy/elementary/src/bin/test_application_server.c rename to src/bin/elementary/test_application_server.c diff --git a/legacy/elementary/src/bin/test_bg.c b/src/bin/elementary/test_bg.c similarity index 100% rename from legacy/elementary/src/bin/test_bg.c rename to src/bin/elementary/test_bg.c diff --git a/legacy/elementary/src/bin/test_box.c b/src/bin/elementary/test_box.c similarity index 100% rename from legacy/elementary/src/bin/test_box.c rename to src/bin/elementary/test_box.c diff --git a/legacy/elementary/src/bin/test_bubble.c b/src/bin/elementary/test_bubble.c similarity index 100% rename from legacy/elementary/src/bin/test_bubble.c rename to src/bin/elementary/test_bubble.c diff --git a/legacy/elementary/src/bin/test_button.c b/src/bin/elementary/test_button.c similarity index 100% rename from legacy/elementary/src/bin/test_button.c rename to src/bin/elementary/test_button.c diff --git a/legacy/elementary/src/bin/test_calendar.c b/src/bin/elementary/test_calendar.c similarity index 100% rename from legacy/elementary/src/bin/test_calendar.c rename to src/bin/elementary/test_calendar.c diff --git a/legacy/elementary/src/bin/test_check.c b/src/bin/elementary/test_check.c similarity index 100% rename from legacy/elementary/src/bin/test_check.c rename to src/bin/elementary/test_check.c diff --git a/legacy/elementary/src/bin/test_clock.c b/src/bin/elementary/test_clock.c similarity index 100% rename from legacy/elementary/src/bin/test_clock.c rename to src/bin/elementary/test_clock.c diff --git a/legacy/elementary/src/bin/test_cnp.c b/src/bin/elementary/test_cnp.c similarity index 100% rename from legacy/elementary/src/bin/test_cnp.c rename to src/bin/elementary/test_cnp.c diff --git a/legacy/elementary/src/bin/test_colorclass.c b/src/bin/elementary/test_colorclass.c similarity index 100% rename from legacy/elementary/src/bin/test_colorclass.c rename to src/bin/elementary/test_colorclass.c diff --git a/legacy/elementary/src/bin/test_colorselector.c b/src/bin/elementary/test_colorselector.c similarity index 100% rename from legacy/elementary/src/bin/test_colorselector.c rename to src/bin/elementary/test_colorselector.c diff --git a/legacy/elementary/src/bin/test_combobox.c b/src/bin/elementary/test_combobox.c similarity index 100% rename from legacy/elementary/src/bin/test_combobox.c rename to src/bin/elementary/test_combobox.c diff --git a/legacy/elementary/src/bin/test_config.c b/src/bin/elementary/test_config.c similarity index 100% rename from legacy/elementary/src/bin/test_config.c rename to src/bin/elementary/test_config.c diff --git a/legacy/elementary/src/bin/test_conform.c b/src/bin/elementary/test_conform.c similarity index 100% rename from legacy/elementary/src/bin/test_conform.c rename to src/bin/elementary/test_conform.c diff --git a/legacy/elementary/src/bin/test_conform_indicator.c b/src/bin/elementary/test_conform_indicator.c similarity index 100% rename from legacy/elementary/src/bin/test_conform_indicator.c rename to src/bin/elementary/test_conform_indicator.c diff --git a/legacy/elementary/src/bin/test_ctxpopup.c b/src/bin/elementary/test_ctxpopup.c similarity index 100% rename from legacy/elementary/src/bin/test_ctxpopup.c rename to src/bin/elementary/test_ctxpopup.c diff --git a/legacy/elementary/src/bin/test_cursor.c b/src/bin/elementary/test_cursor.c similarity index 100% rename from legacy/elementary/src/bin/test_cursor.c rename to src/bin/elementary/test_cursor.c diff --git a/legacy/elementary/src/bin/test_datetime.c b/src/bin/elementary/test_datetime.c similarity index 100% rename from legacy/elementary/src/bin/test_datetime.c rename to src/bin/elementary/test_datetime.c diff --git a/legacy/elementary/src/bin/test_dayselector.c b/src/bin/elementary/test_dayselector.c similarity index 100% rename from legacy/elementary/src/bin/test_dayselector.c rename to src/bin/elementary/test_dayselector.c diff --git a/legacy/elementary/src/bin/test_disable.c b/src/bin/elementary/test_disable.c similarity index 100% rename from legacy/elementary/src/bin/test_disable.c rename to src/bin/elementary/test_disable.c diff --git a/legacy/elementary/src/bin/test_diskselector.c b/src/bin/elementary/test_diskselector.c similarity index 100% rename from legacy/elementary/src/bin/test_diskselector.c rename to src/bin/elementary/test_diskselector.c diff --git a/legacy/elementary/src/bin/test_dnd.c b/src/bin/elementary/test_dnd.c similarity index 100% rename from legacy/elementary/src/bin/test_dnd.c rename to src/bin/elementary/test_dnd.c diff --git a/legacy/elementary/src/bin/test_eio.c b/src/bin/elementary/test_eio.c similarity index 100% rename from legacy/elementary/src/bin/test_eio.c rename to src/bin/elementary/test_eio.c diff --git a/legacy/elementary/src/bin/test_entry.c b/src/bin/elementary/test_entry.c similarity index 100% rename from legacy/elementary/src/bin/test_entry.c rename to src/bin/elementary/test_entry.c diff --git a/legacy/elementary/src/bin/test_entry_anchor.c b/src/bin/elementary/test_entry_anchor.c similarity index 100% rename from legacy/elementary/src/bin/test_entry_anchor.c rename to src/bin/elementary/test_entry_anchor.c diff --git a/legacy/elementary/src/bin/test_entry_anchor2.c b/src/bin/elementary/test_entry_anchor2.c similarity index 100% rename from legacy/elementary/src/bin/test_entry_anchor2.c rename to src/bin/elementary/test_entry_anchor2.c diff --git a/legacy/elementary/src/bin/test_explode.c b/src/bin/elementary/test_explode.c similarity index 100% rename from legacy/elementary/src/bin/test_explode.c rename to src/bin/elementary/test_explode.c diff --git a/legacy/elementary/src/bin/test_explode.h b/src/bin/elementary/test_explode.h similarity index 100% rename from legacy/elementary/src/bin/test_explode.h rename to src/bin/elementary/test_explode.h diff --git a/legacy/elementary/src/bin/test_external.c b/src/bin/elementary/test_external.c similarity index 100% rename from legacy/elementary/src/bin/test_external.c rename to src/bin/elementary/test_external.c diff --git a/legacy/elementary/src/bin/test_factory.c b/src/bin/elementary/test_factory.c similarity index 100% rename from legacy/elementary/src/bin/test_factory.c rename to src/bin/elementary/test_factory.c diff --git a/legacy/elementary/src/bin/test_fileselector.c b/src/bin/elementary/test_fileselector.c similarity index 100% rename from legacy/elementary/src/bin/test_fileselector.c rename to src/bin/elementary/test_fileselector.c diff --git a/legacy/elementary/src/bin/test_fileselector_button.c b/src/bin/elementary/test_fileselector_button.c similarity index 100% rename from legacy/elementary/src/bin/test_fileselector_button.c rename to src/bin/elementary/test_fileselector_button.c diff --git a/legacy/elementary/src/bin/test_fileselector_entry.c b/src/bin/elementary/test_fileselector_entry.c similarity index 100% rename from legacy/elementary/src/bin/test_fileselector_entry.c rename to src/bin/elementary/test_fileselector_entry.c diff --git a/legacy/elementary/src/bin/test_flip.c b/src/bin/elementary/test_flip.c similarity index 100% rename from legacy/elementary/src/bin/test_flip.c rename to src/bin/elementary/test_flip.c diff --git a/legacy/elementary/src/bin/test_flip_page.c b/src/bin/elementary/test_flip_page.c similarity index 100% rename from legacy/elementary/src/bin/test_flip_page.c rename to src/bin/elementary/test_flip_page.c diff --git a/legacy/elementary/src/bin/test_flipselector.c b/src/bin/elementary/test_flipselector.c similarity index 100% rename from legacy/elementary/src/bin/test_flipselector.c rename to src/bin/elementary/test_flipselector.c diff --git a/legacy/elementary/src/bin/test_floating.c b/src/bin/elementary/test_floating.c similarity index 100% rename from legacy/elementary/src/bin/test_floating.c rename to src/bin/elementary/test_floating.c diff --git a/legacy/elementary/src/bin/test_focus.c b/src/bin/elementary/test_focus.c similarity index 100% rename from legacy/elementary/src/bin/test_focus.c rename to src/bin/elementary/test_focus.c diff --git a/legacy/elementary/src/bin/test_focus_custom_chain.c b/src/bin/elementary/test_focus_custom_chain.c similarity index 100% rename from legacy/elementary/src/bin/test_focus_custom_chain.c rename to src/bin/elementary/test_focus_custom_chain.c diff --git a/legacy/elementary/src/bin/test_focus_policy.c b/src/bin/elementary/test_focus_policy.c similarity index 100% rename from legacy/elementary/src/bin/test_focus_policy.c rename to src/bin/elementary/test_focus_policy.c diff --git a/legacy/elementary/src/bin/test_focus_style.c b/src/bin/elementary/test_focus_style.c similarity index 100% rename from legacy/elementary/src/bin/test_focus_style.c rename to src/bin/elementary/test_focus_style.c diff --git a/legacy/elementary/src/bin/test_gengrid.c b/src/bin/elementary/test_gengrid.c similarity index 100% rename from legacy/elementary/src/bin/test_gengrid.c rename to src/bin/elementary/test_gengrid.c diff --git a/legacy/elementary/src/bin/test_genlist.c b/src/bin/elementary/test_genlist.c similarity index 100% rename from legacy/elementary/src/bin/test_genlist.c rename to src/bin/elementary/test_genlist.c diff --git a/legacy/elementary/src/bin/test_gesture_layer.c b/src/bin/elementary/test_gesture_layer.c similarity index 100% rename from legacy/elementary/src/bin/test_gesture_layer.c rename to src/bin/elementary/test_gesture_layer.c diff --git a/legacy/elementary/src/bin/test_gesture_layer2.c b/src/bin/elementary/test_gesture_layer2.c similarity index 100% rename from legacy/elementary/src/bin/test_gesture_layer2.c rename to src/bin/elementary/test_gesture_layer2.c diff --git a/legacy/elementary/src/bin/test_gesture_layer3.c b/src/bin/elementary/test_gesture_layer3.c similarity index 100% rename from legacy/elementary/src/bin/test_gesture_layer3.c rename to src/bin/elementary/test_gesture_layer3.c diff --git a/legacy/elementary/src/bin/test_glview.c b/src/bin/elementary/test_glview.c similarity index 100% rename from legacy/elementary/src/bin/test_glview.c rename to src/bin/elementary/test_glview.c diff --git a/legacy/elementary/src/bin/test_glview_manygears.c b/src/bin/elementary/test_glview_manygears.c similarity index 100% rename from legacy/elementary/src/bin/test_glview_manygears.c rename to src/bin/elementary/test_glview_manygears.c diff --git a/legacy/elementary/src/bin/test_glview_simple.c b/src/bin/elementary/test_glview_simple.c similarity index 100% rename from legacy/elementary/src/bin/test_glview_simple.c rename to src/bin/elementary/test_glview_simple.c diff --git a/legacy/elementary/src/bin/test_grid.c b/src/bin/elementary/test_grid.c similarity index 100% rename from legacy/elementary/src/bin/test_grid.c rename to src/bin/elementary/test_grid.c diff --git a/legacy/elementary/src/bin/test_hover.c b/src/bin/elementary/test_hover.c similarity index 100% rename from legacy/elementary/src/bin/test_hover.c rename to src/bin/elementary/test_hover.c diff --git a/legacy/elementary/src/bin/test_hoversel.c b/src/bin/elementary/test_hoversel.c similarity index 100% rename from legacy/elementary/src/bin/test_hoversel.c rename to src/bin/elementary/test_hoversel.c diff --git a/legacy/elementary/src/bin/test_icon.c b/src/bin/elementary/test_icon.c similarity index 100% rename from legacy/elementary/src/bin/test_icon.c rename to src/bin/elementary/test_icon.c diff --git a/legacy/elementary/src/bin/test_icon_animated.c b/src/bin/elementary/test_icon_animated.c similarity index 100% rename from legacy/elementary/src/bin/test_icon_animated.c rename to src/bin/elementary/test_icon_animated.c diff --git a/legacy/elementary/src/bin/test_icon_desktops.c b/src/bin/elementary/test_icon_desktops.c similarity index 100% rename from legacy/elementary/src/bin/test_icon_desktops.c rename to src/bin/elementary/test_icon_desktops.c diff --git a/legacy/elementary/src/bin/test_image.c b/src/bin/elementary/test_image.c similarity index 100% rename from legacy/elementary/src/bin/test_image.c rename to src/bin/elementary/test_image.c diff --git a/legacy/elementary/src/bin/test_index.c b/src/bin/elementary/test_index.c similarity index 100% rename from legacy/elementary/src/bin/test_index.c rename to src/bin/elementary/test_index.c diff --git a/legacy/elementary/src/bin/test_inwin.c b/src/bin/elementary/test_inwin.c similarity index 100% rename from legacy/elementary/src/bin/test_inwin.c rename to src/bin/elementary/test_inwin.c diff --git a/legacy/elementary/src/bin/test_label.c b/src/bin/elementary/test_label.c similarity index 100% rename from legacy/elementary/src/bin/test_label.c rename to src/bin/elementary/test_label.c diff --git a/legacy/elementary/src/bin/test_launcher.c b/src/bin/elementary/test_launcher.c similarity index 100% rename from legacy/elementary/src/bin/test_launcher.c rename to src/bin/elementary/test_launcher.c diff --git a/legacy/elementary/src/bin/test_layout.c b/src/bin/elementary/test_layout.c similarity index 100% rename from legacy/elementary/src/bin/test_layout.c rename to src/bin/elementary/test_layout.c diff --git a/legacy/elementary/src/bin/test_list.c b/src/bin/elementary/test_list.c similarity index 100% rename from legacy/elementary/src/bin/test_list.c rename to src/bin/elementary/test_list.c diff --git a/legacy/elementary/src/bin/test_main_menu.c b/src/bin/elementary/test_main_menu.c similarity index 100% rename from legacy/elementary/src/bin/test_main_menu.c rename to src/bin/elementary/test_main_menu.c diff --git a/legacy/elementary/src/bin/test_map.c b/src/bin/elementary/test_map.c similarity index 100% rename from legacy/elementary/src/bin/test_map.c rename to src/bin/elementary/test_map.c diff --git a/legacy/elementary/src/bin/test_menu.c b/src/bin/elementary/test_menu.c similarity index 100% rename from legacy/elementary/src/bin/test_menu.c rename to src/bin/elementary/test_menu.c diff --git a/legacy/elementary/src/bin/test_multi.c b/src/bin/elementary/test_multi.c similarity index 100% rename from legacy/elementary/src/bin/test_multi.c rename to src/bin/elementary/test_multi.c diff --git a/legacy/elementary/src/bin/test_multibuttonentry.c b/src/bin/elementary/test_multibuttonentry.c similarity index 100% rename from legacy/elementary/src/bin/test_multibuttonentry.c rename to src/bin/elementary/test_multibuttonentry.c diff --git a/legacy/elementary/src/bin/test_naviframe.c b/src/bin/elementary/test_naviframe.c similarity index 100% rename from legacy/elementary/src/bin/test_naviframe.c rename to src/bin/elementary/test_naviframe.c diff --git a/legacy/elementary/src/bin/test_naviframe_complex.c b/src/bin/elementary/test_naviframe_complex.c similarity index 100% rename from legacy/elementary/src/bin/test_naviframe_complex.c rename to src/bin/elementary/test_naviframe_complex.c diff --git a/legacy/elementary/src/bin/test_notify.c b/src/bin/elementary/test_notify.c similarity index 100% rename from legacy/elementary/src/bin/test_notify.c rename to src/bin/elementary/test_notify.c diff --git a/legacy/elementary/src/bin/test_panel.c b/src/bin/elementary/test_panel.c similarity index 100% rename from legacy/elementary/src/bin/test_panel.c rename to src/bin/elementary/test_panel.c diff --git a/legacy/elementary/src/bin/test_panes.c b/src/bin/elementary/test_panes.c similarity index 100% rename from legacy/elementary/src/bin/test_panes.c rename to src/bin/elementary/test_panes.c diff --git a/legacy/elementary/src/bin/test_photo.c b/src/bin/elementary/test_photo.c similarity index 100% rename from legacy/elementary/src/bin/test_photo.c rename to src/bin/elementary/test_photo.c diff --git a/legacy/elementary/src/bin/test_photocam.c b/src/bin/elementary/test_photocam.c similarity index 100% rename from legacy/elementary/src/bin/test_photocam.c rename to src/bin/elementary/test_photocam.c diff --git a/legacy/elementary/src/bin/test_popup.c b/src/bin/elementary/test_popup.c similarity index 100% rename from legacy/elementary/src/bin/test_popup.c rename to src/bin/elementary/test_popup.c diff --git a/legacy/elementary/src/bin/test_prefs.c b/src/bin/elementary/test_prefs.c similarity index 100% rename from legacy/elementary/src/bin/test_prefs.c rename to src/bin/elementary/test_prefs.c diff --git a/legacy/elementary/src/bin/test_progressbar.c b/src/bin/elementary/test_progressbar.c similarity index 100% rename from legacy/elementary/src/bin/test_progressbar.c rename to src/bin/elementary/test_progressbar.c diff --git a/legacy/elementary/src/bin/test_radio.c b/src/bin/elementary/test_radio.c similarity index 100% rename from legacy/elementary/src/bin/test_radio.c rename to src/bin/elementary/test_radio.c diff --git a/legacy/elementary/src/bin/test_scaling.c b/src/bin/elementary/test_scaling.c similarity index 100% rename from legacy/elementary/src/bin/test_scaling.c rename to src/bin/elementary/test_scaling.c diff --git a/legacy/elementary/src/bin/test_scroller.c b/src/bin/elementary/test_scroller.c similarity index 100% rename from legacy/elementary/src/bin/test_scroller.c rename to src/bin/elementary/test_scroller.c diff --git a/legacy/elementary/src/bin/test_segment_control.c b/src/bin/elementary/test_segment_control.c similarity index 100% rename from legacy/elementary/src/bin/test_segment_control.c rename to src/bin/elementary/test_segment_control.c diff --git a/legacy/elementary/src/bin/test_separator.c b/src/bin/elementary/test_separator.c similarity index 100% rename from legacy/elementary/src/bin/test_separator.c rename to src/bin/elementary/test_separator.c diff --git a/legacy/elementary/src/bin/test_slider.c b/src/bin/elementary/test_slider.c similarity index 100% rename from legacy/elementary/src/bin/test_slider.c rename to src/bin/elementary/test_slider.c diff --git a/legacy/elementary/src/bin/test_slideshow.c b/src/bin/elementary/test_slideshow.c similarity index 100% rename from legacy/elementary/src/bin/test_slideshow.c rename to src/bin/elementary/test_slideshow.c diff --git a/legacy/elementary/src/bin/test_spinner.c b/src/bin/elementary/test_spinner.c similarity index 100% rename from legacy/elementary/src/bin/test_spinner.c rename to src/bin/elementary/test_spinner.c diff --git a/legacy/elementary/src/bin/test_store.c b/src/bin/elementary/test_store.c similarity index 100% rename from legacy/elementary/src/bin/test_store.c rename to src/bin/elementary/test_store.c diff --git a/legacy/elementary/src/bin/test_sys_notify.c b/src/bin/elementary/test_sys_notify.c similarity index 100% rename from legacy/elementary/src/bin/test_sys_notify.c rename to src/bin/elementary/test_sys_notify.c diff --git a/legacy/elementary/src/bin/test_systray.c b/src/bin/elementary/test_systray.c similarity index 100% rename from legacy/elementary/src/bin/test_systray.c rename to src/bin/elementary/test_systray.c diff --git a/legacy/elementary/src/bin/test_table.c b/src/bin/elementary/test_table.c similarity index 100% rename from legacy/elementary/src/bin/test_table.c rename to src/bin/elementary/test_table.c diff --git a/legacy/elementary/src/bin/test_task_switcher.c b/src/bin/elementary/test_task_switcher.c similarity index 100% rename from legacy/elementary/src/bin/test_task_switcher.c rename to src/bin/elementary/test_task_switcher.c diff --git a/legacy/elementary/src/bin/test_thumb.c b/src/bin/elementary/test_thumb.c similarity index 100% rename from legacy/elementary/src/bin/test_thumb.c rename to src/bin/elementary/test_thumb.c diff --git a/legacy/elementary/src/bin/test_toolbar.c b/src/bin/elementary/test_toolbar.c similarity index 100% rename from legacy/elementary/src/bin/test_toolbar.c rename to src/bin/elementary/test_toolbar.c diff --git a/legacy/elementary/src/bin/test_tooltip.c b/src/bin/elementary/test_tooltip.c similarity index 100% rename from legacy/elementary/src/bin/test_tooltip.c rename to src/bin/elementary/test_tooltip.c diff --git a/legacy/elementary/src/bin/test_transit.c b/src/bin/elementary/test_transit.c similarity index 100% rename from legacy/elementary/src/bin/test_transit.c rename to src/bin/elementary/test_transit.c diff --git a/legacy/elementary/src/bin/test_transit_bezier.c b/src/bin/elementary/test_transit_bezier.c similarity index 100% rename from legacy/elementary/src/bin/test_transit_bezier.c rename to src/bin/elementary/test_transit_bezier.c diff --git a/legacy/elementary/src/bin/test_video.c b/src/bin/elementary/test_video.c similarity index 100% rename from legacy/elementary/src/bin/test_video.c rename to src/bin/elementary/test_video.c diff --git a/legacy/elementary/src/bin/test_weather.c b/src/bin/elementary/test_weather.c similarity index 100% rename from legacy/elementary/src/bin/test_weather.c rename to src/bin/elementary/test_weather.c diff --git a/legacy/elementary/src/bin/test_web.c b/src/bin/elementary/test_web.c similarity index 100% rename from legacy/elementary/src/bin/test_web.c rename to src/bin/elementary/test_web.c diff --git a/legacy/elementary/src/bin/test_win_dialog.c b/src/bin/elementary/test_win_dialog.c similarity index 100% rename from legacy/elementary/src/bin/test_win_dialog.c rename to src/bin/elementary/test_win_dialog.c diff --git a/legacy/elementary/src/bin/test_win_inline.c b/src/bin/elementary/test_win_inline.c similarity index 100% rename from legacy/elementary/src/bin/test_win_inline.c rename to src/bin/elementary/test_win_inline.c diff --git a/legacy/elementary/src/bin/test_win_keygrab.c b/src/bin/elementary/test_win_keygrab.c similarity index 100% rename from legacy/elementary/src/bin/test_win_keygrab.c rename to src/bin/elementary/test_win_keygrab.c diff --git a/legacy/elementary/src/bin/test_win_plug.c b/src/bin/elementary/test_win_plug.c similarity index 100% rename from legacy/elementary/src/bin/test_win_plug.c rename to src/bin/elementary/test_win_plug.c diff --git a/legacy/elementary/src/bin/test_win_socket.c b/src/bin/elementary/test_win_socket.c similarity index 100% rename from legacy/elementary/src/bin/test_win_socket.c rename to src/bin/elementary/test_win_socket.c diff --git a/legacy/elementary/src/bin/test_win_state.c b/src/bin/elementary/test_win_state.c similarity index 100% rename from legacy/elementary/src/bin/test_win_state.c rename to src/bin/elementary/test_win_state.c diff --git a/legacy/elementary/src/bin/test_win_wm_rotation.c b/src/bin/elementary/test_win_wm_rotation.c similarity index 100% rename from legacy/elementary/src/bin/test_win_wm_rotation.c rename to src/bin/elementary/test_win_wm_rotation.c diff --git a/legacy/elementary/src/edje_externals/Makefile.am b/src/edje_external/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/edje_externals/Makefile.am rename to src/edje_external/elementary/Makefile.am diff --git a/legacy/elementary/src/edje_externals/elm.c b/src/edje_external/elementary/elm.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm.c rename to src/edje_external/elementary/elm.c diff --git a/legacy/elementary/src/edje_externals/elm_actionslider.c b/src/edje_external/elementary/elm_actionslider.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_actionslider.c rename to src/edje_external/elementary/elm_actionslider.c diff --git a/legacy/elementary/src/edje_externals/elm_bg.c b/src/edje_external/elementary/elm_bg.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_bg.c rename to src/edje_external/elementary/elm_bg.c diff --git a/legacy/elementary/src/edje_externals/elm_bubble.c b/src/edje_external/elementary/elm_bubble.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_bubble.c rename to src/edje_external/elementary/elm_bubble.c diff --git a/legacy/elementary/src/edje_externals/elm_button.c b/src/edje_external/elementary/elm_button.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_button.c rename to src/edje_external/elementary/elm_button.c diff --git a/legacy/elementary/src/edje_externals/elm_calendar.c b/src/edje_external/elementary/elm_calendar.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_calendar.c rename to src/edje_external/elementary/elm_calendar.c diff --git a/legacy/elementary/src/edje_externals/elm_check.c b/src/edje_external/elementary/elm_check.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_check.c rename to src/edje_external/elementary/elm_check.c diff --git a/legacy/elementary/src/edje_externals/elm_clock.c b/src/edje_external/elementary/elm_clock.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_clock.c rename to src/edje_external/elementary/elm_clock.c diff --git a/legacy/elementary/src/edje_externals/elm_entry.c b/src/edje_external/elementary/elm_entry.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_entry.c rename to src/edje_external/elementary/elm_entry.c diff --git a/legacy/elementary/src/edje_externals/elm_fileselector.c b/src/edje_external/elementary/elm_fileselector.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_fileselector.c rename to src/edje_external/elementary/elm_fileselector.c diff --git a/legacy/elementary/src/edje_externals/elm_fileselector_button.c b/src/edje_external/elementary/elm_fileselector_button.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_fileselector_button.c rename to src/edje_external/elementary/elm_fileselector_button.c diff --git a/legacy/elementary/src/edje_externals/elm_fileselector_entry.c b/src/edje_external/elementary/elm_fileselector_entry.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_fileselector_entry.c rename to src/edje_external/elementary/elm_fileselector_entry.c diff --git a/legacy/elementary/src/edje_externals/elm_frame.c b/src/edje_external/elementary/elm_frame.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_frame.c rename to src/edje_external/elementary/elm_frame.c diff --git a/legacy/elementary/src/edje_externals/elm_gengrid.c b/src/edje_external/elementary/elm_gengrid.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_gengrid.c rename to src/edje_external/elementary/elm_gengrid.c diff --git a/legacy/elementary/src/edje_externals/elm_genlist.c b/src/edje_external/elementary/elm_genlist.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_genlist.c rename to src/edje_external/elementary/elm_genlist.c diff --git a/legacy/elementary/src/edje_externals/elm_hoversel.c b/src/edje_external/elementary/elm_hoversel.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_hoversel.c rename to src/edje_external/elementary/elm_hoversel.c diff --git a/legacy/elementary/src/edje_externals/elm_icon.c b/src/edje_external/elementary/elm_icon.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_icon.c rename to src/edje_external/elementary/elm_icon.c diff --git a/legacy/elementary/src/edje_externals/elm_index.c b/src/edje_external/elementary/elm_index.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_index.c rename to src/edje_external/elementary/elm_index.c diff --git a/legacy/elementary/src/edje_externals/elm_label.c b/src/edje_external/elementary/elm_label.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_label.c rename to src/edje_external/elementary/elm_label.c diff --git a/legacy/elementary/src/edje_externals/elm_list.c b/src/edje_external/elementary/elm_list.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_list.c rename to src/edje_external/elementary/elm_list.c diff --git a/legacy/elementary/src/edje_externals/elm_map.c b/src/edje_external/elementary/elm_map.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_map.c rename to src/edje_external/elementary/elm_map.c diff --git a/legacy/elementary/src/edje_externals/elm_multibuttonentry.c b/src/edje_external/elementary/elm_multibuttonentry.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_multibuttonentry.c rename to src/edje_external/elementary/elm_multibuttonentry.c diff --git a/legacy/elementary/src/edje_externals/elm_naviframe.c b/src/edje_external/elementary/elm_naviframe.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_naviframe.c rename to src/edje_external/elementary/elm_naviframe.c diff --git a/legacy/elementary/src/edje_externals/elm_notify.c b/src/edje_external/elementary/elm_notify.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_notify.c rename to src/edje_external/elementary/elm_notify.c diff --git a/legacy/elementary/src/edje_externals/elm_panes.c b/src/edje_external/elementary/elm_panes.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_panes.c rename to src/edje_external/elementary/elm_panes.c diff --git a/legacy/elementary/src/edje_externals/elm_photocam.c b/src/edje_external/elementary/elm_photocam.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_photocam.c rename to src/edje_external/elementary/elm_photocam.c diff --git a/legacy/elementary/src/edje_externals/elm_progressbar.c b/src/edje_external/elementary/elm_progressbar.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_progressbar.c rename to src/edje_external/elementary/elm_progressbar.c diff --git a/legacy/elementary/src/edje_externals/elm_radio.c b/src/edje_external/elementary/elm_radio.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_radio.c rename to src/edje_external/elementary/elm_radio.c diff --git a/legacy/elementary/src/edje_externals/elm_scroller.c b/src/edje_external/elementary/elm_scroller.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_scroller.c rename to src/edje_external/elementary/elm_scroller.c diff --git a/legacy/elementary/src/edje_externals/elm_segment_control.c b/src/edje_external/elementary/elm_segment_control.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_segment_control.c rename to src/edje_external/elementary/elm_segment_control.c diff --git a/legacy/elementary/src/edje_externals/elm_slider.c b/src/edje_external/elementary/elm_slider.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_slider.c rename to src/edje_external/elementary/elm_slider.c diff --git a/legacy/elementary/src/edje_externals/elm_slideshow.c b/src/edje_external/elementary/elm_slideshow.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_slideshow.c rename to src/edje_external/elementary/elm_slideshow.c diff --git a/legacy/elementary/src/edje_externals/elm_spinner.c b/src/edje_external/elementary/elm_spinner.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_spinner.c rename to src/edje_external/elementary/elm_spinner.c diff --git a/legacy/elementary/src/edje_externals/elm_thumb.c b/src/edje_external/elementary/elm_thumb.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_thumb.c rename to src/edje_external/elementary/elm_thumb.c diff --git a/legacy/elementary/src/edje_externals/elm_toolbar.c b/src/edje_external/elementary/elm_toolbar.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_toolbar.c rename to src/edje_external/elementary/elm_toolbar.c diff --git a/legacy/elementary/src/edje_externals/elm_video.c b/src/edje_external/elementary/elm_video.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_video.c rename to src/edje_external/elementary/elm_video.c diff --git a/legacy/elementary/src/edje_externals/elm_web.c b/src/edje_external/elementary/elm_web.c similarity index 100% rename from legacy/elementary/src/edje_externals/elm_web.c rename to src/edje_external/elementary/elm_web.c diff --git a/legacy/elementary/src/edje_externals/modules.inc b/src/edje_external/elementary/modules.inc similarity index 100% rename from legacy/elementary/src/edje_externals/modules.inc rename to src/edje_external/elementary/modules.inc diff --git a/legacy/elementary/src/edje_externals/private.h b/src/edje_external/elementary/private.h similarity index 100% rename from legacy/elementary/src/edje_externals/private.h rename to src/edje_external/elementary/private.h diff --git a/legacy/elementary/src/examples/.gitignore b/src/examples/elementary/.gitignore similarity index 100% rename from legacy/elementary/src/examples/.gitignore rename to src/examples/elementary/.gitignore diff --git a/legacy/elementary/src/examples/Makefile.am b/src/examples/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/examples/Makefile.am rename to src/examples/elementary/Makefile.am diff --git a/legacy/elementary/src/examples/actionslider_example_01.c b/src/examples/elementary/actionslider_example_01.c similarity index 100% rename from legacy/elementary/src/examples/actionslider_example_01.c rename to src/examples/elementary/actionslider_example_01.c diff --git a/legacy/elementary/src/examples/bg_cxx_example_01.cc b/src/examples/elementary/bg_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/bg_cxx_example_01.cc rename to src/examples/elementary/bg_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/bg_cxx_example_02.cc b/src/examples/elementary/bg_cxx_example_02.cc similarity index 100% rename from legacy/elementary/src/examples/bg_cxx_example_02.cc rename to src/examples/elementary/bg_cxx_example_02.cc diff --git a/legacy/elementary/src/examples/bg_example_01.c b/src/examples/elementary/bg_example_01.c similarity index 100% rename from legacy/elementary/src/examples/bg_example_01.c rename to src/examples/elementary/bg_example_01.c diff --git a/legacy/elementary/src/examples/bg_example_01.js b/src/examples/elementary/bg_example_01.js similarity index 100% rename from legacy/elementary/src/examples/bg_example_01.js rename to src/examples/elementary/bg_example_01.js diff --git a/legacy/elementary/src/examples/bg_example_02.c b/src/examples/elementary/bg_example_02.c similarity index 100% rename from legacy/elementary/src/examples/bg_example_02.c rename to src/examples/elementary/bg_example_02.c diff --git a/legacy/elementary/src/examples/bg_example_02.js b/src/examples/elementary/bg_example_02.js similarity index 100% rename from legacy/elementary/src/examples/bg_example_02.js rename to src/examples/elementary/bg_example_02.js diff --git a/legacy/elementary/src/examples/bg_example_03.c b/src/examples/elementary/bg_example_03.c similarity index 100% rename from legacy/elementary/src/examples/bg_example_03.c rename to src/examples/elementary/bg_example_03.c diff --git a/legacy/elementary/src/examples/box_cxx_example_02.cc b/src/examples/elementary/box_cxx_example_02.cc similarity index 100% rename from legacy/elementary/src/examples/box_cxx_example_02.cc rename to src/examples/elementary/box_cxx_example_02.cc diff --git a/legacy/elementary/src/examples/box_example_02.c b/src/examples/elementary/box_example_02.c similarity index 100% rename from legacy/elementary/src/examples/box_example_02.c rename to src/examples/elementary/box_example_02.c diff --git a/legacy/elementary/src/examples/box_js_example_01.js b/src/examples/elementary/box_js_example_01.js similarity index 100% rename from legacy/elementary/src/examples/box_js_example_01.js rename to src/examples/elementary/box_js_example_01.js diff --git a/legacy/elementary/src/examples/box_js_example_02.js b/src/examples/elementary/box_js_example_02.js similarity index 100% rename from legacy/elementary/src/examples/box_js_example_02.js rename to src/examples/elementary/box_js_example_02.js diff --git a/legacy/elementary/src/examples/bubble_cxx_example_01.cc b/src/examples/elementary/bubble_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/bubble_cxx_example_01.cc rename to src/examples/elementary/bubble_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/bubble_example_01.c b/src/examples/elementary/bubble_example_01.c similarity index 100% rename from legacy/elementary/src/examples/bubble_example_01.c rename to src/examples/elementary/bubble_example_01.c diff --git a/legacy/elementary/src/examples/bubble_example_01.js b/src/examples/elementary/bubble_example_01.js similarity index 100% rename from legacy/elementary/src/examples/bubble_example_01.js rename to src/examples/elementary/bubble_example_01.js diff --git a/legacy/elementary/src/examples/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc similarity index 100% rename from legacy/elementary/src/examples/button_cxx_example_00.cc rename to src/examples/elementary/button_cxx_example_00.cc diff --git a/legacy/elementary/src/examples/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/button_cxx_example_01.cc rename to src/examples/elementary/button_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/button_example_00.c b/src/examples/elementary/button_example_00.c similarity index 100% rename from legacy/elementary/src/examples/button_example_00.c rename to src/examples/elementary/button_example_00.c diff --git a/legacy/elementary/src/examples/button_example_00.js b/src/examples/elementary/button_example_00.js similarity index 100% rename from legacy/elementary/src/examples/button_example_00.js rename to src/examples/elementary/button_example_00.js diff --git a/legacy/elementary/src/examples/button_example_01.c b/src/examples/elementary/button_example_01.c similarity index 100% rename from legacy/elementary/src/examples/button_example_01.c rename to src/examples/elementary/button_example_01.c diff --git a/legacy/elementary/src/examples/button_example_01.js b/src/examples/elementary/button_example_01.js similarity index 100% rename from legacy/elementary/src/examples/button_example_01.js rename to src/examples/elementary/button_example_01.js diff --git a/legacy/elementary/src/examples/calendar_cxx_example_01.cc b/src/examples/elementary/calendar_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/calendar_cxx_example_01.cc rename to src/examples/elementary/calendar_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/calendar_cxx_example_02.cc b/src/examples/elementary/calendar_cxx_example_02.cc similarity index 100% rename from legacy/elementary/src/examples/calendar_cxx_example_02.cc rename to src/examples/elementary/calendar_cxx_example_02.cc diff --git a/legacy/elementary/src/examples/calendar_cxx_example_03.cc b/src/examples/elementary/calendar_cxx_example_03.cc similarity index 100% rename from legacy/elementary/src/examples/calendar_cxx_example_03.cc rename to src/examples/elementary/calendar_cxx_example_03.cc diff --git a/legacy/elementary/src/examples/calendar_cxx_example_04.cc b/src/examples/elementary/calendar_cxx_example_04.cc similarity index 100% rename from legacy/elementary/src/examples/calendar_cxx_example_04.cc rename to src/examples/elementary/calendar_cxx_example_04.cc diff --git a/legacy/elementary/src/examples/calendar_cxx_example_05.cc b/src/examples/elementary/calendar_cxx_example_05.cc similarity index 100% rename from legacy/elementary/src/examples/calendar_cxx_example_05.cc rename to src/examples/elementary/calendar_cxx_example_05.cc diff --git a/legacy/elementary/src/examples/calendar_example_01.c b/src/examples/elementary/calendar_example_01.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_01.c rename to src/examples/elementary/calendar_example_01.c diff --git a/legacy/elementary/src/examples/calendar_example_01.js b/src/examples/elementary/calendar_example_01.js similarity index 100% rename from legacy/elementary/src/examples/calendar_example_01.js rename to src/examples/elementary/calendar_example_01.js diff --git a/legacy/elementary/src/examples/calendar_example_02.c b/src/examples/elementary/calendar_example_02.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_02.c rename to src/examples/elementary/calendar_example_02.c diff --git a/legacy/elementary/src/examples/calendar_example_02.js b/src/examples/elementary/calendar_example_02.js similarity index 100% rename from legacy/elementary/src/examples/calendar_example_02.js rename to src/examples/elementary/calendar_example_02.js diff --git a/legacy/elementary/src/examples/calendar_example_03.c b/src/examples/elementary/calendar_example_03.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_03.c rename to src/examples/elementary/calendar_example_03.c diff --git a/legacy/elementary/src/examples/calendar_example_03.js b/src/examples/elementary/calendar_example_03.js similarity index 100% rename from legacy/elementary/src/examples/calendar_example_03.js rename to src/examples/elementary/calendar_example_03.js diff --git a/legacy/elementary/src/examples/calendar_example_04.c b/src/examples/elementary/calendar_example_04.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_04.c rename to src/examples/elementary/calendar_example_04.c diff --git a/legacy/elementary/src/examples/calendar_example_04.js b/src/examples/elementary/calendar_example_04.js similarity index 100% rename from legacy/elementary/src/examples/calendar_example_04.js rename to src/examples/elementary/calendar_example_04.js diff --git a/legacy/elementary/src/examples/calendar_example_05.c b/src/examples/elementary/calendar_example_05.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_05.c rename to src/examples/elementary/calendar_example_05.c diff --git a/legacy/elementary/src/examples/calendar_example_05.js b/src/examples/elementary/calendar_example_05.js similarity index 100% rename from legacy/elementary/src/examples/calendar_example_05.js rename to src/examples/elementary/calendar_example_05.js diff --git a/legacy/elementary/src/examples/calendar_example_06.c b/src/examples/elementary/calendar_example_06.c similarity index 100% rename from legacy/elementary/src/examples/calendar_example_06.c rename to src/examples/elementary/calendar_example_06.c diff --git a/legacy/elementary/src/examples/check_example_01.c b/src/examples/elementary/check_example_01.c similarity index 100% rename from legacy/elementary/src/examples/check_example_01.c rename to src/examples/elementary/check_example_01.c diff --git a/legacy/elementary/src/examples/clock_cxx_example.cc b/src/examples/elementary/clock_cxx_example.cc similarity index 100% rename from legacy/elementary/src/examples/clock_cxx_example.cc rename to src/examples/elementary/clock_cxx_example.cc diff --git a/legacy/elementary/src/examples/clock_example.c b/src/examples/elementary/clock_example.c similarity index 100% rename from legacy/elementary/src/examples/clock_example.c rename to src/examples/elementary/clock_example.c diff --git a/legacy/elementary/src/examples/clock_example.js b/src/examples/elementary/clock_example.js similarity index 100% rename from legacy/elementary/src/examples/clock_example.js rename to src/examples/elementary/clock_example.js diff --git a/legacy/elementary/src/examples/codegen_example.c b/src/examples/elementary/codegen_example.c similarity index 100% rename from legacy/elementary/src/examples/codegen_example.c rename to src/examples/elementary/codegen_example.c diff --git a/legacy/elementary/src/examples/codegen_example.edc b/src/examples/elementary/codegen_example.edc similarity index 100% rename from legacy/elementary/src/examples/codegen_example.edc rename to src/examples/elementary/codegen_example.edc diff --git a/legacy/elementary/src/examples/colorselector_example_01.c b/src/examples/elementary/colorselector_example_01.c similarity index 100% rename from legacy/elementary/src/examples/colorselector_example_01.c rename to src/examples/elementary/colorselector_example_01.c diff --git a/legacy/elementary/src/examples/combobox_example_01.c b/src/examples/elementary/combobox_example_01.c similarity index 100% rename from legacy/elementary/src/examples/combobox_example_01.c rename to src/examples/elementary/combobox_example_01.c diff --git a/legacy/elementary/src/examples/conformant_example_01.c b/src/examples/elementary/conformant_example_01.c similarity index 100% rename from legacy/elementary/src/examples/conformant_example_01.c rename to src/examples/elementary/conformant_example_01.c diff --git a/legacy/elementary/src/examples/conformant_example_02.c b/src/examples/elementary/conformant_example_02.c similarity index 100% rename from legacy/elementary/src/examples/conformant_example_02.c rename to src/examples/elementary/conformant_example_02.c diff --git a/legacy/elementary/src/examples/ctxpopup_example_01.c b/src/examples/elementary/ctxpopup_example_01.c similarity index 100% rename from legacy/elementary/src/examples/ctxpopup_example_01.c rename to src/examples/elementary/ctxpopup_example_01.c diff --git a/legacy/elementary/src/examples/datetime_cxx_example.cc b/src/examples/elementary/datetime_cxx_example.cc similarity index 100% rename from legacy/elementary/src/examples/datetime_cxx_example.cc rename to src/examples/elementary/datetime_cxx_example.cc diff --git a/legacy/elementary/src/examples/datetime_example.c b/src/examples/elementary/datetime_example.c similarity index 100% rename from legacy/elementary/src/examples/datetime_example.c rename to src/examples/elementary/datetime_example.c diff --git a/legacy/elementary/src/examples/datetime_example.js b/src/examples/elementary/datetime_example.js similarity index 100% rename from legacy/elementary/src/examples/datetime_example.js rename to src/examples/elementary/datetime_example.js diff --git a/legacy/elementary/src/examples/dayselector_example.c b/src/examples/elementary/dayselector_example.c similarity index 100% rename from legacy/elementary/src/examples/dayselector_example.c rename to src/examples/elementary/dayselector_example.c diff --git a/legacy/elementary/src/examples/dict.txt b/src/examples/elementary/dict.txt similarity index 100% rename from legacy/elementary/src/examples/dict.txt rename to src/examples/elementary/dict.txt diff --git a/legacy/elementary/src/examples/diskselector_example_01.c b/src/examples/elementary/diskselector_example_01.c similarity index 100% rename from legacy/elementary/src/examples/diskselector_example_01.c rename to src/examples/elementary/diskselector_example_01.c diff --git a/legacy/elementary/src/examples/diskselector_example_02.c b/src/examples/elementary/diskselector_example_02.c similarity index 100% rename from legacy/elementary/src/examples/diskselector_example_02.c rename to src/examples/elementary/diskselector_example_02.c diff --git a/legacy/elementary/src/examples/efl_thread_1.c b/src/examples/elementary/efl_thread_1.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_1.c rename to src/examples/elementary/efl_thread_1.c diff --git a/legacy/elementary/src/examples/efl_thread_2.c b/src/examples/elementary/efl_thread_2.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_2.c rename to src/examples/elementary/efl_thread_2.c diff --git a/legacy/elementary/src/examples/efl_thread_3.c b/src/examples/elementary/efl_thread_3.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_3.c rename to src/examples/elementary/efl_thread_3.c diff --git a/legacy/elementary/src/examples/efl_thread_4.c b/src/examples/elementary/efl_thread_4.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_4.c rename to src/examples/elementary/efl_thread_4.c diff --git a/legacy/elementary/src/examples/efl_thread_5.c b/src/examples/elementary/efl_thread_5.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_5.c rename to src/examples/elementary/efl_thread_5.c diff --git a/legacy/elementary/src/examples/efl_thread_6.c b/src/examples/elementary/efl_thread_6.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_6.c rename to src/examples/elementary/efl_thread_6.c diff --git a/legacy/elementary/src/examples/efl_thread_win32_1.c b/src/examples/elementary/efl_thread_win32_1.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_win32_1.c rename to src/examples/elementary/efl_thread_win32_1.c diff --git a/legacy/elementary/src/examples/efl_thread_win32_2.c b/src/examples/elementary/efl_thread_win32_2.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_win32_2.c rename to src/examples/elementary/efl_thread_win32_2.c diff --git a/legacy/elementary/src/examples/efl_thread_win32_3.c b/src/examples/elementary/efl_thread_win32_3.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_win32_3.c rename to src/examples/elementary/efl_thread_win32_3.c diff --git a/legacy/elementary/src/examples/efl_thread_win32_4.c b/src/examples/elementary/efl_thread_win32_4.c similarity index 100% rename from legacy/elementary/src/examples/efl_thread_win32_4.c rename to src/examples/elementary/efl_thread_win32_4.c diff --git a/legacy/elementary/src/examples/entry_example.c b/src/examples/elementary/entry_example.c similarity index 100% rename from legacy/elementary/src/examples/entry_example.c rename to src/examples/elementary/entry_example.c diff --git a/legacy/elementary/src/examples/evas3d_map_example.c b/src/examples/elementary/evas3d_map_example.c similarity index 100% rename from legacy/elementary/src/examples/evas3d_map_example.c rename to src/examples/elementary/evas3d_map_example.c diff --git a/legacy/elementary/src/examples/evas3d_map_example.edc b/src/examples/elementary/evas3d_map_example.edc similarity index 100% rename from legacy/elementary/src/examples/evas3d_map_example.edc rename to src/examples/elementary/evas3d_map_example.edc diff --git a/legacy/elementary/src/examples/evas3d_object_on_button_example.c b/src/examples/elementary/evas3d_object_on_button_example.c similarity index 100% rename from legacy/elementary/src/examples/evas3d_object_on_button_example.c rename to src/examples/elementary/evas3d_object_on_button_example.c diff --git a/legacy/elementary/src/examples/evas3d_scene_on_button_example.c b/src/examples/elementary/evas3d_scene_on_button_example.c similarity index 100% rename from legacy/elementary/src/examples/evas3d_scene_on_button_example.c rename to src/examples/elementary/evas3d_scene_on_button_example.c diff --git a/legacy/elementary/src/examples/filemvc.c b/src/examples/elementary/filemvc.c similarity index 100% rename from legacy/elementary/src/examples/filemvc.c rename to src/examples/elementary/filemvc.c diff --git a/legacy/elementary/src/examples/fileselector_button_example.c b/src/examples/elementary/fileselector_button_example.c similarity index 100% rename from legacy/elementary/src/examples/fileselector_button_example.c rename to src/examples/elementary/fileselector_button_example.c diff --git a/legacy/elementary/src/examples/fileselector_entry_example.c b/src/examples/elementary/fileselector_entry_example.c similarity index 100% rename from legacy/elementary/src/examples/fileselector_entry_example.c rename to src/examples/elementary/fileselector_entry_example.c diff --git a/legacy/elementary/src/examples/fileselector_example.c b/src/examples/elementary/fileselector_example.c similarity index 100% rename from legacy/elementary/src/examples/fileselector_example.c rename to src/examples/elementary/fileselector_example.c diff --git a/legacy/elementary/src/examples/fileviewlist.c b/src/examples/elementary/fileviewlist.c similarity index 100% rename from legacy/elementary/src/examples/fileviewlist.c rename to src/examples/elementary/fileviewlist.c diff --git a/legacy/elementary/src/examples/flip_example_01.c b/src/examples/elementary/flip_example_01.c similarity index 100% rename from legacy/elementary/src/examples/flip_example_01.c rename to src/examples/elementary/flip_example_01.c diff --git a/legacy/elementary/src/examples/flipselector_example.c b/src/examples/elementary/flipselector_example.c similarity index 100% rename from legacy/elementary/src/examples/flipselector_example.c rename to src/examples/elementary/flipselector_example.c diff --git a/legacy/elementary/src/examples/frame_example_01.c b/src/examples/elementary/frame_example_01.c similarity index 100% rename from legacy/elementary/src/examples/frame_example_01.c rename to src/examples/elementary/frame_example_01.c diff --git a/legacy/elementary/src/examples/general_funcs_example.c b/src/examples/elementary/general_funcs_example.c similarity index 100% rename from legacy/elementary/src/examples/general_funcs_example.c rename to src/examples/elementary/general_funcs_example.c diff --git a/legacy/elementary/src/examples/gengrid_example.c b/src/examples/elementary/gengrid_example.c similarity index 100% rename from legacy/elementary/src/examples/gengrid_example.c rename to src/examples/elementary/gengrid_example.c diff --git a/legacy/elementary/src/examples/genlist_example_01.c b/src/examples/elementary/genlist_example_01.c similarity index 100% rename from legacy/elementary/src/examples/genlist_example_01.c rename to src/examples/elementary/genlist_example_01.c diff --git a/legacy/elementary/src/examples/genlist_example_02.c b/src/examples/elementary/genlist_example_02.c similarity index 100% rename from legacy/elementary/src/examples/genlist_example_02.c rename to src/examples/elementary/genlist_example_02.c diff --git a/legacy/elementary/src/examples/genlist_example_03.c b/src/examples/elementary/genlist_example_03.c similarity index 100% rename from legacy/elementary/src/examples/genlist_example_03.c rename to src/examples/elementary/genlist_example_03.c diff --git a/legacy/elementary/src/examples/genlist_example_04.c b/src/examples/elementary/genlist_example_04.c similarity index 100% rename from legacy/elementary/src/examples/genlist_example_04.c rename to src/examples/elementary/genlist_example_04.c diff --git a/legacy/elementary/src/examples/genlist_example_05.c b/src/examples/elementary/genlist_example_05.c similarity index 100% rename from legacy/elementary/src/examples/genlist_example_05.c rename to src/examples/elementary/genlist_example_05.c diff --git a/legacy/elementary/src/examples/glview_cxx_example_01.cc b/src/examples/elementary/glview_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/glview_cxx_example_01.cc rename to src/examples/elementary/glview_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/glview_example_01.c b/src/examples/elementary/glview_example_01.c similarity index 100% rename from legacy/elementary/src/examples/glview_example_01.c rename to src/examples/elementary/glview_example_01.c diff --git a/legacy/elementary/src/examples/hover_example_01.c b/src/examples/elementary/hover_example_01.c similarity index 100% rename from legacy/elementary/src/examples/hover_example_01.c rename to src/examples/elementary/hover_example_01.c diff --git a/legacy/elementary/src/examples/hoversel_cxx_example_01.cc b/src/examples/elementary/hoversel_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/hoversel_cxx_example_01.cc rename to src/examples/elementary/hoversel_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/hoversel_example_01.c b/src/examples/elementary/hoversel_example_01.c similarity index 100% rename from legacy/elementary/src/examples/hoversel_example_01.c rename to src/examples/elementary/hoversel_example_01.c diff --git a/legacy/elementary/src/examples/icon_cxx_example_01.cc b/src/examples/elementary/icon_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/icon_cxx_example_01.cc rename to src/examples/elementary/icon_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/icon_example_01.c b/src/examples/elementary/icon_example_01.c similarity index 100% rename from legacy/elementary/src/examples/icon_example_01.c rename to src/examples/elementary/icon_example_01.c diff --git a/legacy/elementary/src/examples/icon_example_01.js b/src/examples/elementary/icon_example_01.js similarity index 100% rename from legacy/elementary/src/examples/icon_example_01.js rename to src/examples/elementary/icon_example_01.js diff --git a/legacy/elementary/src/examples/image_example_01.c b/src/examples/elementary/image_example_01.c similarity index 100% rename from legacy/elementary/src/examples/image_example_01.c rename to src/examples/elementary/image_example_01.c diff --git a/legacy/elementary/src/examples/index_example_01.c b/src/examples/elementary/index_example_01.c similarity index 100% rename from legacy/elementary/src/examples/index_example_01.c rename to src/examples/elementary/index_example_01.c diff --git a/legacy/elementary/src/examples/index_example_02.c b/src/examples/elementary/index_example_02.c similarity index 100% rename from legacy/elementary/src/examples/index_example_02.c rename to src/examples/elementary/index_example_02.c diff --git a/legacy/elementary/src/examples/inwin_example.c b/src/examples/elementary/inwin_example.c similarity index 100% rename from legacy/elementary/src/examples/inwin_example.c rename to src/examples/elementary/inwin_example.c diff --git a/legacy/elementary/src/examples/label_example_01.c b/src/examples/elementary/label_example_01.c similarity index 100% rename from legacy/elementary/src/examples/label_example_01.c rename to src/examples/elementary/label_example_01.c diff --git a/legacy/elementary/src/examples/label_example_02.c b/src/examples/elementary/label_example_02.c similarity index 100% rename from legacy/elementary/src/examples/label_example_02.c rename to src/examples/elementary/label_example_02.c diff --git a/legacy/elementary/src/examples/label_example_03.c b/src/examples/elementary/label_example_03.c similarity index 100% rename from legacy/elementary/src/examples/label_example_03.c rename to src/examples/elementary/label_example_03.c diff --git a/legacy/elementary/src/examples/layout_example.edc b/src/examples/elementary/layout_example.edc similarity index 100% rename from legacy/elementary/src/examples/layout_example.edc rename to src/examples/elementary/layout_example.edc diff --git a/legacy/elementary/src/examples/layout_example.js b/src/examples/elementary/layout_example.js similarity index 100% rename from legacy/elementary/src/examples/layout_example.js rename to src/examples/elementary/layout_example.js diff --git a/legacy/elementary/src/examples/layout_example_01.c b/src/examples/elementary/layout_example_01.c similarity index 100% rename from legacy/elementary/src/examples/layout_example_01.c rename to src/examples/elementary/layout_example_01.c diff --git a/legacy/elementary/src/examples/layout_example_02.c b/src/examples/elementary/layout_example_02.c similarity index 100% rename from legacy/elementary/src/examples/layout_example_02.c rename to src/examples/elementary/layout_example_02.c diff --git a/legacy/elementary/src/examples/layout_example_03.c b/src/examples/elementary/layout_example_03.c similarity index 100% rename from legacy/elementary/src/examples/layout_example_03.c rename to src/examples/elementary/layout_example_03.c diff --git a/legacy/elementary/src/examples/list_example_01.c b/src/examples/elementary/list_example_01.c similarity index 100% rename from legacy/elementary/src/examples/list_example_01.c rename to src/examples/elementary/list_example_01.c diff --git a/legacy/elementary/src/examples/list_example_02.c b/src/examples/elementary/list_example_02.c similarity index 100% rename from legacy/elementary/src/examples/list_example_02.c rename to src/examples/elementary/list_example_02.c diff --git a/legacy/elementary/src/examples/list_example_03.c b/src/examples/elementary/list_example_03.c similarity index 100% rename from legacy/elementary/src/examples/list_example_03.c rename to src/examples/elementary/list_example_03.c diff --git a/legacy/elementary/src/examples/location_cxx_example_01.cc b/src/examples/elementary/location_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/location_cxx_example_01.cc rename to src/examples/elementary/location_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/location_example_01.c b/src/examples/elementary/location_example_01.c similarity index 100% rename from legacy/elementary/src/examples/location_example_01.c rename to src/examples/elementary/location_example_01.c diff --git a/legacy/elementary/src/examples/map_example_01.c b/src/examples/elementary/map_example_01.c similarity index 100% rename from legacy/elementary/src/examples/map_example_01.c rename to src/examples/elementary/map_example_01.c diff --git a/legacy/elementary/src/examples/map_example_02.c b/src/examples/elementary/map_example_02.c similarity index 100% rename from legacy/elementary/src/examples/map_example_02.c rename to src/examples/elementary/map_example_02.c diff --git a/legacy/elementary/src/examples/map_example_03.c b/src/examples/elementary/map_example_03.c similarity index 100% rename from legacy/elementary/src/examples/map_example_03.c rename to src/examples/elementary/map_example_03.c diff --git a/legacy/elementary/src/examples/mapbuf_example.c b/src/examples/elementary/mapbuf_example.c similarity index 100% rename from legacy/elementary/src/examples/mapbuf_example.c rename to src/examples/elementary/mapbuf_example.c diff --git a/legacy/elementary/src/examples/menu_cxx_example_01.cc b/src/examples/elementary/menu_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/menu_cxx_example_01.cc rename to src/examples/elementary/menu_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/menu_example_01.c b/src/examples/elementary/menu_example_01.c similarity index 100% rename from legacy/elementary/src/examples/menu_example_01.c rename to src/examples/elementary/menu_example_01.c diff --git a/legacy/elementary/src/examples/menu_example_01.js b/src/examples/elementary/menu_example_01.js similarity index 100% rename from legacy/elementary/src/examples/menu_example_01.js rename to src/examples/elementary/menu_example_01.js diff --git a/legacy/elementary/src/examples/naviframe_example.c b/src/examples/elementary/naviframe_example.c similarity index 100% rename from legacy/elementary/src/examples/naviframe_example.c rename to src/examples/elementary/naviframe_example.c diff --git a/legacy/elementary/src/examples/notify_example_01.c b/src/examples/elementary/notify_example_01.c similarity index 100% rename from legacy/elementary/src/examples/notify_example_01.c rename to src/examples/elementary/notify_example_01.c diff --git a/legacy/elementary/src/examples/panel_example_01.c b/src/examples/elementary/panel_example_01.c similarity index 100% rename from legacy/elementary/src/examples/panel_example_01.c rename to src/examples/elementary/panel_example_01.c diff --git a/legacy/elementary/src/examples/panes_example.c b/src/examples/elementary/panes_example.c similarity index 100% rename from legacy/elementary/src/examples/panes_example.c rename to src/examples/elementary/panes_example.c diff --git a/legacy/elementary/src/examples/performance/HowTo b/src/examples/elementary/performance/HowTo similarity index 100% rename from legacy/elementary/src/examples/performance/HowTo rename to src/examples/elementary/performance/HowTo diff --git a/legacy/elementary/src/examples/performance/Makefile.am b/src/examples/elementary/performance/Makefile.am similarity index 100% rename from legacy/elementary/src/examples/performance/Makefile.am rename to src/examples/elementary/performance/Makefile.am diff --git a/legacy/elementary/src/examples/performance/Tools.h b/src/examples/elementary/performance/Tools.h similarity index 100% rename from legacy/elementary/src/examples/performance/Tools.h rename to src/examples/elementary/performance/Tools.h diff --git a/legacy/elementary/src/examples/performance/background.png b/src/examples/elementary/performance/background.png similarity index 100% rename from legacy/elementary/src/examples/performance/background.png rename to src/examples/elementary/performance/background.png diff --git a/legacy/elementary/src/examples/performance/camera_light.c b/src/examples/elementary/performance/camera_light.c similarity index 100% rename from legacy/elementary/src/examples/performance/camera_light.c rename to src/examples/elementary/performance/camera_light.c diff --git a/legacy/elementary/src/examples/performance/graphical.c b/src/examples/elementary/performance/graphical.c similarity index 100% rename from legacy/elementary/src/examples/performance/graphical.c rename to src/examples/elementary/performance/graphical.c diff --git a/legacy/elementary/src/examples/performance/graphical_struct.h b/src/examples/elementary/performance/graphical_struct.h similarity index 100% rename from legacy/elementary/src/examples/performance/graphical_struct.h rename to src/examples/elementary/performance/graphical_struct.h diff --git a/legacy/elementary/src/examples/performance/initial_config.xml b/src/examples/elementary/performance/initial_config.xml similarity index 100% rename from legacy/elementary/src/examples/performance/initial_config.xml rename to src/examples/elementary/performance/initial_config.xml diff --git a/legacy/elementary/src/examples/performance/layout.edc b/src/examples/elementary/performance/layout.edc similarity index 100% rename from legacy/elementary/src/examples/performance/layout.edc rename to src/examples/elementary/performance/layout.edc diff --git a/legacy/elementary/src/examples/performance/performance.c b/src/examples/elementary/performance/performance.c similarity index 100% rename from legacy/elementary/src/examples/performance/performance.c rename to src/examples/elementary/performance/performance.c diff --git a/legacy/elementary/src/examples/performance/target_texture.png b/src/examples/elementary/performance/target_texture.png similarity index 100% rename from legacy/elementary/src/examples/performance/target_texture.png rename to src/examples/elementary/performance/target_texture.png diff --git a/legacy/elementary/src/examples/performance/tools_private.h b/src/examples/elementary/performance/tools_private.h similarity index 100% rename from legacy/elementary/src/examples/performance/tools_private.h rename to src/examples/elementary/performance/tools_private.h diff --git a/legacy/elementary/src/examples/photocam_example_01.c b/src/examples/elementary/photocam_example_01.c similarity index 100% rename from legacy/elementary/src/examples/photocam_example_01.c rename to src/examples/elementary/photocam_example_01.c diff --git a/legacy/elementary/src/examples/popup_cxx_example_01.cc b/src/examples/elementary/popup_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/popup_cxx_example_01.cc rename to src/examples/elementary/popup_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/popup_example_01.c b/src/examples/elementary/popup_example_01.c similarity index 100% rename from legacy/elementary/src/examples/popup_example_01.c rename to src/examples/elementary/popup_example_01.c diff --git a/legacy/elementary/src/examples/popup_example_01.js b/src/examples/elementary/popup_example_01.js similarity index 100% rename from legacy/elementary/src/examples/popup_example_01.js rename to src/examples/elementary/popup_example_01.js diff --git a/legacy/elementary/src/examples/popup_example_02.c b/src/examples/elementary/popup_example_02.c similarity index 100% rename from legacy/elementary/src/examples/popup_example_02.c rename to src/examples/elementary/popup_example_02.c diff --git a/legacy/elementary/src/examples/popup_example_03.c b/src/examples/elementary/popup_example_03.c similarity index 100% rename from legacy/elementary/src/examples/popup_example_03.c rename to src/examples/elementary/popup_example_03.c diff --git a/legacy/elementary/src/examples/prefs_data_example.c b/src/examples/elementary/prefs_data_example.c similarity index 100% rename from legacy/elementary/src/examples/prefs_data_example.c rename to src/examples/elementary/prefs_data_example.c diff --git a/legacy/elementary/src/examples/prefs_example_01.c b/src/examples/elementary/prefs_example_01.c similarity index 100% rename from legacy/elementary/src/examples/prefs_example_01.c rename to src/examples/elementary/prefs_example_01.c diff --git a/legacy/elementary/src/examples/prefs_example_01.epc b/src/examples/elementary/prefs_example_01.epc similarity index 100% rename from legacy/elementary/src/examples/prefs_example_01.epc rename to src/examples/elementary/prefs_example_01.epc diff --git a/legacy/elementary/src/examples/prefs_example_02.c b/src/examples/elementary/prefs_example_02.c similarity index 100% rename from legacy/elementary/src/examples/prefs_example_02.c rename to src/examples/elementary/prefs_example_02.c diff --git a/legacy/elementary/src/examples/prefs_example_02.epc b/src/examples/elementary/prefs_example_02.epc similarity index 100% rename from legacy/elementary/src/examples/prefs_example_02.epc rename to src/examples/elementary/prefs_example_02.epc diff --git a/legacy/elementary/src/examples/prefs_example_03.c b/src/examples/elementary/prefs_example_03.c similarity index 100% rename from legacy/elementary/src/examples/prefs_example_03.c rename to src/examples/elementary/prefs_example_03.c diff --git a/legacy/elementary/src/examples/prefs_example_03.edc b/src/examples/elementary/prefs_example_03.edc similarity index 100% rename from legacy/elementary/src/examples/prefs_example_03.edc rename to src/examples/elementary/prefs_example_03.edc diff --git a/legacy/elementary/src/examples/prefs_example_03.epc b/src/examples/elementary/prefs_example_03.epc similarity index 100% rename from legacy/elementary/src/examples/prefs_example_03.epc rename to src/examples/elementary/prefs_example_03.epc diff --git a/legacy/elementary/src/examples/progressbar_example.c b/src/examples/elementary/progressbar_example.c similarity index 100% rename from legacy/elementary/src/examples/progressbar_example.c rename to src/examples/elementary/progressbar_example.c diff --git a/legacy/elementary/src/examples/radio_cxx_example_01.cc b/src/examples/elementary/radio_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/radio_cxx_example_01.cc rename to src/examples/elementary/radio_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/radio_example_01.c b/src/examples/elementary/radio_example_01.c similarity index 100% rename from legacy/elementary/src/examples/radio_example_01.c rename to src/examples/elementary/radio_example_01.c diff --git a/legacy/elementary/src/examples/radio_example_01.js b/src/examples/elementary/radio_example_01.js similarity index 100% rename from legacy/elementary/src/examples/radio_example_01.js rename to src/examples/elementary/radio_example_01.js diff --git a/legacy/elementary/src/examples/radio_example_02.c b/src/examples/elementary/radio_example_02.c similarity index 100% rename from legacy/elementary/src/examples/radio_example_02.c rename to src/examples/elementary/radio_example_02.c diff --git a/legacy/elementary/src/examples/scroller_example_01.c b/src/examples/elementary/scroller_example_01.c similarity index 100% rename from legacy/elementary/src/examples/scroller_example_01.c rename to src/examples/elementary/scroller_example_01.c diff --git a/legacy/elementary/src/examples/segment_control_example.c b/src/examples/elementary/segment_control_example.c similarity index 100% rename from legacy/elementary/src/examples/segment_control_example.c rename to src/examples/elementary/segment_control_example.c diff --git a/legacy/elementary/src/examples/separator_cxx_example_01.cc b/src/examples/elementary/separator_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/separator_cxx_example_01.cc rename to src/examples/elementary/separator_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/separator_example_01.c b/src/examples/elementary/separator_example_01.c similarity index 100% rename from legacy/elementary/src/examples/separator_example_01.c rename to src/examples/elementary/separator_example_01.c diff --git a/legacy/elementary/src/examples/separator_example_01.js b/src/examples/elementary/separator_example_01.js similarity index 100% rename from legacy/elementary/src/examples/separator_example_01.js rename to src/examples/elementary/separator_example_01.js diff --git a/legacy/elementary/src/examples/slider_cxx_example.cc b/src/examples/elementary/slider_cxx_example.cc similarity index 100% rename from legacy/elementary/src/examples/slider_cxx_example.cc rename to src/examples/elementary/slider_cxx_example.cc diff --git a/legacy/elementary/src/examples/slider_example.c b/src/examples/elementary/slider_example.c similarity index 100% rename from legacy/elementary/src/examples/slider_example.c rename to src/examples/elementary/slider_example.c diff --git a/legacy/elementary/src/examples/slider_example.js b/src/examples/elementary/slider_example.js similarity index 100% rename from legacy/elementary/src/examples/slider_example.js rename to src/examples/elementary/slider_example.js diff --git a/legacy/elementary/src/examples/slideshow_example.c b/src/examples/elementary/slideshow_example.c similarity index 100% rename from legacy/elementary/src/examples/slideshow_example.c rename to src/examples/elementary/slideshow_example.c diff --git a/legacy/elementary/src/examples/sphere_hunter/EFL_defeat.png b/src/examples/elementary/sphere_hunter/EFL_defeat.png similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/EFL_defeat.png rename to src/examples/elementary/sphere_hunter/EFL_defeat.png diff --git a/legacy/elementary/src/examples/sphere_hunter/EFL_victory.png b/src/examples/elementary/sphere_hunter/EFL_victory.png similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/EFL_victory.png rename to src/examples/elementary/sphere_hunter/EFL_victory.png diff --git a/legacy/elementary/src/examples/sphere_hunter/Makefile.am b/src/examples/elementary/sphere_hunter/Makefile.am similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/Makefile.am rename to src/examples/elementary/sphere_hunter/Makefile.am diff --git a/legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c b/src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/evas_3d_sphere_hunter.c rename to src/examples/elementary/sphere_hunter/evas_3d_sphere_hunter.c diff --git a/legacy/elementary/src/examples/sphere_hunter/score.jpg b/src/examples/elementary/sphere_hunter/score.jpg similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/score.jpg rename to src/examples/elementary/sphere_hunter/score.jpg diff --git a/legacy/elementary/src/examples/sphere_hunter/sphere_hunter.edc b/src/examples/elementary/sphere_hunter/sphere_hunter.edc similarity index 100% rename from legacy/elementary/src/examples/sphere_hunter/sphere_hunter.edc rename to src/examples/elementary/sphere_hunter/sphere_hunter.edc diff --git a/legacy/elementary/src/examples/spinner_cxx_example.cc b/src/examples/elementary/spinner_cxx_example.cc similarity index 100% rename from legacy/elementary/src/examples/spinner_cxx_example.cc rename to src/examples/elementary/spinner_cxx_example.cc diff --git a/legacy/elementary/src/examples/spinner_example.c b/src/examples/elementary/spinner_example.c similarity index 100% rename from legacy/elementary/src/examples/spinner_example.c rename to src/examples/elementary/spinner_example.c diff --git a/legacy/elementary/src/examples/spinner_example.js b/src/examples/elementary/spinner_example.js similarity index 100% rename from legacy/elementary/src/examples/spinner_example.js rename to src/examples/elementary/spinner_example.js diff --git a/legacy/elementary/src/examples/table_cxx_example_01.cc b/src/examples/elementary/table_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/table_cxx_example_01.cc rename to src/examples/elementary/table_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/table_cxx_example_02.cc b/src/examples/elementary/table_cxx_example_02.cc similarity index 100% rename from legacy/elementary/src/examples/table_cxx_example_02.cc rename to src/examples/elementary/table_cxx_example_02.cc diff --git a/legacy/elementary/src/examples/table_example_01.c b/src/examples/elementary/table_example_01.c similarity index 100% rename from legacy/elementary/src/examples/table_example_01.c rename to src/examples/elementary/table_example_01.c diff --git a/legacy/elementary/src/examples/table_example_01.js b/src/examples/elementary/table_example_01.js similarity index 100% rename from legacy/elementary/src/examples/table_example_01.js rename to src/examples/elementary/table_example_01.js diff --git a/legacy/elementary/src/examples/table_example_02.c b/src/examples/elementary/table_example_02.c similarity index 100% rename from legacy/elementary/src/examples/table_example_02.c rename to src/examples/elementary/table_example_02.c diff --git a/legacy/elementary/src/examples/table_example_02.js b/src/examples/elementary/table_example_02.js similarity index 100% rename from legacy/elementary/src/examples/table_example_02.js rename to src/examples/elementary/table_example_02.js diff --git a/legacy/elementary/src/examples/theme_example.edc b/src/examples/elementary/theme_example.edc similarity index 100% rename from legacy/elementary/src/examples/theme_example.edc rename to src/examples/elementary/theme_example.edc diff --git a/legacy/elementary/src/examples/theme_example_01.c b/src/examples/elementary/theme_example_01.c similarity index 100% rename from legacy/elementary/src/examples/theme_example_01.c rename to src/examples/elementary/theme_example_01.c diff --git a/legacy/elementary/src/examples/theme_example_02.c b/src/examples/elementary/theme_example_02.c similarity index 100% rename from legacy/elementary/src/examples/theme_example_02.c rename to src/examples/elementary/theme_example_02.c diff --git a/legacy/elementary/src/examples/thumb_cxx_example_01.cc b/src/examples/elementary/thumb_cxx_example_01.cc similarity index 100% rename from legacy/elementary/src/examples/thumb_cxx_example_01.cc rename to src/examples/elementary/thumb_cxx_example_01.cc diff --git a/legacy/elementary/src/examples/thumb_example_01.c b/src/examples/elementary/thumb_example_01.c similarity index 100% rename from legacy/elementary/src/examples/thumb_example_01.c rename to src/examples/elementary/thumb_example_01.c diff --git a/legacy/elementary/src/examples/thumb_example_01.js b/src/examples/elementary/thumb_example_01.js similarity index 100% rename from legacy/elementary/src/examples/thumb_example_01.js rename to src/examples/elementary/thumb_example_01.js diff --git a/legacy/elementary/src/examples/toolbar_example_01.c b/src/examples/elementary/toolbar_example_01.c similarity index 100% rename from legacy/elementary/src/examples/toolbar_example_01.c rename to src/examples/elementary/toolbar_example_01.c diff --git a/legacy/elementary/src/examples/toolbar_example_02.c b/src/examples/elementary/toolbar_example_02.c similarity index 100% rename from legacy/elementary/src/examples/toolbar_example_02.c rename to src/examples/elementary/toolbar_example_02.c diff --git a/legacy/elementary/src/examples/toolbar_example_03.c b/src/examples/elementary/toolbar_example_03.c similarity index 100% rename from legacy/elementary/src/examples/toolbar_example_03.c rename to src/examples/elementary/toolbar_example_03.c diff --git a/legacy/elementary/src/examples/track_example_01.c b/src/examples/elementary/track_example_01.c similarity index 100% rename from legacy/elementary/src/examples/track_example_01.c rename to src/examples/elementary/track_example_01.c diff --git a/legacy/elementary/src/examples/transit_example_01.c b/src/examples/elementary/transit_example_01.c similarity index 100% rename from legacy/elementary/src/examples/transit_example_01.c rename to src/examples/elementary/transit_example_01.c diff --git a/legacy/elementary/src/examples/transit_example_02.c b/src/examples/elementary/transit_example_02.c similarity index 100% rename from legacy/elementary/src/examples/transit_example_02.c rename to src/examples/elementary/transit_example_02.c diff --git a/legacy/elementary/src/examples/transit_example_03.c b/src/examples/elementary/transit_example_03.c similarity index 100% rename from legacy/elementary/src/examples/transit_example_03.c rename to src/examples/elementary/transit_example_03.c diff --git a/legacy/elementary/src/examples/transit_example_04.c b/src/examples/elementary/transit_example_04.c similarity index 100% rename from legacy/elementary/src/examples/transit_example_04.c rename to src/examples/elementary/transit_example_04.c diff --git a/legacy/elementary/src/examples/twitter_example_01.edc b/src/examples/elementary/twitter_example_01.edc similarity index 100% rename from legacy/elementary/src/examples/twitter_example_01.edc rename to src/examples/elementary/twitter_example_01.edc diff --git a/legacy/elementary/src/examples/twitter_example_01.js b/src/examples/elementary/twitter_example_01.js similarity index 100% rename from legacy/elementary/src/examples/twitter_example_01.js rename to src/examples/elementary/twitter_example_01.js diff --git a/legacy/elementary/src/examples/web_example_01.c b/src/examples/elementary/web_example_01.c similarity index 100% rename from legacy/elementary/src/examples/web_example_01.c rename to src/examples/elementary/web_example_01.c diff --git a/legacy/elementary/src/examples/web_example_02.c b/src/examples/elementary/web_example_02.c similarity index 100% rename from legacy/elementary/src/examples/web_example_02.c rename to src/examples/elementary/web_example_02.c diff --git a/legacy/elementary/src/examples/win_example.c b/src/examples/elementary/win_example.c similarity index 100% rename from legacy/elementary/src/examples/win_example.c rename to src/examples/elementary/win_example.c diff --git a/legacy/elementary/src/lib/.gitignore b/src/lib/elementary/.gitignore similarity index 100% rename from legacy/elementary/src/lib/.gitignore rename to src/lib/elementary/.gitignore diff --git a/legacy/elementary/src/lib/Elementary.h.in b/src/lib/elementary/Elementary.h.in similarity index 100% rename from legacy/elementary/src/lib/Elementary.h.in rename to src/lib/elementary/Elementary.h.in diff --git a/legacy/elementary/src/lib/Elementary.hh.in b/src/lib/elementary/Elementary.hh.in similarity index 100% rename from legacy/elementary/src/lib/Elementary.hh.in rename to src/lib/elementary/Elementary.hh.in diff --git a/legacy/elementary/src/lib/Elementary_Cursor.h b/src/lib/elementary/Elementary_Cursor.h similarity index 100% rename from legacy/elementary/src/lib/Elementary_Cursor.h rename to src/lib/elementary/Elementary_Cursor.h diff --git a/legacy/elementary/src/lib/Makefile.am b/src/lib/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/lib/Makefile.am rename to src/lib/elementary/Makefile.am diff --git a/legacy/elementary/src/lib/elc_combobox.c b/src/lib/elementary/elc_combobox.c similarity index 100% rename from legacy/elementary/src/lib/elc_combobox.c rename to src/lib/elementary/elc_combobox.c diff --git a/legacy/elementary/src/lib/elc_combobox.h b/src/lib/elementary/elc_combobox.h similarity index 100% rename from legacy/elementary/src/lib/elc_combobox.h rename to src/lib/elementary/elc_combobox.h diff --git a/legacy/elementary/src/lib/elc_combobox_legacy.h b/src/lib/elementary/elc_combobox_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_combobox_legacy.h rename to src/lib/elementary/elc_combobox_legacy.h diff --git a/legacy/elementary/src/lib/elc_ctxpopup.c b/src/lib/elementary/elc_ctxpopup.c similarity index 100% rename from legacy/elementary/src/lib/elc_ctxpopup.c rename to src/lib/elementary/elc_ctxpopup.c diff --git a/legacy/elementary/src/lib/elc_ctxpopup.h b/src/lib/elementary/elc_ctxpopup.h similarity index 100% rename from legacy/elementary/src/lib/elc_ctxpopup.h rename to src/lib/elementary/elc_ctxpopup.h diff --git a/legacy/elementary/src/lib/elc_ctxpopup_eo.h b/src/lib/elementary/elc_ctxpopup_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_ctxpopup_eo.h rename to src/lib/elementary/elc_ctxpopup_eo.h diff --git a/legacy/elementary/src/lib/elc_ctxpopup_legacy.h b/src/lib/elementary/elc_ctxpopup_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_ctxpopup_legacy.h rename to src/lib/elementary/elc_ctxpopup_legacy.h diff --git a/legacy/elementary/src/lib/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector.c rename to src/lib/elementary/elc_fileselector.c diff --git a/legacy/elementary/src/lib/elc_fileselector.h b/src/lib/elementary/elc_fileselector.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector.h rename to src/lib/elementary/elc_fileselector.h diff --git a/legacy/elementary/src/lib/elc_fileselector_button.c b/src/lib/elementary/elc_fileselector_button.c similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_button.c rename to src/lib/elementary/elc_fileselector_button.c diff --git a/legacy/elementary/src/lib/elc_fileselector_button.h b/src/lib/elementary/elc_fileselector_button.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_button.h rename to src/lib/elementary/elc_fileselector_button.h diff --git a/legacy/elementary/src/lib/elc_fileselector_button_eo.h b/src/lib/elementary/elc_fileselector_button_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_button_eo.h rename to src/lib/elementary/elc_fileselector_button_eo.h diff --git a/legacy/elementary/src/lib/elc_fileselector_button_legacy.h b/src/lib/elementary/elc_fileselector_button_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_button_legacy.h rename to src/lib/elementary/elc_fileselector_button_legacy.h diff --git a/legacy/elementary/src/lib/elc_fileselector_common.h b/src/lib/elementary/elc_fileselector_common.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_common.h rename to src/lib/elementary/elc_fileselector_common.h diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_entry.c rename to src/lib/elementary/elc_fileselector_entry.c diff --git a/legacy/elementary/src/lib/elc_fileselector_entry.h b/src/lib/elementary/elc_fileselector_entry.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_entry.h rename to src/lib/elementary/elc_fileselector_entry.h diff --git a/legacy/elementary/src/lib/elc_fileselector_entry_eo.h b/src/lib/elementary/elc_fileselector_entry_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_entry_eo.h rename to src/lib/elementary/elc_fileselector_entry_eo.h diff --git a/legacy/elementary/src/lib/elc_fileselector_entry_legacy.h b/src/lib/elementary/elc_fileselector_entry_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_entry_legacy.h rename to src/lib/elementary/elc_fileselector_entry_legacy.h diff --git a/legacy/elementary/src/lib/elc_fileselector_eo.h b/src/lib/elementary/elc_fileselector_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_eo.h rename to src/lib/elementary/elc_fileselector_eo.h diff --git a/legacy/elementary/src/lib/elc_fileselector_legacy.h b/src/lib/elementary/elc_fileselector_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_fileselector_legacy.h rename to src/lib/elementary/elc_fileselector_legacy.h diff --git a/legacy/elementary/src/lib/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c similarity index 100% rename from legacy/elementary/src/lib/elc_hoversel.c rename to src/lib/elementary/elc_hoversel.c diff --git a/legacy/elementary/src/lib/elc_hoversel.h b/src/lib/elementary/elc_hoversel.h similarity index 100% rename from legacy/elementary/src/lib/elc_hoversel.h rename to src/lib/elementary/elc_hoversel.h diff --git a/legacy/elementary/src/lib/elc_hoversel_eo.h b/src/lib/elementary/elc_hoversel_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_hoversel_eo.h rename to src/lib/elementary/elc_hoversel_eo.h diff --git a/legacy/elementary/src/lib/elc_hoversel_legacy.h b/src/lib/elementary/elc_hoversel_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_hoversel_legacy.h rename to src/lib/elementary/elc_hoversel_legacy.h diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c similarity index 100% rename from legacy/elementary/src/lib/elc_multibuttonentry.c rename to src/lib/elementary/elc_multibuttonentry.c diff --git a/legacy/elementary/src/lib/elc_multibuttonentry.h b/src/lib/elementary/elc_multibuttonentry.h similarity index 100% rename from legacy/elementary/src/lib/elc_multibuttonentry.h rename to src/lib/elementary/elc_multibuttonentry.h diff --git a/legacy/elementary/src/lib/elc_multibuttonentry_common.h b/src/lib/elementary/elc_multibuttonentry_common.h similarity index 100% rename from legacy/elementary/src/lib/elc_multibuttonentry_common.h rename to src/lib/elementary/elc_multibuttonentry_common.h diff --git a/legacy/elementary/src/lib/elc_multibuttonentry_eo.h b/src/lib/elementary/elc_multibuttonentry_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_multibuttonentry_eo.h rename to src/lib/elementary/elc_multibuttonentry_eo.h diff --git a/legacy/elementary/src/lib/elc_multibuttonentry_legacy.h b/src/lib/elementary/elc_multibuttonentry_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_multibuttonentry_legacy.h rename to src/lib/elementary/elc_multibuttonentry_legacy.h diff --git a/legacy/elementary/src/lib/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c similarity index 100% rename from legacy/elementary/src/lib/elc_naviframe.c rename to src/lib/elementary/elc_naviframe.c diff --git a/legacy/elementary/src/lib/elc_naviframe.h b/src/lib/elementary/elc_naviframe.h similarity index 100% rename from legacy/elementary/src/lib/elc_naviframe.h rename to src/lib/elementary/elc_naviframe.h diff --git a/legacy/elementary/src/lib/elc_naviframe_common.h b/src/lib/elementary/elc_naviframe_common.h similarity index 100% rename from legacy/elementary/src/lib/elc_naviframe_common.h rename to src/lib/elementary/elc_naviframe_common.h diff --git a/legacy/elementary/src/lib/elc_naviframe_eo.h b/src/lib/elementary/elc_naviframe_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_naviframe_eo.h rename to src/lib/elementary/elc_naviframe_eo.h diff --git a/legacy/elementary/src/lib/elc_naviframe_legacy.h b/src/lib/elementary/elc_naviframe_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_naviframe_legacy.h rename to src/lib/elementary/elc_naviframe_legacy.h diff --git a/legacy/elementary/src/lib/elc_player.c b/src/lib/elementary/elc_player.c similarity index 100% rename from legacy/elementary/src/lib/elc_player.c rename to src/lib/elementary/elc_player.c diff --git a/legacy/elementary/src/lib/elc_popup.c b/src/lib/elementary/elc_popup.c similarity index 100% rename from legacy/elementary/src/lib/elc_popup.c rename to src/lib/elementary/elc_popup.c diff --git a/legacy/elementary/src/lib/elc_popup.h b/src/lib/elementary/elc_popup.h similarity index 100% rename from legacy/elementary/src/lib/elc_popup.h rename to src/lib/elementary/elc_popup.h diff --git a/legacy/elementary/src/lib/elc_popup_eo.h b/src/lib/elementary/elc_popup_eo.h similarity index 100% rename from legacy/elementary/src/lib/elc_popup_eo.h rename to src/lib/elementary/elc_popup_eo.h diff --git a/legacy/elementary/src/lib/elc_popup_legacy.h b/src/lib/elementary/elc_popup_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elc_popup_legacy.h rename to src/lib/elementary/elc_popup_legacy.h diff --git a/legacy/elementary/src/lib/elc_scrolled_entry.c b/src/lib/elementary/elc_scrolled_entry.c similarity index 100% rename from legacy/elementary/src/lib/elc_scrolled_entry.c rename to src/lib/elementary/elc_scrolled_entry.c diff --git a/legacy/elementary/src/lib/elementary_js.cc b/src/lib/elementary/elementary_js.cc similarity index 100% rename from legacy/elementary/src/lib/elementary_js.cc rename to src/lib/elementary/elementary_js.cc diff --git a/legacy/elementary/src/lib/elm_access.c b/src/lib/elementary/elm_access.c similarity index 100% rename from legacy/elementary/src/lib/elm_access.c rename to src/lib/elementary/elm_access.c diff --git a/legacy/elementary/src/lib/elm_access.eo b/src/lib/elementary/elm_access.eo similarity index 100% rename from legacy/elementary/src/lib/elm_access.eo rename to src/lib/elementary/elm_access.eo diff --git a/legacy/elementary/src/lib/elm_access.h b/src/lib/elementary/elm_access.h similarity index 100% rename from legacy/elementary/src/lib/elm_access.h rename to src/lib/elementary/elm_access.h diff --git a/legacy/elementary/src/lib/elm_actionslider.c b/src/lib/elementary/elm_actionslider.c similarity index 100% rename from legacy/elementary/src/lib/elm_actionslider.c rename to src/lib/elementary/elm_actionslider.c diff --git a/legacy/elementary/src/lib/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo similarity index 100% rename from legacy/elementary/src/lib/elm_actionslider.eo rename to src/lib/elementary/elm_actionslider.eo diff --git a/legacy/elementary/src/lib/elm_actionslider.h b/src/lib/elementary/elm_actionslider.h similarity index 100% rename from legacy/elementary/src/lib/elm_actionslider.h rename to src/lib/elementary/elm_actionslider.h diff --git a/legacy/elementary/src/lib/elm_actionslider_eo.h b/src/lib/elementary/elm_actionslider_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_actionslider_eo.h rename to src/lib/elementary/elm_actionslider_eo.h diff --git a/legacy/elementary/src/lib/elm_actionslider_legacy.h b/src/lib/elementary/elm_actionslider_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_actionslider_legacy.h rename to src/lib/elementary/elm_actionslider_legacy.h diff --git a/legacy/elementary/src/lib/elm_app.h b/src/lib/elementary/elm_app.h similarity index 100% rename from legacy/elementary/src/lib/elm_app.h rename to src/lib/elementary/elm_app.h diff --git a/legacy/elementary/src/lib/elm_app_client.c b/src/lib/elementary/elm_app_client.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_client.c rename to src/lib/elementary/elm_app_client.c diff --git a/legacy/elementary/src/lib/elm_app_client.eo b/src/lib/elementary/elm_app_client.eo similarity index 100% rename from legacy/elementary/src/lib/elm_app_client.eo rename to src/lib/elementary/elm_app_client.eo diff --git a/legacy/elementary/src/lib/elm_app_client.h b/src/lib/elementary/elm_app_client.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_client.h rename to src/lib/elementary/elm_app_client.h diff --git a/legacy/elementary/src/lib/elm_app_client_eo.h b/src/lib/elementary/elm_app_client_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_client_eo.h rename to src/lib/elementary/elm_app_client_eo.h diff --git a/legacy/elementary/src/lib/elm_app_client_view.c b/src/lib/elementary/elm_app_client_view.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_client_view.c rename to src/lib/elementary/elm_app_client_view.c diff --git a/legacy/elementary/src/lib/elm_app_client_view.eo b/src/lib/elementary/elm_app_client_view.eo similarity index 100% rename from legacy/elementary/src/lib/elm_app_client_view.eo rename to src/lib/elementary/elm_app_client_view.eo diff --git a/legacy/elementary/src/lib/elm_app_client_view.h b/src/lib/elementary/elm_app_client_view.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_client_view.h rename to src/lib/elementary/elm_app_client_view.h diff --git a/legacy/elementary/src/lib/elm_app_client_view_eo.h b/src/lib/elementary/elm_app_client_view_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_client_view_eo.h rename to src/lib/elementary/elm_app_client_view_eo.h diff --git a/legacy/elementary/src/lib/elm_app_common.c b/src/lib/elementary/elm_app_common.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_common.c rename to src/lib/elementary/elm_app_common.c diff --git a/legacy/elementary/src/lib/elm_app_common.h b/src/lib/elementary/elm_app_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_common.h rename to src/lib/elementary/elm_app_common.h diff --git a/legacy/elementary/src/lib/elm_app_server.c b/src/lib/elementary/elm_app_server.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_server.c rename to src/lib/elementary/elm_app_server.c diff --git a/legacy/elementary/src/lib/elm_app_server.eo b/src/lib/elementary/elm_app_server.eo similarity index 100% rename from legacy/elementary/src/lib/elm_app_server.eo rename to src/lib/elementary/elm_app_server.eo diff --git a/legacy/elementary/src/lib/elm_app_server.h b/src/lib/elementary/elm_app_server.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_server.h rename to src/lib/elementary/elm_app_server.h diff --git a/legacy/elementary/src/lib/elm_app_server_eet.c b/src/lib/elementary/elm_app_server_eet.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_eet.c rename to src/lib/elementary/elm_app_server_eet.c diff --git a/legacy/elementary/src/lib/elm_app_server_eet.h b/src/lib/elementary/elm_app_server_eet.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_eet.h rename to src/lib/elementary/elm_app_server_eet.h diff --git a/legacy/elementary/src/lib/elm_app_server_eo.h b/src/lib/elementary/elm_app_server_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_eo.h rename to src/lib/elementary/elm_app_server_eo.h diff --git a/legacy/elementary/src/lib/elm_app_server_view.c b/src/lib/elementary/elm_app_server_view.c similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_view.c rename to src/lib/elementary/elm_app_server_view.c diff --git a/legacy/elementary/src/lib/elm_app_server_view.eo b/src/lib/elementary/elm_app_server_view.eo similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_view.eo rename to src/lib/elementary/elm_app_server_view.eo diff --git a/legacy/elementary/src/lib/elm_app_server_view.h b/src/lib/elementary/elm_app_server_view.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_view.h rename to src/lib/elementary/elm_app_server_view.h diff --git a/legacy/elementary/src/lib/elm_app_server_view_eo.h b/src/lib/elementary/elm_app_server_view_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_app_server_view_eo.h rename to src/lib/elementary/elm_app_server_view_eo.h diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.c b/src/lib/elementary/elm_atspi_app_object.c similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_app_object.c rename to src/lib/elementary/elm_atspi_app_object.c diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.eo b/src/lib/elementary/elm_atspi_app_object.eo similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_app_object.eo rename to src/lib/elementary/elm_atspi_app_object.eo diff --git a/legacy/elementary/src/lib/elm_atspi_app_object.h b/src/lib/elementary/elm_atspi_app_object.h similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_app_object.h rename to src/lib/elementary/elm_atspi_app_object.h diff --git a/legacy/elementary/src/lib/elm_atspi_bridge.c b/src/lib/elementary/elm_atspi_bridge.c similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_bridge.c rename to src/lib/elementary/elm_atspi_bridge.c diff --git a/legacy/elementary/src/lib/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_bridge.eo rename to src/lib/elementary/elm_atspi_bridge.eo diff --git a/legacy/elementary/src/lib/elm_atspi_bridge.h b/src/lib/elementary/elm_atspi_bridge.h similarity index 100% rename from legacy/elementary/src/lib/elm_atspi_bridge.h rename to src/lib/elementary/elm_atspi_bridge.h diff --git a/legacy/elementary/src/lib/elm_authors.h b/src/lib/elementary/elm_authors.h similarity index 100% rename from legacy/elementary/src/lib/elm_authors.h rename to src/lib/elementary/elm_authors.h diff --git a/legacy/elementary/src/lib/elm_bg.c b/src/lib/elementary/elm_bg.c similarity index 100% rename from legacy/elementary/src/lib/elm_bg.c rename to src/lib/elementary/elm_bg.c diff --git a/legacy/elementary/src/lib/elm_bg.eo b/src/lib/elementary/elm_bg.eo similarity index 100% rename from legacy/elementary/src/lib/elm_bg.eo rename to src/lib/elementary/elm_bg.eo diff --git a/legacy/elementary/src/lib/elm_bg.h b/src/lib/elementary/elm_bg.h similarity index 100% rename from legacy/elementary/src/lib/elm_bg.h rename to src/lib/elementary/elm_bg.h diff --git a/legacy/elementary/src/lib/elm_bg_eo.h b/src/lib/elementary/elm_bg_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_bg_eo.h rename to src/lib/elementary/elm_bg_eo.h diff --git a/legacy/elementary/src/lib/elm_bg_legacy.h b/src/lib/elementary/elm_bg_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_bg_legacy.h rename to src/lib/elementary/elm_bg_legacy.h diff --git a/legacy/elementary/src/lib/elm_box.c b/src/lib/elementary/elm_box.c similarity index 100% rename from legacy/elementary/src/lib/elm_box.c rename to src/lib/elementary/elm_box.c diff --git a/legacy/elementary/src/lib/elm_box.eo b/src/lib/elementary/elm_box.eo similarity index 100% rename from legacy/elementary/src/lib/elm_box.eo rename to src/lib/elementary/elm_box.eo diff --git a/legacy/elementary/src/lib/elm_box.h b/src/lib/elementary/elm_box.h similarity index 100% rename from legacy/elementary/src/lib/elm_box.h rename to src/lib/elementary/elm_box.h diff --git a/legacy/elementary/src/lib/elm_box_common.h b/src/lib/elementary/elm_box_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_box_common.h rename to src/lib/elementary/elm_box_common.h diff --git a/legacy/elementary/src/lib/elm_box_eo.h b/src/lib/elementary/elm_box_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_box_eo.h rename to src/lib/elementary/elm_box_eo.h diff --git a/legacy/elementary/src/lib/elm_box_legacy.h b/src/lib/elementary/elm_box_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_box_legacy.h rename to src/lib/elementary/elm_box_legacy.h diff --git a/legacy/elementary/src/lib/elm_bubble.c b/src/lib/elementary/elm_bubble.c similarity index 100% rename from legacy/elementary/src/lib/elm_bubble.c rename to src/lib/elementary/elm_bubble.c diff --git a/legacy/elementary/src/lib/elm_bubble.eo b/src/lib/elementary/elm_bubble.eo similarity index 100% rename from legacy/elementary/src/lib/elm_bubble.eo rename to src/lib/elementary/elm_bubble.eo diff --git a/legacy/elementary/src/lib/elm_bubble.h b/src/lib/elementary/elm_bubble.h similarity index 100% rename from legacy/elementary/src/lib/elm_bubble.h rename to src/lib/elementary/elm_bubble.h diff --git a/legacy/elementary/src/lib/elm_bubble_eo.h b/src/lib/elementary/elm_bubble_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_bubble_eo.h rename to src/lib/elementary/elm_bubble_eo.h diff --git a/legacy/elementary/src/lib/elm_bubble_legacy.h b/src/lib/elementary/elm_bubble_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_bubble_legacy.h rename to src/lib/elementary/elm_bubble_legacy.h diff --git a/legacy/elementary/src/lib/elm_button.c b/src/lib/elementary/elm_button.c similarity index 100% rename from legacy/elementary/src/lib/elm_button.c rename to src/lib/elementary/elm_button.c diff --git a/legacy/elementary/src/lib/elm_button.eo b/src/lib/elementary/elm_button.eo similarity index 100% rename from legacy/elementary/src/lib/elm_button.eo rename to src/lib/elementary/elm_button.eo diff --git a/legacy/elementary/src/lib/elm_button.h b/src/lib/elementary/elm_button.h similarity index 100% rename from legacy/elementary/src/lib/elm_button.h rename to src/lib/elementary/elm_button.h diff --git a/legacy/elementary/src/lib/elm_button_eo.h b/src/lib/elementary/elm_button_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_button_eo.h rename to src/lib/elementary/elm_button_eo.h diff --git a/legacy/elementary/src/lib/elm_button_legacy.h b/src/lib/elementary/elm_button_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_button_legacy.h rename to src/lib/elementary/elm_button_legacy.h diff --git a/legacy/elementary/src/lib/elm_cache.h b/src/lib/elementary/elm_cache.h similarity index 100% rename from legacy/elementary/src/lib/elm_cache.h rename to src/lib/elementary/elm_cache.h diff --git a/legacy/elementary/src/lib/elm_calendar.c b/src/lib/elementary/elm_calendar.c similarity index 100% rename from legacy/elementary/src/lib/elm_calendar.c rename to src/lib/elementary/elm_calendar.c diff --git a/legacy/elementary/src/lib/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo similarity index 100% rename from legacy/elementary/src/lib/elm_calendar.eo rename to src/lib/elementary/elm_calendar.eo diff --git a/legacy/elementary/src/lib/elm_calendar.h b/src/lib/elementary/elm_calendar.h similarity index 100% rename from legacy/elementary/src/lib/elm_calendar.h rename to src/lib/elementary/elm_calendar.h diff --git a/legacy/elementary/src/lib/elm_calendar_common.h b/src/lib/elementary/elm_calendar_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_calendar_common.h rename to src/lib/elementary/elm_calendar_common.h diff --git a/legacy/elementary/src/lib/elm_calendar_eo.h b/src/lib/elementary/elm_calendar_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_calendar_eo.h rename to src/lib/elementary/elm_calendar_eo.h diff --git a/legacy/elementary/src/lib/elm_calendar_legacy.h b/src/lib/elementary/elm_calendar_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_calendar_legacy.h rename to src/lib/elementary/elm_calendar_legacy.h diff --git a/legacy/elementary/src/lib/elm_check.c b/src/lib/elementary/elm_check.c similarity index 100% rename from legacy/elementary/src/lib/elm_check.c rename to src/lib/elementary/elm_check.c diff --git a/legacy/elementary/src/lib/elm_check.eo b/src/lib/elementary/elm_check.eo similarity index 100% rename from legacy/elementary/src/lib/elm_check.eo rename to src/lib/elementary/elm_check.eo diff --git a/legacy/elementary/src/lib/elm_check.h b/src/lib/elementary/elm_check.h similarity index 100% rename from legacy/elementary/src/lib/elm_check.h rename to src/lib/elementary/elm_check.h diff --git a/legacy/elementary/src/lib/elm_check_eo.h b/src/lib/elementary/elm_check_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_check_eo.h rename to src/lib/elementary/elm_check_eo.h diff --git a/legacy/elementary/src/lib/elm_check_legacy.h b/src/lib/elementary/elm_check_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_check_legacy.h rename to src/lib/elementary/elm_check_legacy.h diff --git a/legacy/elementary/src/lib/elm_clock.c b/src/lib/elementary/elm_clock.c similarity index 100% rename from legacy/elementary/src/lib/elm_clock.c rename to src/lib/elementary/elm_clock.c diff --git a/legacy/elementary/src/lib/elm_clock.eo b/src/lib/elementary/elm_clock.eo similarity index 100% rename from legacy/elementary/src/lib/elm_clock.eo rename to src/lib/elementary/elm_clock.eo diff --git a/legacy/elementary/src/lib/elm_clock.h b/src/lib/elementary/elm_clock.h similarity index 100% rename from legacy/elementary/src/lib/elm_clock.h rename to src/lib/elementary/elm_clock.h diff --git a/legacy/elementary/src/lib/elm_clock_eo.h b/src/lib/elementary/elm_clock_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_clock_eo.h rename to src/lib/elementary/elm_clock_eo.h diff --git a/legacy/elementary/src/lib/elm_clock_legacy.h b/src/lib/elementary/elm_clock_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_clock_legacy.h rename to src/lib/elementary/elm_clock_legacy.h diff --git a/legacy/elementary/src/lib/elm_cnp.c b/src/lib/elementary/elm_cnp.c similarity index 100% rename from legacy/elementary/src/lib/elm_cnp.c rename to src/lib/elementary/elm_cnp.c diff --git a/legacy/elementary/src/lib/elm_cnp.h b/src/lib/elementary/elm_cnp.h similarity index 100% rename from legacy/elementary/src/lib/elm_cnp.h rename to src/lib/elementary/elm_cnp.h diff --git a/legacy/elementary/src/lib/elm_color_class.c b/src/lib/elementary/elm_color_class.c similarity index 100% rename from legacy/elementary/src/lib/elm_color_class.c rename to src/lib/elementary/elm_color_class.c diff --git a/legacy/elementary/src/lib/elm_color_class.h b/src/lib/elementary/elm_color_class.h similarity index 100% rename from legacy/elementary/src/lib/elm_color_class.h rename to src/lib/elementary/elm_color_class.h diff --git a/legacy/elementary/src/lib/elm_color_item.eo b/src/lib/elementary/elm_color_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_color_item.eo rename to src/lib/elementary/elm_color_item.eo diff --git a/legacy/elementary/src/lib/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector.c rename to src/lib/elementary/elm_colorselector.c diff --git a/legacy/elementary/src/lib/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector.eo rename to src/lib/elementary/elm_colorselector.eo diff --git a/legacy/elementary/src/lib/elm_colorselector.h b/src/lib/elementary/elm_colorselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector.h rename to src/lib/elementary/elm_colorselector.h diff --git a/legacy/elementary/src/lib/elm_colorselector_common.h b/src/lib/elementary/elm_colorselector_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector_common.h rename to src/lib/elementary/elm_colorselector_common.h diff --git a/legacy/elementary/src/lib/elm_colorselector_eo.h b/src/lib/elementary/elm_colorselector_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector_eo.h rename to src/lib/elementary/elm_colorselector_eo.h diff --git a/legacy/elementary/src/lib/elm_colorselector_legacy.h b/src/lib/elementary/elm_colorselector_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_colorselector_legacy.h rename to src/lib/elementary/elm_colorselector_legacy.h diff --git a/legacy/elementary/src/lib/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo similarity index 100% rename from legacy/elementary/src/lib/elm_combobox.eo rename to src/lib/elementary/elm_combobox.eo diff --git a/legacy/elementary/src/lib/elm_config.c b/src/lib/elementary/elm_config.c similarity index 100% rename from legacy/elementary/src/lib/elm_config.c rename to src/lib/elementary/elm_config.c diff --git a/legacy/elementary/src/lib/elm_config.h b/src/lib/elementary/elm_config.h similarity index 100% rename from legacy/elementary/src/lib/elm_config.h rename to src/lib/elementary/elm_config.h diff --git a/legacy/elementary/src/lib/elm_conform.c b/src/lib/elementary/elm_conform.c similarity index 100% rename from legacy/elementary/src/lib/elm_conform.c rename to src/lib/elementary/elm_conform.c diff --git a/legacy/elementary/src/lib/elm_conform.h b/src/lib/elementary/elm_conform.h similarity index 100% rename from legacy/elementary/src/lib/elm_conform.h rename to src/lib/elementary/elm_conform.h diff --git a/legacy/elementary/src/lib/elm_conform_eo.h b/src/lib/elementary/elm_conform_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_conform_eo.h rename to src/lib/elementary/elm_conform_eo.h diff --git a/legacy/elementary/src/lib/elm_conform_legacy.h b/src/lib/elementary/elm_conform_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_conform_legacy.h rename to src/lib/elementary/elm_conform_legacy.h diff --git a/legacy/elementary/src/lib/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo similarity index 100% rename from legacy/elementary/src/lib/elm_conformant.eo rename to src/lib/elementary/elm_conformant.eo diff --git a/legacy/elementary/src/lib/elm_container.c b/src/lib/elementary/elm_container.c similarity index 100% rename from legacy/elementary/src/lib/elm_container.c rename to src/lib/elementary/elm_container.c diff --git a/legacy/elementary/src/lib/elm_container.eo b/src/lib/elementary/elm_container.eo similarity index 100% rename from legacy/elementary/src/lib/elm_container.eo rename to src/lib/elementary/elm_container.eo diff --git a/legacy/elementary/src/lib/elm_container.h b/src/lib/elementary/elm_container.h similarity index 100% rename from legacy/elementary/src/lib/elm_container.h rename to src/lib/elementary/elm_container.h diff --git a/legacy/elementary/src/lib/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo similarity index 100% rename from legacy/elementary/src/lib/elm_ctxpopup.eo rename to src/lib/elementary/elm_ctxpopup.eo diff --git a/legacy/elementary/src/lib/elm_ctxpopup_item.eo b/src/lib/elementary/elm_ctxpopup_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_ctxpopup_item.eo rename to src/lib/elementary/elm_ctxpopup_item.eo diff --git a/legacy/elementary/src/lib/elm_cursor.h b/src/lib/elementary/elm_cursor.h similarity index 100% rename from legacy/elementary/src/lib/elm_cursor.h rename to src/lib/elementary/elm_cursor.h diff --git a/legacy/elementary/src/lib/elm_datetime.c b/src/lib/elementary/elm_datetime.c similarity index 100% rename from legacy/elementary/src/lib/elm_datetime.c rename to src/lib/elementary/elm_datetime.c diff --git a/legacy/elementary/src/lib/elm_datetime.eo b/src/lib/elementary/elm_datetime.eo similarity index 100% rename from legacy/elementary/src/lib/elm_datetime.eo rename to src/lib/elementary/elm_datetime.eo diff --git a/legacy/elementary/src/lib/elm_datetime.h b/src/lib/elementary/elm_datetime.h similarity index 100% rename from legacy/elementary/src/lib/elm_datetime.h rename to src/lib/elementary/elm_datetime.h diff --git a/legacy/elementary/src/lib/elm_datetime_common.h b/src/lib/elementary/elm_datetime_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_datetime_common.h rename to src/lib/elementary/elm_datetime_common.h diff --git a/legacy/elementary/src/lib/elm_datetime_eo.h b/src/lib/elementary/elm_datetime_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_datetime_eo.h rename to src/lib/elementary/elm_datetime_eo.h diff --git a/legacy/elementary/src/lib/elm_datetime_legacy.h b/src/lib/elementary/elm_datetime_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_datetime_legacy.h rename to src/lib/elementary/elm_datetime_legacy.h diff --git a/legacy/elementary/src/lib/elm_dayselector.c b/src/lib/elementary/elm_dayselector.c similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector.c rename to src/lib/elementary/elm_dayselector.c diff --git a/legacy/elementary/src/lib/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector.eo rename to src/lib/elementary/elm_dayselector.eo diff --git a/legacy/elementary/src/lib/elm_dayselector.h b/src/lib/elementary/elm_dayselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector.h rename to src/lib/elementary/elm_dayselector.h diff --git a/legacy/elementary/src/lib/elm_dayselector_eo.h b/src/lib/elementary/elm_dayselector_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector_eo.h rename to src/lib/elementary/elm_dayselector_eo.h diff --git a/legacy/elementary/src/lib/elm_dayselector_item.eo b/src/lib/elementary/elm_dayselector_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector_item.eo rename to src/lib/elementary/elm_dayselector_item.eo diff --git a/legacy/elementary/src/lib/elm_dayselector_legacy.h b/src/lib/elementary/elm_dayselector_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_dayselector_legacy.h rename to src/lib/elementary/elm_dayselector_legacy.h diff --git a/legacy/elementary/src/lib/elm_dbus_menu.c b/src/lib/elementary/elm_dbus_menu.c similarity index 100% rename from legacy/elementary/src/lib/elm_dbus_menu.c rename to src/lib/elementary/elm_dbus_menu.c diff --git a/legacy/elementary/src/lib/elm_debug.h b/src/lib/elementary/elm_debug.h similarity index 100% rename from legacy/elementary/src/lib/elm_debug.h rename to src/lib/elementary/elm_debug.h diff --git a/legacy/elementary/src/lib/elm_deprecated.h b/src/lib/elementary/elm_deprecated.h similarity index 100% rename from legacy/elementary/src/lib/elm_deprecated.h rename to src/lib/elementary/elm_deprecated.h diff --git a/legacy/elementary/src/lib/elm_diskselector.c b/src/lib/elementary/elm_diskselector.c similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector.c rename to src/lib/elementary/elm_diskselector.c diff --git a/legacy/elementary/src/lib/elm_diskselector.eo b/src/lib/elementary/elm_diskselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector.eo rename to src/lib/elementary/elm_diskselector.eo diff --git a/legacy/elementary/src/lib/elm_diskselector.h b/src/lib/elementary/elm_diskselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector.h rename to src/lib/elementary/elm_diskselector.h diff --git a/legacy/elementary/src/lib/elm_diskselector_common.h b/src/lib/elementary/elm_diskselector_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector_common.h rename to src/lib/elementary/elm_diskselector_common.h diff --git a/legacy/elementary/src/lib/elm_diskselector_eo.h b/src/lib/elementary/elm_diskselector_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector_eo.h rename to src/lib/elementary/elm_diskselector_eo.h diff --git a/legacy/elementary/src/lib/elm_diskselector_item.eo b/src/lib/elementary/elm_diskselector_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector_item.eo rename to src/lib/elementary/elm_diskselector_item.eo diff --git a/legacy/elementary/src/lib/elm_diskselector_legacy.h b/src/lib/elementary/elm_diskselector_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_diskselector_legacy.h rename to src/lib/elementary/elm_diskselector_legacy.h diff --git a/legacy/elementary/src/lib/elm_entry.c b/src/lib/elementary/elm_entry.c similarity index 100% rename from legacy/elementary/src/lib/elm_entry.c rename to src/lib/elementary/elm_entry.c diff --git a/legacy/elementary/src/lib/elm_entry.eo b/src/lib/elementary/elm_entry.eo similarity index 100% rename from legacy/elementary/src/lib/elm_entry.eo rename to src/lib/elementary/elm_entry.eo diff --git a/legacy/elementary/src/lib/elm_entry.h b/src/lib/elementary/elm_entry.h similarity index 100% rename from legacy/elementary/src/lib/elm_entry.h rename to src/lib/elementary/elm_entry.h diff --git a/legacy/elementary/src/lib/elm_entry_common.h b/src/lib/elementary/elm_entry_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_entry_common.h rename to src/lib/elementary/elm_entry_common.h diff --git a/legacy/elementary/src/lib/elm_entry_eo.h b/src/lib/elementary/elm_entry_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_entry_eo.h rename to src/lib/elementary/elm_entry_eo.h diff --git a/legacy/elementary/src/lib/elm_entry_legacy.h b/src/lib/elementary/elm_entry_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_entry_legacy.h rename to src/lib/elementary/elm_entry_legacy.h diff --git a/legacy/elementary/src/lib/elm_factory.c b/src/lib/elementary/elm_factory.c similarity index 100% rename from legacy/elementary/src/lib/elm_factory.c rename to src/lib/elementary/elm_factory.c diff --git a/legacy/elementary/src/lib/elm_factory.h b/src/lib/elementary/elm_factory.h similarity index 100% rename from legacy/elementary/src/lib/elm_factory.h rename to src/lib/elementary/elm_factory.h diff --git a/legacy/elementary/src/lib/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_fileselector.eo rename to src/lib/elementary/elm_fileselector.eo diff --git a/legacy/elementary/src/lib/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo similarity index 100% rename from legacy/elementary/src/lib/elm_fileselector_button.eo rename to src/lib/elementary/elm_fileselector_button.eo diff --git a/legacy/elementary/src/lib/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo similarity index 100% rename from legacy/elementary/src/lib/elm_fileselector_entry.eo rename to src/lib/elementary/elm_fileselector_entry.eo diff --git a/legacy/elementary/src/lib/elm_finger.h b/src/lib/elementary/elm_finger.h similarity index 100% rename from legacy/elementary/src/lib/elm_finger.h rename to src/lib/elementary/elm_finger.h diff --git a/legacy/elementary/src/lib/elm_flip.c b/src/lib/elementary/elm_flip.c similarity index 100% rename from legacy/elementary/src/lib/elm_flip.c rename to src/lib/elementary/elm_flip.c diff --git a/legacy/elementary/src/lib/elm_flip.eo b/src/lib/elementary/elm_flip.eo similarity index 100% rename from legacy/elementary/src/lib/elm_flip.eo rename to src/lib/elementary/elm_flip.eo diff --git a/legacy/elementary/src/lib/elm_flip.h b/src/lib/elementary/elm_flip.h similarity index 100% rename from legacy/elementary/src/lib/elm_flip.h rename to src/lib/elementary/elm_flip.h diff --git a/legacy/elementary/src/lib/elm_flip_eo.h b/src/lib/elementary/elm_flip_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_flip_eo.h rename to src/lib/elementary/elm_flip_eo.h diff --git a/legacy/elementary/src/lib/elm_flip_legacy.h b/src/lib/elementary/elm_flip_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_flip_legacy.h rename to src/lib/elementary/elm_flip_legacy.h diff --git a/legacy/elementary/src/lib/elm_flipselector.c b/src/lib/elementary/elm_flipselector.c similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector.c rename to src/lib/elementary/elm_flipselector.c diff --git a/legacy/elementary/src/lib/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector.eo rename to src/lib/elementary/elm_flipselector.eo diff --git a/legacy/elementary/src/lib/elm_flipselector.h b/src/lib/elementary/elm_flipselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector.h rename to src/lib/elementary/elm_flipselector.h diff --git a/legacy/elementary/src/lib/elm_flipselector_eo.h b/src/lib/elementary/elm_flipselector_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector_eo.h rename to src/lib/elementary/elm_flipselector_eo.h diff --git a/legacy/elementary/src/lib/elm_flipselector_item.eo b/src/lib/elementary/elm_flipselector_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector_item.eo rename to src/lib/elementary/elm_flipselector_item.eo diff --git a/legacy/elementary/src/lib/elm_flipselector_legacy.h b/src/lib/elementary/elm_flipselector_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_flipselector_legacy.h rename to src/lib/elementary/elm_flipselector_legacy.h diff --git a/legacy/elementary/src/lib/elm_focus.h b/src/lib/elementary/elm_focus.h similarity index 100% rename from legacy/elementary/src/lib/elm_focus.h rename to src/lib/elementary/elm_focus.h diff --git a/legacy/elementary/src/lib/elm_focus_item.h b/src/lib/elementary/elm_focus_item.h similarity index 100% rename from legacy/elementary/src/lib/elm_focus_item.h rename to src/lib/elementary/elm_focus_item.h diff --git a/legacy/elementary/src/lib/elm_font.c b/src/lib/elementary/elm_font.c similarity index 100% rename from legacy/elementary/src/lib/elm_font.c rename to src/lib/elementary/elm_font.c diff --git a/legacy/elementary/src/lib/elm_font.h b/src/lib/elementary/elm_font.h similarity index 100% rename from legacy/elementary/src/lib/elm_font.h rename to src/lib/elementary/elm_font.h diff --git a/legacy/elementary/src/lib/elm_frame.c b/src/lib/elementary/elm_frame.c similarity index 100% rename from legacy/elementary/src/lib/elm_frame.c rename to src/lib/elementary/elm_frame.c diff --git a/legacy/elementary/src/lib/elm_frame.eo b/src/lib/elementary/elm_frame.eo similarity index 100% rename from legacy/elementary/src/lib/elm_frame.eo rename to src/lib/elementary/elm_frame.eo diff --git a/legacy/elementary/src/lib/elm_frame.h b/src/lib/elementary/elm_frame.h similarity index 100% rename from legacy/elementary/src/lib/elm_frame.h rename to src/lib/elementary/elm_frame.h diff --git a/legacy/elementary/src/lib/elm_frame_eo.h b/src/lib/elementary/elm_frame_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_frame_eo.h rename to src/lib/elementary/elm_frame_eo.h diff --git a/legacy/elementary/src/lib/elm_frame_legacy.h b/src/lib/elementary/elm_frame_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_frame_legacy.h rename to src/lib/elementary/elm_frame_legacy.h diff --git a/legacy/elementary/src/lib/elm_gen.h b/src/lib/elementary/elm_gen.h similarity index 100% rename from legacy/elementary/src/lib/elm_gen.h rename to src/lib/elementary/elm_gen.h diff --git a/legacy/elementary/src/lib/elm_gen_common.h b/src/lib/elementary/elm_gen_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_gen_common.h rename to src/lib/elementary/elm_gen_common.h diff --git a/legacy/elementary/src/lib/elm_general.eot b/src/lib/elementary/elm_general.eot similarity index 100% rename from legacy/elementary/src/lib/elm_general.eot rename to src/lib/elementary/elm_general.eot diff --git a/legacy/elementary/src/lib/elm_general.h b/src/lib/elementary/elm_general.h similarity index 100% rename from legacy/elementary/src/lib/elm_general.h rename to src/lib/elementary/elm_general.h diff --git a/legacy/elementary/src/lib/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid.c rename to src/lib/elementary/elm_gengrid.c diff --git a/legacy/elementary/src/lib/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid.eo rename to src/lib/elementary/elm_gengrid.eo diff --git a/legacy/elementary/src/lib/elm_gengrid.h b/src/lib/elementary/elm_gengrid.h similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid.h rename to src/lib/elementary/elm_gengrid.h diff --git a/legacy/elementary/src/lib/elm_gengrid_common.h b/src/lib/elementary/elm_gengrid_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid_common.h rename to src/lib/elementary/elm_gengrid_common.h diff --git a/legacy/elementary/src/lib/elm_gengrid_eo.h b/src/lib/elementary/elm_gengrid_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid_eo.h rename to src/lib/elementary/elm_gengrid_eo.h diff --git a/legacy/elementary/src/lib/elm_gengrid_item.eo b/src/lib/elementary/elm_gengrid_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid_item.eo rename to src/lib/elementary/elm_gengrid_item.eo diff --git a/legacy/elementary/src/lib/elm_gengrid_legacy.h b/src/lib/elementary/elm_gengrid_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid_legacy.h rename to src/lib/elementary/elm_gengrid_legacy.h diff --git a/legacy/elementary/src/lib/elm_gengrid_pan.eo b/src/lib/elementary/elm_gengrid_pan.eo similarity index 100% rename from legacy/elementary/src/lib/elm_gengrid_pan.eo rename to src/lib/elementary/elm_gengrid_pan.eo diff --git a/legacy/elementary/src/lib/elm_genlist.c b/src/lib/elementary/elm_genlist.c similarity index 100% rename from legacy/elementary/src/lib/elm_genlist.c rename to src/lib/elementary/elm_genlist.c diff --git a/legacy/elementary/src/lib/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo similarity index 100% rename from legacy/elementary/src/lib/elm_genlist.eo rename to src/lib/elementary/elm_genlist.eo diff --git a/legacy/elementary/src/lib/elm_genlist.h b/src/lib/elementary/elm_genlist.h similarity index 100% rename from legacy/elementary/src/lib/elm_genlist.h rename to src/lib/elementary/elm_genlist.h diff --git a/legacy/elementary/src/lib/elm_genlist_common.h b/src/lib/elementary/elm_genlist_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_genlist_common.h rename to src/lib/elementary/elm_genlist_common.h diff --git a/legacy/elementary/src/lib/elm_genlist_eo.h b/src/lib/elementary/elm_genlist_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_genlist_eo.h rename to src/lib/elementary/elm_genlist_eo.h diff --git a/legacy/elementary/src/lib/elm_genlist_item.eo b/src/lib/elementary/elm_genlist_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_genlist_item.eo rename to src/lib/elementary/elm_genlist_item.eo diff --git a/legacy/elementary/src/lib/elm_genlist_legacy.h b/src/lib/elementary/elm_genlist_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_genlist_legacy.h rename to src/lib/elementary/elm_genlist_legacy.h diff --git a/legacy/elementary/src/lib/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo similarity index 100% rename from legacy/elementary/src/lib/elm_genlist_pan.eo rename to src/lib/elementary/elm_genlist_pan.eo diff --git a/legacy/elementary/src/lib/elm_gesture_layer.c b/src/lib/elementary/elm_gesture_layer.c similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer.c rename to src/lib/elementary/elm_gesture_layer.c diff --git a/legacy/elementary/src/lib/elm_gesture_layer.eo b/src/lib/elementary/elm_gesture_layer.eo similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer.eo rename to src/lib/elementary/elm_gesture_layer.eo diff --git a/legacy/elementary/src/lib/elm_gesture_layer.h b/src/lib/elementary/elm_gesture_layer.h similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer.h rename to src/lib/elementary/elm_gesture_layer.h diff --git a/legacy/elementary/src/lib/elm_gesture_layer_common.h b/src/lib/elementary/elm_gesture_layer_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer_common.h rename to src/lib/elementary/elm_gesture_layer_common.h diff --git a/legacy/elementary/src/lib/elm_gesture_layer_eo.h b/src/lib/elementary/elm_gesture_layer_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer_eo.h rename to src/lib/elementary/elm_gesture_layer_eo.h diff --git a/legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c b/src/lib/elementary/elm_gesture_layer_extra_gestures.c similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer_extra_gestures.c rename to src/lib/elementary/elm_gesture_layer_extra_gestures.c diff --git a/legacy/elementary/src/lib/elm_gesture_layer_legacy.h b/src/lib/elementary/elm_gesture_layer_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_gesture_layer_legacy.h rename to src/lib/elementary/elm_gesture_layer_legacy.h diff --git a/legacy/elementary/src/lib/elm_getting_started.h b/src/lib/elementary/elm_getting_started.h similarity index 100% rename from legacy/elementary/src/lib/elm_getting_started.h rename to src/lib/elementary/elm_getting_started.h diff --git a/legacy/elementary/src/lib/elm_glview.c b/src/lib/elementary/elm_glview.c similarity index 100% rename from legacy/elementary/src/lib/elm_glview.c rename to src/lib/elementary/elm_glview.c diff --git a/legacy/elementary/src/lib/elm_glview.eo b/src/lib/elementary/elm_glview.eo similarity index 100% rename from legacy/elementary/src/lib/elm_glview.eo rename to src/lib/elementary/elm_glview.eo diff --git a/legacy/elementary/src/lib/elm_glview.h b/src/lib/elementary/elm_glview.h similarity index 100% rename from legacy/elementary/src/lib/elm_glview.h rename to src/lib/elementary/elm_glview.h diff --git a/legacy/elementary/src/lib/elm_glview_common.h b/src/lib/elementary/elm_glview_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_glview_common.h rename to src/lib/elementary/elm_glview_common.h diff --git a/legacy/elementary/src/lib/elm_glview_eo.h b/src/lib/elementary/elm_glview_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_glview_eo.h rename to src/lib/elementary/elm_glview_eo.h diff --git a/legacy/elementary/src/lib/elm_glview_legacy.h b/src/lib/elementary/elm_glview_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_glview_legacy.h rename to src/lib/elementary/elm_glview_legacy.h diff --git a/legacy/elementary/src/lib/elm_grid.c b/src/lib/elementary/elm_grid.c similarity index 100% rename from legacy/elementary/src/lib/elm_grid.c rename to src/lib/elementary/elm_grid.c diff --git a/legacy/elementary/src/lib/elm_grid.eo b/src/lib/elementary/elm_grid.eo similarity index 100% rename from legacy/elementary/src/lib/elm_grid.eo rename to src/lib/elementary/elm_grid.eo diff --git a/legacy/elementary/src/lib/elm_grid.h b/src/lib/elementary/elm_grid.h similarity index 100% rename from legacy/elementary/src/lib/elm_grid.h rename to src/lib/elementary/elm_grid.h diff --git a/legacy/elementary/src/lib/elm_grid_eo.h b/src/lib/elementary/elm_grid_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_grid_eo.h rename to src/lib/elementary/elm_grid_eo.h diff --git a/legacy/elementary/src/lib/elm_grid_legacy.h b/src/lib/elementary/elm_grid_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_grid_legacy.h rename to src/lib/elementary/elm_grid_legacy.h diff --git a/legacy/elementary/src/lib/elm_helper.c b/src/lib/elementary/elm_helper.c similarity index 100% rename from legacy/elementary/src/lib/elm_helper.c rename to src/lib/elementary/elm_helper.c diff --git a/legacy/elementary/src/lib/elm_helper.h b/src/lib/elementary/elm_helper.h similarity index 100% rename from legacy/elementary/src/lib/elm_helper.h rename to src/lib/elementary/elm_helper.h diff --git a/legacy/elementary/src/lib/elm_hover.c b/src/lib/elementary/elm_hover.c similarity index 100% rename from legacy/elementary/src/lib/elm_hover.c rename to src/lib/elementary/elm_hover.c diff --git a/legacy/elementary/src/lib/elm_hover.eo b/src/lib/elementary/elm_hover.eo similarity index 100% rename from legacy/elementary/src/lib/elm_hover.eo rename to src/lib/elementary/elm_hover.eo diff --git a/legacy/elementary/src/lib/elm_hover.h b/src/lib/elementary/elm_hover.h similarity index 100% rename from legacy/elementary/src/lib/elm_hover.h rename to src/lib/elementary/elm_hover.h diff --git a/legacy/elementary/src/lib/elm_hover_eo.h b/src/lib/elementary/elm_hover_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_hover_eo.h rename to src/lib/elementary/elm_hover_eo.h diff --git a/legacy/elementary/src/lib/elm_hover_legacy.h b/src/lib/elementary/elm_hover_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_hover_legacy.h rename to src/lib/elementary/elm_hover_legacy.h diff --git a/legacy/elementary/src/lib/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo similarity index 100% rename from legacy/elementary/src/lib/elm_hoversel.eo rename to src/lib/elementary/elm_hoversel.eo diff --git a/legacy/elementary/src/lib/elm_hoversel_item.eo b/src/lib/elementary/elm_hoversel_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_hoversel_item.eo rename to src/lib/elementary/elm_hoversel_item.eo diff --git a/legacy/elementary/src/lib/elm_icon.c b/src/lib/elementary/elm_icon.c similarity index 100% rename from legacy/elementary/src/lib/elm_icon.c rename to src/lib/elementary/elm_icon.c diff --git a/legacy/elementary/src/lib/elm_icon.eo b/src/lib/elementary/elm_icon.eo similarity index 100% rename from legacy/elementary/src/lib/elm_icon.eo rename to src/lib/elementary/elm_icon.eo diff --git a/legacy/elementary/src/lib/elm_icon.h b/src/lib/elementary/elm_icon.h similarity index 100% rename from legacy/elementary/src/lib/elm_icon.h rename to src/lib/elementary/elm_icon.h diff --git a/legacy/elementary/src/lib/elm_icon_eo.h b/src/lib/elementary/elm_icon_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_icon_eo.h rename to src/lib/elementary/elm_icon_eo.h diff --git a/legacy/elementary/src/lib/elm_icon_legacy.h b/src/lib/elementary/elm_icon_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_icon_legacy.h rename to src/lib/elementary/elm_icon_legacy.h diff --git a/legacy/elementary/src/lib/elm_image.c b/src/lib/elementary/elm_image.c similarity index 100% rename from legacy/elementary/src/lib/elm_image.c rename to src/lib/elementary/elm_image.c diff --git a/legacy/elementary/src/lib/elm_image.eo b/src/lib/elementary/elm_image.eo similarity index 100% rename from legacy/elementary/src/lib/elm_image.eo rename to src/lib/elementary/elm_image.eo diff --git a/legacy/elementary/src/lib/elm_image.h b/src/lib/elementary/elm_image.h similarity index 100% rename from legacy/elementary/src/lib/elm_image.h rename to src/lib/elementary/elm_image.h diff --git a/legacy/elementary/src/lib/elm_image_eo.h b/src/lib/elementary/elm_image_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_image_eo.h rename to src/lib/elementary/elm_image_eo.h diff --git a/legacy/elementary/src/lib/elm_image_legacy.h b/src/lib/elementary/elm_image_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_image_legacy.h rename to src/lib/elementary/elm_image_legacy.h diff --git a/legacy/elementary/src/lib/elm_index.c b/src/lib/elementary/elm_index.c similarity index 100% rename from legacy/elementary/src/lib/elm_index.c rename to src/lib/elementary/elm_index.c diff --git a/legacy/elementary/src/lib/elm_index.eo b/src/lib/elementary/elm_index.eo similarity index 100% rename from legacy/elementary/src/lib/elm_index.eo rename to src/lib/elementary/elm_index.eo diff --git a/legacy/elementary/src/lib/elm_index.h b/src/lib/elementary/elm_index.h similarity index 100% rename from legacy/elementary/src/lib/elm_index.h rename to src/lib/elementary/elm_index.h diff --git a/legacy/elementary/src/lib/elm_index_eo.h b/src/lib/elementary/elm_index_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_index_eo.h rename to src/lib/elementary/elm_index_eo.h diff --git a/legacy/elementary/src/lib/elm_index_item.eo b/src/lib/elementary/elm_index_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_index_item.eo rename to src/lib/elementary/elm_index_item.eo diff --git a/legacy/elementary/src/lib/elm_index_legacy.h b/src/lib/elementary/elm_index_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_index_legacy.h rename to src/lib/elementary/elm_index_legacy.h diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.c b/src/lib/elementary/elm_interface_atspi_accessible.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_accessible.c rename to src/lib/elementary/elm_interface_atspi_accessible.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.eo b/src/lib/elementary/elm_interface_atspi_accessible.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_accessible.eo rename to src/lib/elementary/elm_interface_atspi_accessible.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_accessible.h b/src/lib/elementary/elm_interface_atspi_accessible.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_accessible.h rename to src/lib/elementary/elm_interface_atspi_accessible.h diff --git a/legacy/elementary/src/lib/elm_interface_atspi_action.c b/src/lib/elementary/elm_interface_atspi_action.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_action.c rename to src/lib/elementary/elm_interface_atspi_action.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_action.eo b/src/lib/elementary/elm_interface_atspi_action.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_action.eo rename to src/lib/elementary/elm_interface_atspi_action.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.c b/src/lib/elementary/elm_interface_atspi_component.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_component.c rename to src/lib/elementary/elm_interface_atspi_component.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_component.eo b/src/lib/elementary/elm_interface_atspi_component.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_component.eo rename to src/lib/elementary/elm_interface_atspi_component.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.c b/src/lib/elementary/elm_interface_atspi_editable_text.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_editable_text.c rename to src/lib/elementary/elm_interface_atspi_editable_text.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo b/src/lib/elementary/elm_interface_atspi_editable_text.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_editable_text.eo rename to src/lib/elementary/elm_interface_atspi_editable_text.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.c b/src/lib/elementary/elm_interface_atspi_image.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_image.c rename to src/lib/elementary/elm_interface_atspi_image.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_image.eo b/src/lib/elementary/elm_interface_atspi_image.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_image.eo rename to src/lib/elementary/elm_interface_atspi_image.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_selection.c b/src/lib/elementary/elm_interface_atspi_selection.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_selection.c rename to src/lib/elementary/elm_interface_atspi_selection.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_selection.eo b/src/lib/elementary/elm_interface_atspi_selection.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_selection.eo rename to src/lib/elementary/elm_interface_atspi_selection.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.c b/src/lib/elementary/elm_interface_atspi_text.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_text.c rename to src/lib/elementary/elm_interface_atspi_text.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.eo b/src/lib/elementary/elm_interface_atspi_text.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_text.eo rename to src/lib/elementary/elm_interface_atspi_text.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_text.h b/src/lib/elementary/elm_interface_atspi_text.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_text.h rename to src/lib/elementary/elm_interface_atspi_text.h diff --git a/legacy/elementary/src/lib/elm_interface_atspi_value.c b/src/lib/elementary/elm_interface_atspi_value.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_value.c rename to src/lib/elementary/elm_interface_atspi_value.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_value.eo b/src/lib/elementary/elm_interface_atspi_value.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_value.eo rename to src/lib/elementary/elm_interface_atspi_value.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.c b/src/lib/elementary/elm_interface_atspi_widget_action.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_widget_action.c rename to src/lib/elementary/elm_interface_atspi_widget_action.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo b/src/lib/elementary/elm_interface_atspi_widget_action.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_widget_action.eo rename to src/lib/elementary/elm_interface_atspi_widget_action.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_widget_action.h b/src/lib/elementary/elm_interface_atspi_widget_action.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_widget_action.h rename to src/lib/elementary/elm_interface_atspi_widget_action.h diff --git a/legacy/elementary/src/lib/elm_interface_atspi_window.c b/src/lib/elementary/elm_interface_atspi_window.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_window.c rename to src/lib/elementary/elm_interface_atspi_window.c diff --git a/legacy/elementary/src/lib/elm_interface_atspi_window.eo b/src/lib/elementary/elm_interface_atspi_window.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_window.eo rename to src/lib/elementary/elm_interface_atspi_window.eo diff --git a/legacy/elementary/src/lib/elm_interface_atspi_window.h b/src/lib/elementary/elm_interface_atspi_window.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_atspi_window.h rename to src/lib/elementary/elm_interface_atspi_window.h diff --git a/legacy/elementary/src/lib/elm_interface_fileselector.c b/src/lib/elementary/elm_interface_fileselector.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_fileselector.c rename to src/lib/elementary/elm_interface_fileselector.c diff --git a/legacy/elementary/src/lib/elm_interface_fileselector.eo b/src/lib/elementary/elm_interface_fileselector.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_fileselector.eo rename to src/lib/elementary/elm_interface_fileselector.eo diff --git a/legacy/elementary/src/lib/elm_interface_fileselector.h b/src/lib/elementary/elm_interface_fileselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_fileselector.h rename to src/lib/elementary/elm_interface_fileselector.h diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.c b/src/lib/elementary/elm_interface_scrollable.c similarity index 100% rename from legacy/elementary/src/lib/elm_interface_scrollable.c rename to src/lib/elementary/elm_interface_scrollable.c diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo similarity index 100% rename from legacy/elementary/src/lib/elm_interface_scrollable.eo rename to src/lib/elementary/elm_interface_scrollable.eo diff --git a/legacy/elementary/src/lib/elm_interface_scrollable.h b/src/lib/elementary/elm_interface_scrollable.h similarity index 100% rename from legacy/elementary/src/lib/elm_interface_scrollable.h rename to src/lib/elementary/elm_interface_scrollable.h diff --git a/legacy/elementary/src/lib/elm_interfaces.h b/src/lib/elementary/elm_interfaces.h similarity index 100% rename from legacy/elementary/src/lib/elm_interfaces.h rename to src/lib/elementary/elm_interfaces.h diff --git a/legacy/elementary/src/lib/elm_intro.h.in b/src/lib/elementary/elm_intro.h.in similarity index 100% rename from legacy/elementary/src/lib/elm_intro.h.in rename to src/lib/elementary/elm_intro.h.in diff --git a/legacy/elementary/src/lib/elm_inwin.c b/src/lib/elementary/elm_inwin.c similarity index 100% rename from legacy/elementary/src/lib/elm_inwin.c rename to src/lib/elementary/elm_inwin.c diff --git a/legacy/elementary/src/lib/elm_inwin.eo b/src/lib/elementary/elm_inwin.eo similarity index 100% rename from legacy/elementary/src/lib/elm_inwin.eo rename to src/lib/elementary/elm_inwin.eo diff --git a/legacy/elementary/src/lib/elm_inwin.h b/src/lib/elementary/elm_inwin.h similarity index 100% rename from legacy/elementary/src/lib/elm_inwin.h rename to src/lib/elementary/elm_inwin.h diff --git a/legacy/elementary/src/lib/elm_inwin_eo.h b/src/lib/elementary/elm_inwin_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_inwin_eo.h rename to src/lib/elementary/elm_inwin_eo.h diff --git a/legacy/elementary/src/lib/elm_inwin_legacy.h b/src/lib/elementary/elm_inwin_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_inwin_legacy.h rename to src/lib/elementary/elm_inwin_legacy.h diff --git a/legacy/elementary/src/lib/elm_label.c b/src/lib/elementary/elm_label.c similarity index 100% rename from legacy/elementary/src/lib/elm_label.c rename to src/lib/elementary/elm_label.c diff --git a/legacy/elementary/src/lib/elm_label.eo b/src/lib/elementary/elm_label.eo similarity index 100% rename from legacy/elementary/src/lib/elm_label.eo rename to src/lib/elementary/elm_label.eo diff --git a/legacy/elementary/src/lib/elm_label.h b/src/lib/elementary/elm_label.h similarity index 100% rename from legacy/elementary/src/lib/elm_label.h rename to src/lib/elementary/elm_label.h diff --git a/legacy/elementary/src/lib/elm_label_eo.h b/src/lib/elementary/elm_label_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_label_eo.h rename to src/lib/elementary/elm_label_eo.h diff --git a/legacy/elementary/src/lib/elm_label_legacy.h b/src/lib/elementary/elm_label_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_label_legacy.h rename to src/lib/elementary/elm_label_legacy.h diff --git a/legacy/elementary/src/lib/elm_layout.c b/src/lib/elementary/elm_layout.c similarity index 100% rename from legacy/elementary/src/lib/elm_layout.c rename to src/lib/elementary/elm_layout.c diff --git a/legacy/elementary/src/lib/elm_layout.eo b/src/lib/elementary/elm_layout.eo similarity index 100% rename from legacy/elementary/src/lib/elm_layout.eo rename to src/lib/elementary/elm_layout.eo diff --git a/legacy/elementary/src/lib/elm_layout.h b/src/lib/elementary/elm_layout.h similarity index 100% rename from legacy/elementary/src/lib/elm_layout.h rename to src/lib/elementary/elm_layout.h diff --git a/legacy/elementary/src/lib/elm_layout_common.h b/src/lib/elementary/elm_layout_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_layout_common.h rename to src/lib/elementary/elm_layout_common.h diff --git a/legacy/elementary/src/lib/elm_layout_eo.h b/src/lib/elementary/elm_layout_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_layout_eo.h rename to src/lib/elementary/elm_layout_eo.h diff --git a/legacy/elementary/src/lib/elm_layout_legacy.h b/src/lib/elementary/elm_layout_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_layout_legacy.h rename to src/lib/elementary/elm_layout_legacy.h diff --git a/legacy/elementary/src/lib/elm_list.c b/src/lib/elementary/elm_list.c similarity index 100% rename from legacy/elementary/src/lib/elm_list.c rename to src/lib/elementary/elm_list.c diff --git a/legacy/elementary/src/lib/elm_list.eo b/src/lib/elementary/elm_list.eo similarity index 100% rename from legacy/elementary/src/lib/elm_list.eo rename to src/lib/elementary/elm_list.eo diff --git a/legacy/elementary/src/lib/elm_list.h b/src/lib/elementary/elm_list.h similarity index 100% rename from legacy/elementary/src/lib/elm_list.h rename to src/lib/elementary/elm_list.h diff --git a/legacy/elementary/src/lib/elm_list_eo.h b/src/lib/elementary/elm_list_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_list_eo.h rename to src/lib/elementary/elm_list_eo.h diff --git a/legacy/elementary/src/lib/elm_list_item.eo b/src/lib/elementary/elm_list_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_list_item.eo rename to src/lib/elementary/elm_list_item.eo diff --git a/legacy/elementary/src/lib/elm_list_legacy.h b/src/lib/elementary/elm_list_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_list_legacy.h rename to src/lib/elementary/elm_list_legacy.h diff --git a/legacy/elementary/src/lib/elm_macros.h b/src/lib/elementary/elm_macros.h similarity index 100% rename from legacy/elementary/src/lib/elm_macros.h rename to src/lib/elementary/elm_macros.h diff --git a/legacy/elementary/src/lib/elm_main.c b/src/lib/elementary/elm_main.c similarity index 100% rename from legacy/elementary/src/lib/elm_main.c rename to src/lib/elementary/elm_main.c diff --git a/legacy/elementary/src/lib/elm_map.c b/src/lib/elementary/elm_map.c similarity index 100% rename from legacy/elementary/src/lib/elm_map.c rename to src/lib/elementary/elm_map.c diff --git a/legacy/elementary/src/lib/elm_map.eo b/src/lib/elementary/elm_map.eo similarity index 100% rename from legacy/elementary/src/lib/elm_map.eo rename to src/lib/elementary/elm_map.eo diff --git a/legacy/elementary/src/lib/elm_map.h b/src/lib/elementary/elm_map.h similarity index 100% rename from legacy/elementary/src/lib/elm_map.h rename to src/lib/elementary/elm_map.h diff --git a/legacy/elementary/src/lib/elm_map_common.h b/src/lib/elementary/elm_map_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_map_common.h rename to src/lib/elementary/elm_map_common.h diff --git a/legacy/elementary/src/lib/elm_map_eo.h b/src/lib/elementary/elm_map_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_map_eo.h rename to src/lib/elementary/elm_map_eo.h diff --git a/legacy/elementary/src/lib/elm_map_legacy.h b/src/lib/elementary/elm_map_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_map_legacy.h rename to src/lib/elementary/elm_map_legacy.h diff --git a/legacy/elementary/src/lib/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo similarity index 100% rename from legacy/elementary/src/lib/elm_map_pan.eo rename to src/lib/elementary/elm_map_pan.eo diff --git a/legacy/elementary/src/lib/elm_mapbuf.c b/src/lib/elementary/elm_mapbuf.c similarity index 100% rename from legacy/elementary/src/lib/elm_mapbuf.c rename to src/lib/elementary/elm_mapbuf.c diff --git a/legacy/elementary/src/lib/elm_mapbuf.eo b/src/lib/elementary/elm_mapbuf.eo similarity index 100% rename from legacy/elementary/src/lib/elm_mapbuf.eo rename to src/lib/elementary/elm_mapbuf.eo diff --git a/legacy/elementary/src/lib/elm_mapbuf.h b/src/lib/elementary/elm_mapbuf.h similarity index 100% rename from legacy/elementary/src/lib/elm_mapbuf.h rename to src/lib/elementary/elm_mapbuf.h diff --git a/legacy/elementary/src/lib/elm_mapbuf_eo.h b/src/lib/elementary/elm_mapbuf_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_mapbuf_eo.h rename to src/lib/elementary/elm_mapbuf_eo.h diff --git a/legacy/elementary/src/lib/elm_mapbuf_legacy.h b/src/lib/elementary/elm_mapbuf_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_mapbuf_legacy.h rename to src/lib/elementary/elm_mapbuf_legacy.h diff --git a/legacy/elementary/src/lib/elm_menu.c b/src/lib/elementary/elm_menu.c similarity index 100% rename from legacy/elementary/src/lib/elm_menu.c rename to src/lib/elementary/elm_menu.c diff --git a/legacy/elementary/src/lib/elm_menu.eo b/src/lib/elementary/elm_menu.eo similarity index 100% rename from legacy/elementary/src/lib/elm_menu.eo rename to src/lib/elementary/elm_menu.eo diff --git a/legacy/elementary/src/lib/elm_menu.h b/src/lib/elementary/elm_menu.h similarity index 100% rename from legacy/elementary/src/lib/elm_menu.h rename to src/lib/elementary/elm_menu.h diff --git a/legacy/elementary/src/lib/elm_menu_eo.h b/src/lib/elementary/elm_menu_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_menu_eo.h rename to src/lib/elementary/elm_menu_eo.h diff --git a/legacy/elementary/src/lib/elm_menu_item.eo b/src/lib/elementary/elm_menu_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_menu_item.eo rename to src/lib/elementary/elm_menu_item.eo diff --git a/legacy/elementary/src/lib/elm_menu_legacy.h b/src/lib/elementary/elm_menu_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_menu_legacy.h rename to src/lib/elementary/elm_menu_legacy.h diff --git a/legacy/elementary/src/lib/elm_mirroring.h b/src/lib/elementary/elm_mirroring.h similarity index 100% rename from legacy/elementary/src/lib/elm_mirroring.h rename to src/lib/elementary/elm_mirroring.h diff --git a/legacy/elementary/src/lib/elm_module.c b/src/lib/elementary/elm_module.c similarity index 100% rename from legacy/elementary/src/lib/elm_module.c rename to src/lib/elementary/elm_module.c diff --git a/legacy/elementary/src/lib/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo similarity index 100% rename from legacy/elementary/src/lib/elm_multibuttonentry.eo rename to src/lib/elementary/elm_multibuttonentry.eo diff --git a/legacy/elementary/src/lib/elm_multibuttonentry_item.eo b/src/lib/elementary/elm_multibuttonentry_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_multibuttonentry_item.eo rename to src/lib/elementary/elm_multibuttonentry_item.eo diff --git a/legacy/elementary/src/lib/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo similarity index 100% rename from legacy/elementary/src/lib/elm_naviframe.eo rename to src/lib/elementary/elm_naviframe.eo diff --git a/legacy/elementary/src/lib/elm_naviframe_item.eo b/src/lib/elementary/elm_naviframe_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_naviframe_item.eo rename to src/lib/elementary/elm_naviframe_item.eo diff --git a/legacy/elementary/src/lib/elm_need.h b/src/lib/elementary/elm_need.h similarity index 100% rename from legacy/elementary/src/lib/elm_need.h rename to src/lib/elementary/elm_need.h diff --git a/legacy/elementary/src/lib/elm_notify.c b/src/lib/elementary/elm_notify.c similarity index 100% rename from legacy/elementary/src/lib/elm_notify.c rename to src/lib/elementary/elm_notify.c diff --git a/legacy/elementary/src/lib/elm_notify.eo b/src/lib/elementary/elm_notify.eo similarity index 100% rename from legacy/elementary/src/lib/elm_notify.eo rename to src/lib/elementary/elm_notify.eo diff --git a/legacy/elementary/src/lib/elm_notify.h b/src/lib/elementary/elm_notify.h similarity index 100% rename from legacy/elementary/src/lib/elm_notify.h rename to src/lib/elementary/elm_notify.h diff --git a/legacy/elementary/src/lib/elm_notify_common.h b/src/lib/elementary/elm_notify_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_notify_common.h rename to src/lib/elementary/elm_notify_common.h diff --git a/legacy/elementary/src/lib/elm_notify_eo.h b/src/lib/elementary/elm_notify_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_notify_eo.h rename to src/lib/elementary/elm_notify_eo.h diff --git a/legacy/elementary/src/lib/elm_notify_legacy.h b/src/lib/elementary/elm_notify_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_notify_legacy.h rename to src/lib/elementary/elm_notify_legacy.h diff --git a/legacy/elementary/src/lib/elm_object.h b/src/lib/elementary/elm_object.h similarity index 100% rename from legacy/elementary/src/lib/elm_object.h rename to src/lib/elementary/elm_object.h diff --git a/legacy/elementary/src/lib/elm_object_item.h b/src/lib/elementary/elm_object_item.h similarity index 100% rename from legacy/elementary/src/lib/elm_object_item.h rename to src/lib/elementary/elm_object_item.h diff --git a/legacy/elementary/src/lib/elm_pan.eo b/src/lib/elementary/elm_pan.eo similarity index 100% rename from legacy/elementary/src/lib/elm_pan.eo rename to src/lib/elementary/elm_pan.eo diff --git a/legacy/elementary/src/lib/elm_panel.c b/src/lib/elementary/elm_panel.c similarity index 100% rename from legacy/elementary/src/lib/elm_panel.c rename to src/lib/elementary/elm_panel.c diff --git a/legacy/elementary/src/lib/elm_panel.eo b/src/lib/elementary/elm_panel.eo similarity index 100% rename from legacy/elementary/src/lib/elm_panel.eo rename to src/lib/elementary/elm_panel.eo diff --git a/legacy/elementary/src/lib/elm_panel.h b/src/lib/elementary/elm_panel.h similarity index 100% rename from legacy/elementary/src/lib/elm_panel.h rename to src/lib/elementary/elm_panel.h diff --git a/legacy/elementary/src/lib/elm_panel_common.h b/src/lib/elementary/elm_panel_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_panel_common.h rename to src/lib/elementary/elm_panel_common.h diff --git a/legacy/elementary/src/lib/elm_panel_eo.h b/src/lib/elementary/elm_panel_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_panel_eo.h rename to src/lib/elementary/elm_panel_eo.h diff --git a/legacy/elementary/src/lib/elm_panel_legacy.h b/src/lib/elementary/elm_panel_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_panel_legacy.h rename to src/lib/elementary/elm_panel_legacy.h diff --git a/legacy/elementary/src/lib/elm_panes.c b/src/lib/elementary/elm_panes.c similarity index 100% rename from legacy/elementary/src/lib/elm_panes.c rename to src/lib/elementary/elm_panes.c diff --git a/legacy/elementary/src/lib/elm_panes.eo b/src/lib/elementary/elm_panes.eo similarity index 100% rename from legacy/elementary/src/lib/elm_panes.eo rename to src/lib/elementary/elm_panes.eo diff --git a/legacy/elementary/src/lib/elm_panes.h b/src/lib/elementary/elm_panes.h similarity index 100% rename from legacy/elementary/src/lib/elm_panes.h rename to src/lib/elementary/elm_panes.h diff --git a/legacy/elementary/src/lib/elm_panes_eo.h b/src/lib/elementary/elm_panes_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_panes_eo.h rename to src/lib/elementary/elm_panes_eo.h diff --git a/legacy/elementary/src/lib/elm_panes_legacy.h b/src/lib/elementary/elm_panes_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_panes_legacy.h rename to src/lib/elementary/elm_panes_legacy.h diff --git a/legacy/elementary/src/lib/elm_photo.c b/src/lib/elementary/elm_photo.c similarity index 100% rename from legacy/elementary/src/lib/elm_photo.c rename to src/lib/elementary/elm_photo.c diff --git a/legacy/elementary/src/lib/elm_photo.eo b/src/lib/elementary/elm_photo.eo similarity index 100% rename from legacy/elementary/src/lib/elm_photo.eo rename to src/lib/elementary/elm_photo.eo diff --git a/legacy/elementary/src/lib/elm_photo.h b/src/lib/elementary/elm_photo.h similarity index 100% rename from legacy/elementary/src/lib/elm_photo.h rename to src/lib/elementary/elm_photo.h diff --git a/legacy/elementary/src/lib/elm_photo_eo.h b/src/lib/elementary/elm_photo_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_photo_eo.h rename to src/lib/elementary/elm_photo_eo.h diff --git a/legacy/elementary/src/lib/elm_photo_legacy.h b/src/lib/elementary/elm_photo_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_photo_legacy.h rename to src/lib/elementary/elm_photo_legacy.h diff --git a/legacy/elementary/src/lib/elm_photocam.c b/src/lib/elementary/elm_photocam.c similarity index 100% rename from legacy/elementary/src/lib/elm_photocam.c rename to src/lib/elementary/elm_photocam.c diff --git a/legacy/elementary/src/lib/elm_photocam.eo b/src/lib/elementary/elm_photocam.eo similarity index 100% rename from legacy/elementary/src/lib/elm_photocam.eo rename to src/lib/elementary/elm_photocam.eo diff --git a/legacy/elementary/src/lib/elm_photocam.h b/src/lib/elementary/elm_photocam.h similarity index 100% rename from legacy/elementary/src/lib/elm_photocam.h rename to src/lib/elementary/elm_photocam.h diff --git a/legacy/elementary/src/lib/elm_photocam_eo.h b/src/lib/elementary/elm_photocam_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_photocam_eo.h rename to src/lib/elementary/elm_photocam_eo.h diff --git a/legacy/elementary/src/lib/elm_photocam_legacy.h b/src/lib/elementary/elm_photocam_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_photocam_legacy.h rename to src/lib/elementary/elm_photocam_legacy.h diff --git a/legacy/elementary/src/lib/elm_photocam_pan.eo b/src/lib/elementary/elm_photocam_pan.eo similarity index 100% rename from legacy/elementary/src/lib/elm_photocam_pan.eo rename to src/lib/elementary/elm_photocam_pan.eo diff --git a/legacy/elementary/src/lib/elm_player.eo b/src/lib/elementary/elm_player.eo similarity index 100% rename from legacy/elementary/src/lib/elm_player.eo rename to src/lib/elementary/elm_player.eo diff --git a/legacy/elementary/src/lib/elm_plug.c b/src/lib/elementary/elm_plug.c similarity index 100% rename from legacy/elementary/src/lib/elm_plug.c rename to src/lib/elementary/elm_plug.c diff --git a/legacy/elementary/src/lib/elm_plug.eo b/src/lib/elementary/elm_plug.eo similarity index 100% rename from legacy/elementary/src/lib/elm_plug.eo rename to src/lib/elementary/elm_plug.eo diff --git a/legacy/elementary/src/lib/elm_plug.h b/src/lib/elementary/elm_plug.h similarity index 100% rename from legacy/elementary/src/lib/elm_plug.h rename to src/lib/elementary/elm_plug.h diff --git a/legacy/elementary/src/lib/elm_plug_eo.h b/src/lib/elementary/elm_plug_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_plug_eo.h rename to src/lib/elementary/elm_plug_eo.h diff --git a/legacy/elementary/src/lib/elm_plug_legacy.h b/src/lib/elementary/elm_plug_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_plug_legacy.h rename to src/lib/elementary/elm_plug_legacy.h diff --git a/legacy/elementary/src/lib/elm_popup.eo b/src/lib/elementary/elm_popup.eo similarity index 100% rename from legacy/elementary/src/lib/elm_popup.eo rename to src/lib/elementary/elm_popup.eo diff --git a/legacy/elementary/src/lib/elm_popup_item.eo b/src/lib/elementary/elm_popup_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_popup_item.eo rename to src/lib/elementary/elm_popup_item.eo diff --git a/legacy/elementary/src/lib/elm_prefs.c b/src/lib/elementary/elm_prefs.c similarity index 100% rename from legacy/elementary/src/lib/elm_prefs.c rename to src/lib/elementary/elm_prefs.c diff --git a/legacy/elementary/src/lib/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo similarity index 100% rename from legacy/elementary/src/lib/elm_prefs.eo rename to src/lib/elementary/elm_prefs.eo diff --git a/legacy/elementary/src/lib/elm_prefs.h b/src/lib/elementary/elm_prefs.h similarity index 100% rename from legacy/elementary/src/lib/elm_prefs.h rename to src/lib/elementary/elm_prefs.h diff --git a/legacy/elementary/src/lib/elm_prefs_common.h b/src/lib/elementary/elm_prefs_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_common.h rename to src/lib/elementary/elm_prefs_common.h diff --git a/legacy/elementary/src/lib/elm_prefs_data.c b/src/lib/elementary/elm_prefs_data.c similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_data.c rename to src/lib/elementary/elm_prefs_data.c diff --git a/legacy/elementary/src/lib/elm_prefs_data.h b/src/lib/elementary/elm_prefs_data.h similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_data.h rename to src/lib/elementary/elm_prefs_data.h diff --git a/legacy/elementary/src/lib/elm_prefs_edd.x b/src/lib/elementary/elm_prefs_edd.x similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_edd.x rename to src/lib/elementary/elm_prefs_edd.x diff --git a/legacy/elementary/src/lib/elm_prefs_eo.h b/src/lib/elementary/elm_prefs_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_eo.h rename to src/lib/elementary/elm_prefs_eo.h diff --git a/legacy/elementary/src/lib/elm_prefs_legacy.h b/src/lib/elementary/elm_prefs_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_prefs_legacy.h rename to src/lib/elementary/elm_prefs_legacy.h diff --git a/legacy/elementary/src/lib/elm_priv.h b/src/lib/elementary/elm_priv.h similarity index 100% rename from legacy/elementary/src/lib/elm_priv.h rename to src/lib/elementary/elm_priv.h diff --git a/legacy/elementary/src/lib/elm_progressbar.c b/src/lib/elementary/elm_progressbar.c similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar.c rename to src/lib/elementary/elm_progressbar.c diff --git a/legacy/elementary/src/lib/elm_progressbar.eo b/src/lib/elementary/elm_progressbar.eo similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar.eo rename to src/lib/elementary/elm_progressbar.eo diff --git a/legacy/elementary/src/lib/elm_progressbar.h b/src/lib/elementary/elm_progressbar.h similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar.h rename to src/lib/elementary/elm_progressbar.h diff --git a/legacy/elementary/src/lib/elm_progressbar_common.h b/src/lib/elementary/elm_progressbar_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar_common.h rename to src/lib/elementary/elm_progressbar_common.h diff --git a/legacy/elementary/src/lib/elm_progressbar_eo.h b/src/lib/elementary/elm_progressbar_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar_eo.h rename to src/lib/elementary/elm_progressbar_eo.h diff --git a/legacy/elementary/src/lib/elm_progressbar_legacy.h b/src/lib/elementary/elm_progressbar_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_progressbar_legacy.h rename to src/lib/elementary/elm_progressbar_legacy.h diff --git a/legacy/elementary/src/lib/elm_radio.c b/src/lib/elementary/elm_radio.c similarity index 100% rename from legacy/elementary/src/lib/elm_radio.c rename to src/lib/elementary/elm_radio.c diff --git a/legacy/elementary/src/lib/elm_radio.eo b/src/lib/elementary/elm_radio.eo similarity index 100% rename from legacy/elementary/src/lib/elm_radio.eo rename to src/lib/elementary/elm_radio.eo diff --git a/legacy/elementary/src/lib/elm_radio.h b/src/lib/elementary/elm_radio.h similarity index 100% rename from legacy/elementary/src/lib/elm_radio.h rename to src/lib/elementary/elm_radio.h diff --git a/legacy/elementary/src/lib/elm_radio_eo.h b/src/lib/elementary/elm_radio_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_radio_eo.h rename to src/lib/elementary/elm_radio_eo.h diff --git a/legacy/elementary/src/lib/elm_radio_legacy.h b/src/lib/elementary/elm_radio_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_radio_legacy.h rename to src/lib/elementary/elm_radio_legacy.h diff --git a/legacy/elementary/src/lib/elm_removed.h b/src/lib/elementary/elm_removed.h similarity index 100% rename from legacy/elementary/src/lib/elm_removed.h rename to src/lib/elementary/elm_removed.h diff --git a/legacy/elementary/src/lib/elm_route.c b/src/lib/elementary/elm_route.c similarity index 100% rename from legacy/elementary/src/lib/elm_route.c rename to src/lib/elementary/elm_route.c diff --git a/legacy/elementary/src/lib/elm_route.eo b/src/lib/elementary/elm_route.eo similarity index 100% rename from legacy/elementary/src/lib/elm_route.eo rename to src/lib/elementary/elm_route.eo diff --git a/legacy/elementary/src/lib/elm_route.h b/src/lib/elementary/elm_route.h similarity index 100% rename from legacy/elementary/src/lib/elm_route.h rename to src/lib/elementary/elm_route.h diff --git a/legacy/elementary/src/lib/elm_route_eo.h b/src/lib/elementary/elm_route_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_route_eo.h rename to src/lib/elementary/elm_route_eo.h diff --git a/legacy/elementary/src/lib/elm_route_legacy.h b/src/lib/elementary/elm_route_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_route_legacy.h rename to src/lib/elementary/elm_route_legacy.h diff --git a/legacy/elementary/src/lib/elm_scale.h b/src/lib/elementary/elm_scale.h similarity index 100% rename from legacy/elementary/src/lib/elm_scale.h rename to src/lib/elementary/elm_scale.h diff --git a/legacy/elementary/src/lib/elm_scroll.h b/src/lib/elementary/elm_scroll.h similarity index 100% rename from legacy/elementary/src/lib/elm_scroll.h rename to src/lib/elementary/elm_scroll.h diff --git a/legacy/elementary/src/lib/elm_scroller.c b/src/lib/elementary/elm_scroller.c similarity index 100% rename from legacy/elementary/src/lib/elm_scroller.c rename to src/lib/elementary/elm_scroller.c diff --git a/legacy/elementary/src/lib/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo similarity index 100% rename from legacy/elementary/src/lib/elm_scroller.eo rename to src/lib/elementary/elm_scroller.eo diff --git a/legacy/elementary/src/lib/elm_scroller.h b/src/lib/elementary/elm_scroller.h similarity index 100% rename from legacy/elementary/src/lib/elm_scroller.h rename to src/lib/elementary/elm_scroller.h diff --git a/legacy/elementary/src/lib/elm_scroller_eo.h b/src/lib/elementary/elm_scroller_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_scroller_eo.h rename to src/lib/elementary/elm_scroller_eo.h diff --git a/legacy/elementary/src/lib/elm_scroller_legacy.h b/src/lib/elementary/elm_scroller_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_scroller_legacy.h rename to src/lib/elementary/elm_scroller_legacy.h diff --git a/legacy/elementary/src/lib/elm_segment_control.c b/src/lib/elementary/elm_segment_control.c similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control.c rename to src/lib/elementary/elm_segment_control.c diff --git a/legacy/elementary/src/lib/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control.eo rename to src/lib/elementary/elm_segment_control.eo diff --git a/legacy/elementary/src/lib/elm_segment_control.h b/src/lib/elementary/elm_segment_control.h similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control.h rename to src/lib/elementary/elm_segment_control.h diff --git a/legacy/elementary/src/lib/elm_segment_control_eo.h b/src/lib/elementary/elm_segment_control_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control_eo.h rename to src/lib/elementary/elm_segment_control_eo.h diff --git a/legacy/elementary/src/lib/elm_segment_control_item.eo b/src/lib/elementary/elm_segment_control_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control_item.eo rename to src/lib/elementary/elm_segment_control_item.eo diff --git a/legacy/elementary/src/lib/elm_segment_control_legacy.h b/src/lib/elementary/elm_segment_control_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_segment_control_legacy.h rename to src/lib/elementary/elm_segment_control_legacy.h diff --git a/legacy/elementary/src/lib/elm_separator.c b/src/lib/elementary/elm_separator.c similarity index 100% rename from legacy/elementary/src/lib/elm_separator.c rename to src/lib/elementary/elm_separator.c diff --git a/legacy/elementary/src/lib/elm_separator.eo b/src/lib/elementary/elm_separator.eo similarity index 100% rename from legacy/elementary/src/lib/elm_separator.eo rename to src/lib/elementary/elm_separator.eo diff --git a/legacy/elementary/src/lib/elm_separator.h b/src/lib/elementary/elm_separator.h similarity index 100% rename from legacy/elementary/src/lib/elm_separator.h rename to src/lib/elementary/elm_separator.h diff --git a/legacy/elementary/src/lib/elm_separator_eo.h b/src/lib/elementary/elm_separator_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_separator_eo.h rename to src/lib/elementary/elm_separator_eo.h diff --git a/legacy/elementary/src/lib/elm_separator_legacy.h b/src/lib/elementary/elm_separator_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_separator_legacy.h rename to src/lib/elementary/elm_separator_legacy.h diff --git a/legacy/elementary/src/lib/elm_slider.c b/src/lib/elementary/elm_slider.c similarity index 100% rename from legacy/elementary/src/lib/elm_slider.c rename to src/lib/elementary/elm_slider.c diff --git a/legacy/elementary/src/lib/elm_slider.eo b/src/lib/elementary/elm_slider.eo similarity index 100% rename from legacy/elementary/src/lib/elm_slider.eo rename to src/lib/elementary/elm_slider.eo diff --git a/legacy/elementary/src/lib/elm_slider.h b/src/lib/elementary/elm_slider.h similarity index 100% rename from legacy/elementary/src/lib/elm_slider.h rename to src/lib/elementary/elm_slider.h diff --git a/legacy/elementary/src/lib/elm_slider_common.h b/src/lib/elementary/elm_slider_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_slider_common.h rename to src/lib/elementary/elm_slider_common.h diff --git a/legacy/elementary/src/lib/elm_slider_eo.h b/src/lib/elementary/elm_slider_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_slider_eo.h rename to src/lib/elementary/elm_slider_eo.h diff --git a/legacy/elementary/src/lib/elm_slider_legacy.h b/src/lib/elementary/elm_slider_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_slider_legacy.h rename to src/lib/elementary/elm_slider_legacy.h diff --git a/legacy/elementary/src/lib/elm_slideshow.c b/src/lib/elementary/elm_slideshow.c similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow.c rename to src/lib/elementary/elm_slideshow.c diff --git a/legacy/elementary/src/lib/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow.eo rename to src/lib/elementary/elm_slideshow.eo diff --git a/legacy/elementary/src/lib/elm_slideshow.h b/src/lib/elementary/elm_slideshow.h similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow.h rename to src/lib/elementary/elm_slideshow.h diff --git a/legacy/elementary/src/lib/elm_slideshow_common.h b/src/lib/elementary/elm_slideshow_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow_common.h rename to src/lib/elementary/elm_slideshow_common.h diff --git a/legacy/elementary/src/lib/elm_slideshow_eo.h b/src/lib/elementary/elm_slideshow_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow_eo.h rename to src/lib/elementary/elm_slideshow_eo.h diff --git a/legacy/elementary/src/lib/elm_slideshow_item.eo b/src/lib/elementary/elm_slideshow_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow_item.eo rename to src/lib/elementary/elm_slideshow_item.eo diff --git a/legacy/elementary/src/lib/elm_slideshow_legacy.h b/src/lib/elementary/elm_slideshow_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_slideshow_legacy.h rename to src/lib/elementary/elm_slideshow_legacy.h diff --git a/legacy/elementary/src/lib/elm_spinner.c b/src/lib/elementary/elm_spinner.c similarity index 100% rename from legacy/elementary/src/lib/elm_spinner.c rename to src/lib/elementary/elm_spinner.c diff --git a/legacy/elementary/src/lib/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo similarity index 100% rename from legacy/elementary/src/lib/elm_spinner.eo rename to src/lib/elementary/elm_spinner.eo diff --git a/legacy/elementary/src/lib/elm_spinner.h b/src/lib/elementary/elm_spinner.h similarity index 100% rename from legacy/elementary/src/lib/elm_spinner.h rename to src/lib/elementary/elm_spinner.h diff --git a/legacy/elementary/src/lib/elm_spinner_eo.h b/src/lib/elementary/elm_spinner_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_spinner_eo.h rename to src/lib/elementary/elm_spinner_eo.h diff --git a/legacy/elementary/src/lib/elm_spinner_legacy.h b/src/lib/elementary/elm_spinner_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_spinner_legacy.h rename to src/lib/elementary/elm_spinner_legacy.h diff --git a/legacy/elementary/src/lib/elm_store.c b/src/lib/elementary/elm_store.c similarity index 100% rename from legacy/elementary/src/lib/elm_store.c rename to src/lib/elementary/elm_store.c diff --git a/legacy/elementary/src/lib/elm_store.h b/src/lib/elementary/elm_store.h similarity index 100% rename from legacy/elementary/src/lib/elm_store.h rename to src/lib/elementary/elm_store.h diff --git a/legacy/elementary/src/lib/elm_sys_notify.c b/src/lib/elementary/elm_sys_notify.c similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify.c rename to src/lib/elementary/elm_sys_notify.c diff --git a/legacy/elementary/src/lib/elm_sys_notify.eo b/src/lib/elementary/elm_sys_notify.eo similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify.eo rename to src/lib/elementary/elm_sys_notify.eo diff --git a/legacy/elementary/src/lib/elm_sys_notify.h b/src/lib/elementary/elm_sys_notify.h similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify.h rename to src/lib/elementary/elm_sys_notify.h diff --git a/legacy/elementary/src/lib/elm_sys_notify_dbus.c b/src/lib/elementary/elm_sys_notify_dbus.c similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify_dbus.c rename to src/lib/elementary/elm_sys_notify_dbus.c diff --git a/legacy/elementary/src/lib/elm_sys_notify_dbus.eo b/src/lib/elementary/elm_sys_notify_dbus.eo similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify_dbus.eo rename to src/lib/elementary/elm_sys_notify_dbus.eo diff --git a/legacy/elementary/src/lib/elm_sys_notify_interface.c b/src/lib/elementary/elm_sys_notify_interface.c similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify_interface.c rename to src/lib/elementary/elm_sys_notify_interface.c diff --git a/legacy/elementary/src/lib/elm_sys_notify_interface.eo b/src/lib/elementary/elm_sys_notify_interface.eo similarity index 100% rename from legacy/elementary/src/lib/elm_sys_notify_interface.eo rename to src/lib/elementary/elm_sys_notify_interface.eo diff --git a/legacy/elementary/src/lib/elm_systray.c b/src/lib/elementary/elm_systray.c similarity index 100% rename from legacy/elementary/src/lib/elm_systray.c rename to src/lib/elementary/elm_systray.c diff --git a/legacy/elementary/src/lib/elm_systray.eo b/src/lib/elementary/elm_systray.eo similarity index 100% rename from legacy/elementary/src/lib/elm_systray.eo rename to src/lib/elementary/elm_systray.eo diff --git a/legacy/elementary/src/lib/elm_systray.h b/src/lib/elementary/elm_systray.h similarity index 100% rename from legacy/elementary/src/lib/elm_systray.h rename to src/lib/elementary/elm_systray.h diff --git a/legacy/elementary/src/lib/elm_systray_common.h b/src/lib/elementary/elm_systray_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_systray_common.h rename to src/lib/elementary/elm_systray_common.h diff --git a/legacy/elementary/src/lib/elm_systray_eo.h b/src/lib/elementary/elm_systray_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_systray_eo.h rename to src/lib/elementary/elm_systray_eo.h diff --git a/legacy/elementary/src/lib/elm_systray_watcher.c b/src/lib/elementary/elm_systray_watcher.c similarity index 100% rename from legacy/elementary/src/lib/elm_systray_watcher.c rename to src/lib/elementary/elm_systray_watcher.c diff --git a/legacy/elementary/src/lib/elm_systray_watcher.h b/src/lib/elementary/elm_systray_watcher.h similarity index 100% rename from legacy/elementary/src/lib/elm_systray_watcher.h rename to src/lib/elementary/elm_systray_watcher.h diff --git a/legacy/elementary/src/lib/elm_table.c b/src/lib/elementary/elm_table.c similarity index 100% rename from legacy/elementary/src/lib/elm_table.c rename to src/lib/elementary/elm_table.c diff --git a/legacy/elementary/src/lib/elm_table.eo b/src/lib/elementary/elm_table.eo similarity index 100% rename from legacy/elementary/src/lib/elm_table.eo rename to src/lib/elementary/elm_table.eo diff --git a/legacy/elementary/src/lib/elm_table.h b/src/lib/elementary/elm_table.h similarity index 100% rename from legacy/elementary/src/lib/elm_table.h rename to src/lib/elementary/elm_table.h diff --git a/legacy/elementary/src/lib/elm_table_eo.h b/src/lib/elementary/elm_table_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_table_eo.h rename to src/lib/elementary/elm_table_eo.h diff --git a/legacy/elementary/src/lib/elm_table_legacy.h b/src/lib/elementary/elm_table_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_table_legacy.h rename to src/lib/elementary/elm_table_legacy.h diff --git a/legacy/elementary/src/lib/elm_theme.c b/src/lib/elementary/elm_theme.c similarity index 100% rename from legacy/elementary/src/lib/elm_theme.c rename to src/lib/elementary/elm_theme.c diff --git a/legacy/elementary/src/lib/elm_theme.h b/src/lib/elementary/elm_theme.h similarity index 100% rename from legacy/elementary/src/lib/elm_theme.h rename to src/lib/elementary/elm_theme.h diff --git a/legacy/elementary/src/lib/elm_thumb.c b/src/lib/elementary/elm_thumb.c similarity index 100% rename from legacy/elementary/src/lib/elm_thumb.c rename to src/lib/elementary/elm_thumb.c diff --git a/legacy/elementary/src/lib/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo similarity index 100% rename from legacy/elementary/src/lib/elm_thumb.eo rename to src/lib/elementary/elm_thumb.eo diff --git a/legacy/elementary/src/lib/elm_thumb.h b/src/lib/elementary/elm_thumb.h similarity index 100% rename from legacy/elementary/src/lib/elm_thumb.h rename to src/lib/elementary/elm_thumb.h diff --git a/legacy/elementary/src/lib/elm_thumb_common.h b/src/lib/elementary/elm_thumb_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_thumb_common.h rename to src/lib/elementary/elm_thumb_common.h diff --git a/legacy/elementary/src/lib/elm_thumb_eo.h b/src/lib/elementary/elm_thumb_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_thumb_eo.h rename to src/lib/elementary/elm_thumb_eo.h diff --git a/legacy/elementary/src/lib/elm_thumb_legacy.h b/src/lib/elementary/elm_thumb_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_thumb_legacy.h rename to src/lib/elementary/elm_thumb_legacy.h diff --git a/legacy/elementary/src/lib/elm_toolbar.c b/src/lib/elementary/elm_toolbar.c similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar.c rename to src/lib/elementary/elm_toolbar.c diff --git a/legacy/elementary/src/lib/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar.eo rename to src/lib/elementary/elm_toolbar.eo diff --git a/legacy/elementary/src/lib/elm_toolbar.h b/src/lib/elementary/elm_toolbar.h similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar.h rename to src/lib/elementary/elm_toolbar.h diff --git a/legacy/elementary/src/lib/elm_toolbar_common.h b/src/lib/elementary/elm_toolbar_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar_common.h rename to src/lib/elementary/elm_toolbar_common.h diff --git a/legacy/elementary/src/lib/elm_toolbar_eo.h b/src/lib/elementary/elm_toolbar_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar_eo.h rename to src/lib/elementary/elm_toolbar_eo.h diff --git a/legacy/elementary/src/lib/elm_toolbar_item.eo b/src/lib/elementary/elm_toolbar_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar_item.eo rename to src/lib/elementary/elm_toolbar_item.eo diff --git a/legacy/elementary/src/lib/elm_toolbar_legacy.h b/src/lib/elementary/elm_toolbar_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_toolbar_legacy.h rename to src/lib/elementary/elm_toolbar_legacy.h diff --git a/legacy/elementary/src/lib/elm_tooltip.h b/src/lib/elementary/elm_tooltip.h similarity index 100% rename from legacy/elementary/src/lib/elm_tooltip.h rename to src/lib/elementary/elm_tooltip.h diff --git a/legacy/elementary/src/lib/elm_transit.c b/src/lib/elementary/elm_transit.c similarity index 100% rename from legacy/elementary/src/lib/elm_transit.c rename to src/lib/elementary/elm_transit.c diff --git a/legacy/elementary/src/lib/elm_transit.h b/src/lib/elementary/elm_transit.h similarity index 100% rename from legacy/elementary/src/lib/elm_transit.h rename to src/lib/elementary/elm_transit.h diff --git a/legacy/elementary/src/lib/elm_url.c b/src/lib/elementary/elm_url.c similarity index 100% rename from legacy/elementary/src/lib/elm_url.c rename to src/lib/elementary/elm_url.c diff --git a/legacy/elementary/src/lib/elm_util.c b/src/lib/elementary/elm_util.c similarity index 100% rename from legacy/elementary/src/lib/elm_util.c rename to src/lib/elementary/elm_util.c diff --git a/legacy/elementary/src/lib/elm_video.c b/src/lib/elementary/elm_video.c similarity index 100% rename from legacy/elementary/src/lib/elm_video.c rename to src/lib/elementary/elm_video.c diff --git a/legacy/elementary/src/lib/elm_video.eo b/src/lib/elementary/elm_video.eo similarity index 100% rename from legacy/elementary/src/lib/elm_video.eo rename to src/lib/elementary/elm_video.eo diff --git a/legacy/elementary/src/lib/elm_video.h b/src/lib/elementary/elm_video.h similarity index 100% rename from legacy/elementary/src/lib/elm_video.h rename to src/lib/elementary/elm_video.h diff --git a/legacy/elementary/src/lib/elm_video_eo.h b/src/lib/elementary/elm_video_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_video_eo.h rename to src/lib/elementary/elm_video_eo.h diff --git a/legacy/elementary/src/lib/elm_video_legacy.h b/src/lib/elementary/elm_video_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_video_legacy.h rename to src/lib/elementary/elm_video_legacy.h diff --git a/legacy/elementary/src/lib/elm_view_form.c b/src/lib/elementary/elm_view_form.c similarity index 100% rename from legacy/elementary/src/lib/elm_view_form.c rename to src/lib/elementary/elm_view_form.c diff --git a/legacy/elementary/src/lib/elm_view_form.eo b/src/lib/elementary/elm_view_form.eo similarity index 100% rename from legacy/elementary/src/lib/elm_view_form.eo rename to src/lib/elementary/elm_view_form.eo diff --git a/legacy/elementary/src/lib/elm_view_form.h b/src/lib/elementary/elm_view_form.h similarity index 100% rename from legacy/elementary/src/lib/elm_view_form.h rename to src/lib/elementary/elm_view_form.h diff --git a/legacy/elementary/src/lib/elm_view_list.c b/src/lib/elementary/elm_view_list.c similarity index 100% rename from legacy/elementary/src/lib/elm_view_list.c rename to src/lib/elementary/elm_view_list.c diff --git a/legacy/elementary/src/lib/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo similarity index 100% rename from legacy/elementary/src/lib/elm_view_list.eo rename to src/lib/elementary/elm_view_list.eo diff --git a/legacy/elementary/src/lib/elm_view_list.h b/src/lib/elementary/elm_view_list.h similarity index 100% rename from legacy/elementary/src/lib/elm_view_list.h rename to src/lib/elementary/elm_view_list.h diff --git a/legacy/elementary/src/lib/elm_web.eo b/src/lib/elementary/elm_web.eo similarity index 100% rename from legacy/elementary/src/lib/elm_web.eo rename to src/lib/elementary/elm_web.eo diff --git a/legacy/elementary/src/lib/elm_web.h b/src/lib/elementary/elm_web.h similarity index 100% rename from legacy/elementary/src/lib/elm_web.h rename to src/lib/elementary/elm_web.h diff --git a/legacy/elementary/src/lib/elm_web2.c b/src/lib/elementary/elm_web2.c similarity index 100% rename from legacy/elementary/src/lib/elm_web2.c rename to src/lib/elementary/elm_web2.c diff --git a/legacy/elementary/src/lib/elm_web_common.h b/src/lib/elementary/elm_web_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_web_common.h rename to src/lib/elementary/elm_web_common.h diff --git a/legacy/elementary/src/lib/elm_web_eo.h b/src/lib/elementary/elm_web_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_web_eo.h rename to src/lib/elementary/elm_web_eo.h diff --git a/legacy/elementary/src/lib/elm_web_legacy.h b/src/lib/elementary/elm_web_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_web_legacy.h rename to src/lib/elementary/elm_web_legacy.h diff --git a/legacy/elementary/src/lib/elm_widget.c b/src/lib/elementary/elm_widget.c similarity index 100% rename from legacy/elementary/src/lib/elm_widget.c rename to src/lib/elementary/elm_widget.c diff --git a/legacy/elementary/src/lib/elm_widget.eo b/src/lib/elementary/elm_widget.eo similarity index 100% rename from legacy/elementary/src/lib/elm_widget.eo rename to src/lib/elementary/elm_widget.eo diff --git a/legacy/elementary/src/lib/elm_widget.h b/src/lib/elementary/elm_widget.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget.h rename to src/lib/elementary/elm_widget.h diff --git a/legacy/elementary/src/lib/elm_widget_actionslider.h b/src/lib/elementary/elm_widget_actionslider.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_actionslider.h rename to src/lib/elementary/elm_widget_actionslider.h diff --git a/legacy/elementary/src/lib/elm_widget_bg.h b/src/lib/elementary/elm_widget_bg.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_bg.h rename to src/lib/elementary/elm_widget_bg.h diff --git a/legacy/elementary/src/lib/elm_widget_box.h b/src/lib/elementary/elm_widget_box.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_box.h rename to src/lib/elementary/elm_widget_box.h diff --git a/legacy/elementary/src/lib/elm_widget_bubble.h b/src/lib/elementary/elm_widget_bubble.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_bubble.h rename to src/lib/elementary/elm_widget_bubble.h diff --git a/legacy/elementary/src/lib/elm_widget_button.h b/src/lib/elementary/elm_widget_button.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_button.h rename to src/lib/elementary/elm_widget_button.h diff --git a/legacy/elementary/src/lib/elm_widget_calendar.h b/src/lib/elementary/elm_widget_calendar.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_calendar.h rename to src/lib/elementary/elm_widget_calendar.h diff --git a/legacy/elementary/src/lib/elm_widget_check.h b/src/lib/elementary/elm_widget_check.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_check.h rename to src/lib/elementary/elm_widget_check.h diff --git a/legacy/elementary/src/lib/elm_widget_clipper.h b/src/lib/elementary/elm_widget_clipper.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_clipper.h rename to src/lib/elementary/elm_widget_clipper.h diff --git a/legacy/elementary/src/lib/elm_widget_clock.h b/src/lib/elementary/elm_widget_clock.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_clock.h rename to src/lib/elementary/elm_widget_clock.h diff --git a/legacy/elementary/src/lib/elm_widget_colorselector.h b/src/lib/elementary/elm_widget_colorselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_colorselector.h rename to src/lib/elementary/elm_widget_colorselector.h diff --git a/legacy/elementary/src/lib/elm_widget_combobox.h b/src/lib/elementary/elm_widget_combobox.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_combobox.h rename to src/lib/elementary/elm_widget_combobox.h diff --git a/legacy/elementary/src/lib/elm_widget_conform.h b/src/lib/elementary/elm_widget_conform.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_conform.h rename to src/lib/elementary/elm_widget_conform.h diff --git a/legacy/elementary/src/lib/elm_widget_container.h b/src/lib/elementary/elm_widget_container.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_container.h rename to src/lib/elementary/elm_widget_container.h diff --git a/legacy/elementary/src/lib/elm_widget_ctxpopup.h b/src/lib/elementary/elm_widget_ctxpopup.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_ctxpopup.h rename to src/lib/elementary/elm_widget_ctxpopup.h diff --git a/legacy/elementary/src/lib/elm_widget_datetime.h b/src/lib/elementary/elm_widget_datetime.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_datetime.h rename to src/lib/elementary/elm_widget_datetime.h diff --git a/legacy/elementary/src/lib/elm_widget_dayselector.h b/src/lib/elementary/elm_widget_dayselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_dayselector.h rename to src/lib/elementary/elm_widget_dayselector.h diff --git a/legacy/elementary/src/lib/elm_widget_diskselector.h b/src/lib/elementary/elm_widget_diskselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_diskselector.h rename to src/lib/elementary/elm_widget_diskselector.h diff --git a/legacy/elementary/src/lib/elm_widget_entry.h b/src/lib/elementary/elm_widget_entry.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_entry.h rename to src/lib/elementary/elm_widget_entry.h diff --git a/legacy/elementary/src/lib/elm_widget_fileselector.h b/src/lib/elementary/elm_widget_fileselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_fileselector.h rename to src/lib/elementary/elm_widget_fileselector.h diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_button.h b/src/lib/elementary/elm_widget_fileselector_button.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_fileselector_button.h rename to src/lib/elementary/elm_widget_fileselector_button.h diff --git a/legacy/elementary/src/lib/elm_widget_fileselector_entry.h b/src/lib/elementary/elm_widget_fileselector_entry.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_fileselector_entry.h rename to src/lib/elementary/elm_widget_fileselector_entry.h diff --git a/legacy/elementary/src/lib/elm_widget_flip.h b/src/lib/elementary/elm_widget_flip.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_flip.h rename to src/lib/elementary/elm_widget_flip.h diff --git a/legacy/elementary/src/lib/elm_widget_flipselector.h b/src/lib/elementary/elm_widget_flipselector.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_flipselector.h rename to src/lib/elementary/elm_widget_flipselector.h diff --git a/legacy/elementary/src/lib/elm_widget_frame.h b/src/lib/elementary/elm_widget_frame.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_frame.h rename to src/lib/elementary/elm_widget_frame.h diff --git a/legacy/elementary/src/lib/elm_widget_gengrid.h b/src/lib/elementary/elm_widget_gengrid.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_gengrid.h rename to src/lib/elementary/elm_widget_gengrid.h diff --git a/legacy/elementary/src/lib/elm_widget_genlist.h b/src/lib/elementary/elm_widget_genlist.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_genlist.h rename to src/lib/elementary/elm_widget_genlist.h diff --git a/legacy/elementary/src/lib/elm_widget_glview.h b/src/lib/elementary/elm_widget_glview.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_glview.h rename to src/lib/elementary/elm_widget_glview.h diff --git a/legacy/elementary/src/lib/elm_widget_grid.h b/src/lib/elementary/elm_widget_grid.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_grid.h rename to src/lib/elementary/elm_widget_grid.h diff --git a/legacy/elementary/src/lib/elm_widget_hover.h b/src/lib/elementary/elm_widget_hover.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_hover.h rename to src/lib/elementary/elm_widget_hover.h diff --git a/legacy/elementary/src/lib/elm_widget_hoversel.h b/src/lib/elementary/elm_widget_hoversel.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_hoversel.h rename to src/lib/elementary/elm_widget_hoversel.h diff --git a/legacy/elementary/src/lib/elm_widget_icon.h b/src/lib/elementary/elm_widget_icon.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_icon.h rename to src/lib/elementary/elm_widget_icon.h diff --git a/legacy/elementary/src/lib/elm_widget_image.h b/src/lib/elementary/elm_widget_image.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_image.h rename to src/lib/elementary/elm_widget_image.h diff --git a/legacy/elementary/src/lib/elm_widget_index.h b/src/lib/elementary/elm_widget_index.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_index.h rename to src/lib/elementary/elm_widget_index.h diff --git a/legacy/elementary/src/lib/elm_widget_inwin.h b/src/lib/elementary/elm_widget_inwin.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_inwin.h rename to src/lib/elementary/elm_widget_inwin.h diff --git a/legacy/elementary/src/lib/elm_widget_item.eo b/src/lib/elementary/elm_widget_item.eo similarity index 100% rename from legacy/elementary/src/lib/elm_widget_item.eo rename to src/lib/elementary/elm_widget_item.eo diff --git a/legacy/elementary/src/lib/elm_widget_label.h b/src/lib/elementary/elm_widget_label.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_label.h rename to src/lib/elementary/elm_widget_label.h diff --git a/legacy/elementary/src/lib/elm_widget_layout.h b/src/lib/elementary/elm_widget_layout.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_layout.h rename to src/lib/elementary/elm_widget_layout.h diff --git a/legacy/elementary/src/lib/elm_widget_list.h b/src/lib/elementary/elm_widget_list.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_list.h rename to src/lib/elementary/elm_widget_list.h diff --git a/legacy/elementary/src/lib/elm_widget_map.h b/src/lib/elementary/elm_widget_map.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_map.h rename to src/lib/elementary/elm_widget_map.h diff --git a/legacy/elementary/src/lib/elm_widget_mapbuf.h b/src/lib/elementary/elm_widget_mapbuf.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_mapbuf.h rename to src/lib/elementary/elm_widget_mapbuf.h diff --git a/legacy/elementary/src/lib/elm_widget_menu.h b/src/lib/elementary/elm_widget_menu.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_menu.h rename to src/lib/elementary/elm_widget_menu.h diff --git a/legacy/elementary/src/lib/elm_widget_multibuttonentry.h b/src/lib/elementary/elm_widget_multibuttonentry.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_multibuttonentry.h rename to src/lib/elementary/elm_widget_multibuttonentry.h diff --git a/legacy/elementary/src/lib/elm_widget_naviframe.h b/src/lib/elementary/elm_widget_naviframe.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_naviframe.h rename to src/lib/elementary/elm_widget_naviframe.h diff --git a/legacy/elementary/src/lib/elm_widget_notify.h b/src/lib/elementary/elm_widget_notify.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_notify.h rename to src/lib/elementary/elm_widget_notify.h diff --git a/legacy/elementary/src/lib/elm_widget_panel.h b/src/lib/elementary/elm_widget_panel.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_panel.h rename to src/lib/elementary/elm_widget_panel.h diff --git a/legacy/elementary/src/lib/elm_widget_panes.h b/src/lib/elementary/elm_widget_panes.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_panes.h rename to src/lib/elementary/elm_widget_panes.h diff --git a/legacy/elementary/src/lib/elm_widget_photo.h b/src/lib/elementary/elm_widget_photo.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_photo.h rename to src/lib/elementary/elm_widget_photo.h diff --git a/legacy/elementary/src/lib/elm_widget_photocam.h b/src/lib/elementary/elm_widget_photocam.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_photocam.h rename to src/lib/elementary/elm_widget_photocam.h diff --git a/legacy/elementary/src/lib/elm_widget_player.h b/src/lib/elementary/elm_widget_player.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_player.h rename to src/lib/elementary/elm_widget_player.h diff --git a/legacy/elementary/src/lib/elm_widget_plug.h b/src/lib/elementary/elm_widget_plug.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_plug.h rename to src/lib/elementary/elm_widget_plug.h diff --git a/legacy/elementary/src/lib/elm_widget_popup.h b/src/lib/elementary/elm_widget_popup.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_popup.h rename to src/lib/elementary/elm_widget_popup.h diff --git a/legacy/elementary/src/lib/elm_widget_prefs.h b/src/lib/elementary/elm_widget_prefs.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_prefs.h rename to src/lib/elementary/elm_widget_prefs.h diff --git a/legacy/elementary/src/lib/elm_widget_progressbar.h b/src/lib/elementary/elm_widget_progressbar.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_progressbar.h rename to src/lib/elementary/elm_widget_progressbar.h diff --git a/legacy/elementary/src/lib/elm_widget_radio.h b/src/lib/elementary/elm_widget_radio.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_radio.h rename to src/lib/elementary/elm_widget_radio.h diff --git a/legacy/elementary/src/lib/elm_widget_route.h b/src/lib/elementary/elm_widget_route.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_route.h rename to src/lib/elementary/elm_widget_route.h diff --git a/legacy/elementary/src/lib/elm_widget_scroller.h b/src/lib/elementary/elm_widget_scroller.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_scroller.h rename to src/lib/elementary/elm_widget_scroller.h diff --git a/legacy/elementary/src/lib/elm_widget_segment_control.h b/src/lib/elementary/elm_widget_segment_control.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_segment_control.h rename to src/lib/elementary/elm_widget_segment_control.h diff --git a/legacy/elementary/src/lib/elm_widget_separator.h b/src/lib/elementary/elm_widget_separator.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_separator.h rename to src/lib/elementary/elm_widget_separator.h diff --git a/legacy/elementary/src/lib/elm_widget_slider.h b/src/lib/elementary/elm_widget_slider.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_slider.h rename to src/lib/elementary/elm_widget_slider.h diff --git a/legacy/elementary/src/lib/elm_widget_slideshow.h b/src/lib/elementary/elm_widget_slideshow.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_slideshow.h rename to src/lib/elementary/elm_widget_slideshow.h diff --git a/legacy/elementary/src/lib/elm_widget_spinner.h b/src/lib/elementary/elm_widget_spinner.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_spinner.h rename to src/lib/elementary/elm_widget_spinner.h diff --git a/legacy/elementary/src/lib/elm_widget_table.h b/src/lib/elementary/elm_widget_table.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_table.h rename to src/lib/elementary/elm_widget_table.h diff --git a/legacy/elementary/src/lib/elm_widget_thumb.h b/src/lib/elementary/elm_widget_thumb.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_thumb.h rename to src/lib/elementary/elm_widget_thumb.h diff --git a/legacy/elementary/src/lib/elm_widget_toolbar.h b/src/lib/elementary/elm_widget_toolbar.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_toolbar.h rename to src/lib/elementary/elm_widget_toolbar.h diff --git a/legacy/elementary/src/lib/elm_widget_video.h b/src/lib/elementary/elm_widget_video.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_video.h rename to src/lib/elementary/elm_widget_video.h diff --git a/legacy/elementary/src/lib/elm_widget_web.h b/src/lib/elementary/elm_widget_web.h similarity index 100% rename from legacy/elementary/src/lib/elm_widget_web.h rename to src/lib/elementary/elm_widget_web.h diff --git a/legacy/elementary/src/lib/elm_win.c b/src/lib/elementary/elm_win.c similarity index 100% rename from legacy/elementary/src/lib/elm_win.c rename to src/lib/elementary/elm_win.c diff --git a/legacy/elementary/src/lib/elm_win.eo b/src/lib/elementary/elm_win.eo similarity index 100% rename from legacy/elementary/src/lib/elm_win.eo rename to src/lib/elementary/elm_win.eo diff --git a/legacy/elementary/src/lib/elm_win.h b/src/lib/elementary/elm_win.h similarity index 100% rename from legacy/elementary/src/lib/elm_win.h rename to src/lib/elementary/elm_win.h diff --git a/legacy/elementary/src/lib/elm_win_common.h b/src/lib/elementary/elm_win_common.h similarity index 100% rename from legacy/elementary/src/lib/elm_win_common.h rename to src/lib/elementary/elm_win_common.h diff --git a/legacy/elementary/src/lib/elm_win_eo.h b/src/lib/elementary/elm_win_eo.h similarity index 100% rename from legacy/elementary/src/lib/elm_win_eo.h rename to src/lib/elementary/elm_win_eo.h diff --git a/legacy/elementary/src/lib/elm_win_legacy.h b/src/lib/elementary/elm_win_legacy.h similarity index 100% rename from legacy/elementary/src/lib/elm_win_legacy.h rename to src/lib/elementary/elm_win_legacy.h diff --git a/legacy/elementary/src/lib/elm_win_standard.c b/src/lib/elementary/elm_win_standard.c similarity index 100% rename from legacy/elementary/src/lib/elm_win_standard.c rename to src/lib/elementary/elm_win_standard.c diff --git a/legacy/elementary/src/lib/elm_win_standard.eo b/src/lib/elementary/elm_win_standard.eo similarity index 100% rename from legacy/elementary/src/lib/elm_win_standard.eo rename to src/lib/elementary/elm_win_standard.eo diff --git a/legacy/elementary/src/lib/elm_win_standard.h b/src/lib/elementary/elm_win_standard.h similarity index 100% rename from legacy/elementary/src/lib/elm_win_standard.h rename to src/lib/elementary/elm_win_standard.h diff --git a/legacy/elementary/src/lib/els_box.c b/src/lib/elementary/els_box.c similarity index 100% rename from legacy/elementary/src/lib/els_box.c rename to src/lib/elementary/els_box.c diff --git a/legacy/elementary/src/lib/els_box.h b/src/lib/elementary/els_box.h similarity index 100% rename from legacy/elementary/src/lib/els_box.h rename to src/lib/elementary/els_box.h diff --git a/legacy/elementary/src/lib/els_cursor.c b/src/lib/elementary/els_cursor.c similarity index 100% rename from legacy/elementary/src/lib/els_cursor.c rename to src/lib/elementary/els_cursor.c diff --git a/legacy/elementary/src/lib/els_tooltip.c b/src/lib/elementary/els_tooltip.c similarity index 100% rename from legacy/elementary/src/lib/els_tooltip.c rename to src/lib/elementary/els_tooltip.c diff --git a/legacy/elementary/src/lib/elu_ews_wm.c b/src/lib/elementary/elu_ews_wm.c similarity index 100% rename from legacy/elementary/src/lib/elu_ews_wm.c rename to src/lib/elementary/elu_ews_wm.c diff --git a/legacy/elementary/src/modules/Makefile.am b/src/modules/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/Makefile.am rename to src/modules/elementary/Makefile.am diff --git a/legacy/elementary/src/modules/access_output/Makefile.am b/src/modules/elementary/access_output/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/access_output/Makefile.am rename to src/modules/elementary/access_output/Makefile.am diff --git a/legacy/elementary/src/modules/access_output/mod.c b/src/modules/elementary/access_output/mod.c similarity index 100% rename from legacy/elementary/src/modules/access_output/mod.c rename to src/modules/elementary/access_output/mod.c diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/elementary/datetime_input_ctxpopup/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am rename to src/modules/elementary/datetime_input_ctxpopup/Makefile.am diff --git a/legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c b/src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c similarity index 100% rename from legacy/elementary/src/modules/datetime_input_ctxpopup/datetime_input_ctxpopup.c rename to src/modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c diff --git a/legacy/elementary/src/modules/prefs/Makefile.am b/src/modules/elementary/prefs/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/prefs/Makefile.am rename to src/modules/elementary/prefs/Makefile.am diff --git a/legacy/elementary/src/modules/prefs/elm_button.c b/src/modules/elementary/prefs/elm_button.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_button.c rename to src/modules/elementary/prefs/elm_button.c diff --git a/legacy/elementary/src/modules/prefs/elm_check.c b/src/modules/elementary/prefs/elm_check.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_check.c rename to src/modules/elementary/prefs/elm_check.c diff --git a/legacy/elementary/src/modules/prefs/elm_datetime.c b/src/modules/elementary/prefs/elm_datetime.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_datetime.c rename to src/modules/elementary/prefs/elm_datetime.c diff --git a/legacy/elementary/src/modules/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_entry.c rename to src/modules/elementary/prefs/elm_entry.c diff --git a/legacy/elementary/src/modules/prefs/elm_horizontal_box.c b/src/modules/elementary/prefs/elm_horizontal_box.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_horizontal_box.c rename to src/modules/elementary/prefs/elm_horizontal_box.c diff --git a/legacy/elementary/src/modules/prefs/elm_horizontal_frame.c b/src/modules/elementary/prefs/elm_horizontal_frame.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_horizontal_frame.c rename to src/modules/elementary/prefs/elm_horizontal_frame.c diff --git a/legacy/elementary/src/modules/prefs/elm_label.c b/src/modules/elementary/prefs/elm_label.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_label.c rename to src/modules/elementary/prefs/elm_label.c diff --git a/legacy/elementary/src/modules/prefs/elm_prefs_swallow.edc b/src/modules/elementary/prefs/elm_prefs_swallow.edc similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_prefs_swallow.edc rename to src/modules/elementary/prefs/elm_prefs_swallow.edc diff --git a/legacy/elementary/src/modules/prefs/elm_separator.c b/src/modules/elementary/prefs/elm_separator.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_separator.c rename to src/modules/elementary/prefs/elm_separator.c diff --git a/legacy/elementary/src/modules/prefs/elm_slider.c b/src/modules/elementary/prefs/elm_slider.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_slider.c rename to src/modules/elementary/prefs/elm_slider.c diff --git a/legacy/elementary/src/modules/prefs/elm_spinner.c b/src/modules/elementary/prefs/elm_spinner.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_spinner.c rename to src/modules/elementary/prefs/elm_spinner.c diff --git a/legacy/elementary/src/modules/prefs/elm_swallow.c b/src/modules/elementary/prefs/elm_swallow.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_swallow.c rename to src/modules/elementary/prefs/elm_swallow.c diff --git a/legacy/elementary/src/modules/prefs/elm_vertical_box.c b/src/modules/elementary/prefs/elm_vertical_box.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_vertical_box.c rename to src/modules/elementary/prefs/elm_vertical_box.c diff --git a/legacy/elementary/src/modules/prefs/elm_vertical_frame.c b/src/modules/elementary/prefs/elm_vertical_frame.c similarity index 100% rename from legacy/elementary/src/modules/prefs/elm_vertical_frame.c rename to src/modules/elementary/prefs/elm_vertical_frame.c diff --git a/legacy/elementary/src/modules/prefs/item_widgets.inc b/src/modules/elementary/prefs/item_widgets.inc similarity index 100% rename from legacy/elementary/src/modules/prefs/item_widgets.inc rename to src/modules/elementary/prefs/item_widgets.inc diff --git a/legacy/elementary/src/modules/prefs/page_widgets.inc b/src/modules/elementary/prefs/page_widgets.inc similarity index 100% rename from legacy/elementary/src/modules/prefs/page_widgets.inc rename to src/modules/elementary/prefs/page_widgets.inc diff --git a/legacy/elementary/src/modules/prefs/prefs_iface.c b/src/modules/elementary/prefs/prefs_iface.c similarity index 100% rename from legacy/elementary/src/modules/prefs/prefs_iface.c rename to src/modules/elementary/prefs/prefs_iface.c diff --git a/legacy/elementary/src/modules/prefs/private.h b/src/modules/elementary/prefs/private.h similarity index 100% rename from legacy/elementary/src/modules/prefs/private.h rename to src/modules/elementary/prefs/private.h diff --git a/legacy/elementary/src/modules/test_entry/Makefile.am b/src/modules/elementary/test_entry/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/test_entry/Makefile.am rename to src/modules/elementary/test_entry/Makefile.am diff --git a/legacy/elementary/src/modules/test_entry/mod.c b/src/modules/elementary/test_entry/mod.c similarity index 100% rename from legacy/elementary/src/modules/test_entry/mod.c rename to src/modules/elementary/test_entry/mod.c diff --git a/legacy/elementary/src/modules/test_map/Makefile.am b/src/modules/elementary/test_map/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/test_map/Makefile.am rename to src/modules/elementary/test_map/Makefile.am diff --git a/legacy/elementary/src/modules/test_map/mod.c b/src/modules/elementary/test_map/mod.c similarity index 100% rename from legacy/elementary/src/modules/test_map/mod.c rename to src/modules/elementary/test_map/mod.c diff --git a/legacy/elementary/src/modules/web/Makefile.am b/src/modules/elementary/web/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/web/Makefile.am rename to src/modules/elementary/web/Makefile.am diff --git a/legacy/elementary/src/modules/web/none/.gitignore b/src/modules/elementary/web/none/.gitignore similarity index 100% rename from legacy/elementary/src/modules/web/none/.gitignore rename to src/modules/elementary/web/none/.gitignore diff --git a/legacy/elementary/src/modules/web/none/Makefile.am b/src/modules/elementary/web/none/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/web/none/Makefile.am rename to src/modules/elementary/web/none/Makefile.am diff --git a/legacy/elementary/src/modules/web/none/elm_web_none.c b/src/modules/elementary/web/none/elm_web_none.c similarity index 100% rename from legacy/elementary/src/modules/web/none/elm_web_none.c rename to src/modules/elementary/web/none/elm_web_none.c diff --git a/legacy/elementary/src/modules/web/none/elm_web_none.eo b/src/modules/elementary/web/none/elm_web_none.eo similarity index 100% rename from legacy/elementary/src/modules/web/none/elm_web_none.eo rename to src/modules/elementary/web/none/elm_web_none.eo diff --git a/legacy/elementary/src/modules/web/webkit2/.gitignore b/src/modules/elementary/web/webkit2/.gitignore similarity index 100% rename from legacy/elementary/src/modules/web/webkit2/.gitignore rename to src/modules/elementary/web/webkit2/.gitignore diff --git a/legacy/elementary/src/modules/web/webkit2/Makefile.am b/src/modules/elementary/web/webkit2/Makefile.am similarity index 100% rename from legacy/elementary/src/modules/web/webkit2/Makefile.am rename to src/modules/elementary/web/webkit2/Makefile.am diff --git a/legacy/elementary/src/modules/web/webkit2/elm_web_webkit2.c b/src/modules/elementary/web/webkit2/elm_web_webkit2.c similarity index 100% rename from legacy/elementary/src/modules/web/webkit2/elm_web_webkit2.c rename to src/modules/elementary/web/webkit2/elm_web_webkit2.c diff --git a/legacy/elementary/src/modules/web/webkit2/elm_web_webkit2.eo b/src/modules/elementary/web/webkit2/elm_web_webkit2.eo similarity index 100% rename from legacy/elementary/src/modules/web/webkit2/elm_web_webkit2.eo rename to src/modules/elementary/web/webkit2/elm_web_webkit2.eo diff --git a/legacy/elementary/src/imported/atspi/Makefile.am b/src/static_libs/atspi/Makefile.am similarity index 100% rename from legacy/elementary/src/imported/atspi/Makefile.am rename to src/static_libs/atspi/Makefile.am diff --git a/legacy/elementary/src/imported/atspi/atspi-constants.h b/src/static_libs/atspi/atspi-constants.h similarity index 100% rename from legacy/elementary/src/imported/atspi/atspi-constants.h rename to src/static_libs/atspi/atspi-constants.h diff --git a/legacy/elementary/src/tests/.gitignore b/src/tests/elementary/.gitignore similarity index 100% rename from legacy/elementary/src/tests/.gitignore rename to src/tests/elementary/.gitignore diff --git a/legacy/elementary/src/tests/Makefile.am b/src/tests/elementary/Makefile.am similarity index 100% rename from legacy/elementary/src/tests/Makefile.am rename to src/tests/elementary/Makefile.am diff --git a/legacy/elementary/src/tests/elm_cxx_suite.cc b/src/tests/elementary/elm_cxx_suite.cc similarity index 100% rename from legacy/elementary/src/tests/elm_cxx_suite.cc rename to src/tests/elementary/elm_cxx_suite.cc diff --git a/legacy/elementary/src/tests/elm_suite.c b/src/tests/elementary/elm_suite.c similarity index 100% rename from legacy/elementary/src/tests/elm_suite.c rename to src/tests/elementary/elm_suite.c diff --git a/legacy/elementary/src/tests/elm_suite.h b/src/tests/elementary/elm_suite.h similarity index 100% rename from legacy/elementary/src/tests/elm_suite.h rename to src/tests/elementary/elm_suite.h diff --git a/legacy/elementary/src/tests/elm_test_actionslider.c b/src/tests/elementary/elm_test_actionslider.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_actionslider.c rename to src/tests/elementary/elm_test_actionslider.c diff --git a/legacy/elementary/src/tests/elm_test_atspi.c b/src/tests/elementary/elm_test_atspi.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_atspi.c rename to src/tests/elementary/elm_test_atspi.c diff --git a/legacy/elementary/src/tests/elm_test_bg.c b/src/tests/elementary/elm_test_bg.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_bg.c rename to src/tests/elementary/elm_test_bg.c diff --git a/legacy/elementary/src/tests/elm_test_box.c b/src/tests/elementary/elm_test_box.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_box.c rename to src/tests/elementary/elm_test_box.c diff --git a/legacy/elementary/src/tests/elm_test_bubble.c b/src/tests/elementary/elm_test_bubble.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_bubble.c rename to src/tests/elementary/elm_test_bubble.c diff --git a/legacy/elementary/src/tests/elm_test_button.c b/src/tests/elementary/elm_test_button.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_button.c rename to src/tests/elementary/elm_test_button.c diff --git a/legacy/elementary/src/tests/elm_test_calendar.c b/src/tests/elementary/elm_test_calendar.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_calendar.c rename to src/tests/elementary/elm_test_calendar.c diff --git a/legacy/elementary/src/tests/elm_test_check.c b/src/tests/elementary/elm_test_check.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_check.c rename to src/tests/elementary/elm_test_check.c diff --git a/legacy/elementary/src/tests/elm_test_clock.c b/src/tests/elementary/elm_test_clock.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_clock.c rename to src/tests/elementary/elm_test_clock.c diff --git a/legacy/elementary/src/tests/elm_test_colorselector.c b/src/tests/elementary/elm_test_colorselector.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_colorselector.c rename to src/tests/elementary/elm_test_colorselector.c diff --git a/legacy/elementary/src/tests/elm_test_conformant.c b/src/tests/elementary/elm_test_conformant.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_conformant.c rename to src/tests/elementary/elm_test_conformant.c diff --git a/legacy/elementary/src/tests/elm_test_ctxpopup.c b/src/tests/elementary/elm_test_ctxpopup.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_ctxpopup.c rename to src/tests/elementary/elm_test_ctxpopup.c diff --git a/legacy/elementary/src/tests/elm_test_datetime.c b/src/tests/elementary/elm_test_datetime.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_datetime.c rename to src/tests/elementary/elm_test_datetime.c diff --git a/legacy/elementary/src/tests/elm_test_dayselector.c b/src/tests/elementary/elm_test_dayselector.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_dayselector.c rename to src/tests/elementary/elm_test_dayselector.c diff --git a/legacy/elementary/src/tests/elm_test_diskselector.c b/src/tests/elementary/elm_test_diskselector.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_diskselector.c rename to src/tests/elementary/elm_test_diskselector.c diff --git a/legacy/elementary/src/tests/elm_test_entry.c b/src/tests/elementary/elm_test_entry.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_entry.c rename to src/tests/elementary/elm_test_entry.c diff --git a/legacy/elementary/src/tests/elm_test_fileselector.c b/src/tests/elementary/elm_test_fileselector.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_fileselector.c rename to src/tests/elementary/elm_test_fileselector.c diff --git a/legacy/elementary/src/tests/elm_test_fileselector_button.c b/src/tests/elementary/elm_test_fileselector_button.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_fileselector_button.c rename to src/tests/elementary/elm_test_fileselector_button.c diff --git a/legacy/elementary/src/tests/elm_test_fileselector_entry.c b/src/tests/elementary/elm_test_fileselector_entry.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_fileselector_entry.c rename to src/tests/elementary/elm_test_fileselector_entry.c diff --git a/legacy/elementary/src/tests/elm_test_flip.c b/src/tests/elementary/elm_test_flip.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_flip.c rename to src/tests/elementary/elm_test_flip.c diff --git a/legacy/elementary/src/tests/elm_test_flipselector.c b/src/tests/elementary/elm_test_flipselector.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_flipselector.c rename to src/tests/elementary/elm_test_flipselector.c diff --git a/legacy/elementary/src/tests/elm_test_frame.c b/src/tests/elementary/elm_test_frame.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_frame.c rename to src/tests/elementary/elm_test_frame.c diff --git a/legacy/elementary/src/tests/elm_test_gengrid.c b/src/tests/elementary/elm_test_gengrid.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_gengrid.c rename to src/tests/elementary/elm_test_gengrid.c diff --git a/legacy/elementary/src/tests/elm_test_genlist.c b/src/tests/elementary/elm_test_genlist.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_genlist.c rename to src/tests/elementary/elm_test_genlist.c diff --git a/legacy/elementary/src/tests/elm_test_glview.c b/src/tests/elementary/elm_test_glview.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_glview.c rename to src/tests/elementary/elm_test_glview.c diff --git a/legacy/elementary/src/tests/elm_test_grid.c b/src/tests/elementary/elm_test_grid.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_grid.c rename to src/tests/elementary/elm_test_grid.c diff --git a/legacy/elementary/src/tests/elm_test_helper.c b/src/tests/elementary/elm_test_helper.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_helper.c rename to src/tests/elementary/elm_test_helper.c diff --git a/legacy/elementary/src/tests/elm_test_helper.h b/src/tests/elementary/elm_test_helper.h similarity index 100% rename from legacy/elementary/src/tests/elm_test_helper.h rename to src/tests/elementary/elm_test_helper.h diff --git a/legacy/elementary/src/tests/elm_test_hover.c b/src/tests/elementary/elm_test_hover.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_hover.c rename to src/tests/elementary/elm_test_hover.c diff --git a/legacy/elementary/src/tests/elm_test_hoversel.c b/src/tests/elementary/elm_test_hoversel.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_hoversel.c rename to src/tests/elementary/elm_test_hoversel.c diff --git a/legacy/elementary/src/tests/elm_test_icon.c b/src/tests/elementary/elm_test_icon.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_icon.c rename to src/tests/elementary/elm_test_icon.c diff --git a/legacy/elementary/src/tests/elm_test_image.c b/src/tests/elementary/elm_test_image.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_image.c rename to src/tests/elementary/elm_test_image.c diff --git a/legacy/elementary/src/tests/elm_test_index.c b/src/tests/elementary/elm_test_index.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_index.c rename to src/tests/elementary/elm_test_index.c diff --git a/legacy/elementary/src/tests/elm_test_init.c b/src/tests/elementary/elm_test_init.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_init.c rename to src/tests/elementary/elm_test_init.c diff --git a/legacy/elementary/src/tests/elm_test_inwin.c b/src/tests/elementary/elm_test_inwin.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_inwin.c rename to src/tests/elementary/elm_test_inwin.c diff --git a/legacy/elementary/src/tests/elm_test_label.c b/src/tests/elementary/elm_test_label.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_label.c rename to src/tests/elementary/elm_test_label.c diff --git a/legacy/elementary/src/tests/elm_test_layout.c b/src/tests/elementary/elm_test_layout.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_layout.c rename to src/tests/elementary/elm_test_layout.c diff --git a/legacy/elementary/src/tests/elm_test_list.c b/src/tests/elementary/elm_test_list.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_list.c rename to src/tests/elementary/elm_test_list.c diff --git a/legacy/elementary/src/tests/elm_test_map.c b/src/tests/elementary/elm_test_map.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_map.c rename to src/tests/elementary/elm_test_map.c diff --git a/legacy/elementary/src/tests/elm_test_mapbuf.c b/src/tests/elementary/elm_test_mapbuf.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_mapbuf.c rename to src/tests/elementary/elm_test_mapbuf.c diff --git a/legacy/elementary/src/tests/elm_test_menu.c b/src/tests/elementary/elm_test_menu.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_menu.c rename to src/tests/elementary/elm_test_menu.c diff --git a/legacy/elementary/src/tests/elm_test_multibuttonentry.c b/src/tests/elementary/elm_test_multibuttonentry.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_multibuttonentry.c rename to src/tests/elementary/elm_test_multibuttonentry.c diff --git a/legacy/elementary/src/tests/elm_test_naviframe.c b/src/tests/elementary/elm_test_naviframe.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_naviframe.c rename to src/tests/elementary/elm_test_naviframe.c diff --git a/legacy/elementary/src/tests/elm_test_notify.c b/src/tests/elementary/elm_test_notify.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_notify.c rename to src/tests/elementary/elm_test_notify.c diff --git a/legacy/elementary/src/tests/elm_test_panel.c b/src/tests/elementary/elm_test_panel.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_panel.c rename to src/tests/elementary/elm_test_panel.c diff --git a/legacy/elementary/src/tests/elm_test_panes.c b/src/tests/elementary/elm_test_panes.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_panes.c rename to src/tests/elementary/elm_test_panes.c diff --git a/legacy/elementary/src/tests/elm_test_photo.c b/src/tests/elementary/elm_test_photo.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_photo.c rename to src/tests/elementary/elm_test_photo.c diff --git a/legacy/elementary/src/tests/elm_test_photocam.c b/src/tests/elementary/elm_test_photocam.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_photocam.c rename to src/tests/elementary/elm_test_photocam.c diff --git a/legacy/elementary/src/tests/elm_test_player.c b/src/tests/elementary/elm_test_player.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_player.c rename to src/tests/elementary/elm_test_player.c diff --git a/legacy/elementary/src/tests/elm_test_plug.c b/src/tests/elementary/elm_test_plug.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_plug.c rename to src/tests/elementary/elm_test_plug.c diff --git a/legacy/elementary/src/tests/elm_test_popup.c b/src/tests/elementary/elm_test_popup.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_popup.c rename to src/tests/elementary/elm_test_popup.c diff --git a/legacy/elementary/src/tests/elm_test_prefs.c b/src/tests/elementary/elm_test_prefs.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_prefs.c rename to src/tests/elementary/elm_test_prefs.c diff --git a/legacy/elementary/src/tests/elm_test_progressbar.c b/src/tests/elementary/elm_test_progressbar.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_progressbar.c rename to src/tests/elementary/elm_test_progressbar.c diff --git a/legacy/elementary/src/tests/elm_test_radio.c b/src/tests/elementary/elm_test_radio.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_radio.c rename to src/tests/elementary/elm_test_radio.c diff --git a/legacy/elementary/src/tests/elm_test_scroller.c b/src/tests/elementary/elm_test_scroller.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_scroller.c rename to src/tests/elementary/elm_test_scroller.c diff --git a/legacy/elementary/src/tests/elm_test_segmentcontrol.c b/src/tests/elementary/elm_test_segmentcontrol.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_segmentcontrol.c rename to src/tests/elementary/elm_test_segmentcontrol.c diff --git a/legacy/elementary/src/tests/elm_test_separator.c b/src/tests/elementary/elm_test_separator.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_separator.c rename to src/tests/elementary/elm_test_separator.c diff --git a/legacy/elementary/src/tests/elm_test_slider.c b/src/tests/elementary/elm_test_slider.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_slider.c rename to src/tests/elementary/elm_test_slider.c diff --git a/legacy/elementary/src/tests/elm_test_slideshow.c b/src/tests/elementary/elm_test_slideshow.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_slideshow.c rename to src/tests/elementary/elm_test_slideshow.c diff --git a/legacy/elementary/src/tests/elm_test_spinner.c b/src/tests/elementary/elm_test_spinner.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_spinner.c rename to src/tests/elementary/elm_test_spinner.c diff --git a/legacy/elementary/src/tests/elm_test_table.c b/src/tests/elementary/elm_test_table.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_table.c rename to src/tests/elementary/elm_test_table.c diff --git a/legacy/elementary/src/tests/elm_test_thumb.c b/src/tests/elementary/elm_test_thumb.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_thumb.c rename to src/tests/elementary/elm_test_thumb.c diff --git a/legacy/elementary/src/tests/elm_test_toolbar.c b/src/tests/elementary/elm_test_toolbar.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_toolbar.c rename to src/tests/elementary/elm_test_toolbar.c diff --git a/legacy/elementary/src/tests/elm_test_video.c b/src/tests/elementary/elm_test_video.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_video.c rename to src/tests/elementary/elm_test_video.c diff --git a/legacy/elementary/src/tests/elm_test_web.c b/src/tests/elementary/elm_test_web.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_web.c rename to src/tests/elementary/elm_test_web.c diff --git a/legacy/elementary/src/tests/elm_test_win.c b/src/tests/elementary/elm_test_win.c similarity index 100% rename from legacy/elementary/src/tests/elm_test_win.c rename to src/tests/elementary/elm_test_win.c