diff --git a/src/ui/core/package.devc.xml b/src/ui/core/package.devc.xml
index eb68114d2..bd40db3f2 100644
--- a/src/ui/core/package.devc.xml
+++ b/src/ui/core/package.devc.xml
@@ -3,7 +3,7 @@
- abapGit - UI core
+ abapGit - UI Core
diff --git a/src/ui/zcl_abapgit_html_viewer_gui.clas.abap b/src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_viewer_gui.clas.abap
rename to src/ui/core/zcl_abapgit_html_viewer_gui.clas.abap
diff --git a/src/ui/zcl_abapgit_html_viewer_gui.clas.xml b/src/ui/core/zcl_abapgit_html_viewer_gui.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_html_viewer_gui.clas.xml
rename to src/ui/core/zcl_abapgit_html_viewer_gui.clas.xml
diff --git a/src/ui/zif_abapgit_html_viewer.intf.abap b/src/ui/core/zif_abapgit_html_viewer.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_html_viewer.intf.abap
rename to src/ui/core/zif_abapgit_html_viewer.intf.abap
diff --git a/src/ui/zif_abapgit_html_viewer.intf.xml b/src/ui/core/zif_abapgit_html_viewer.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_html_viewer.intf.xml
rename to src/ui/core/zif_abapgit_html_viewer.intf.xml
diff --git a/src/ui/lib/package.devc.xml b/src/ui/lib/package.devc.xml
new file mode 100644
index 000000000..49965647d
--- /dev/null
+++ b/src/ui/lib/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - UI Common Library
+
+
+
+
diff --git a/src/ui/zcl_abapgit_exception_viewer.clas.abap b/src/ui/lib/zcl_abapgit_exception_viewer.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_exception_viewer.clas.abap
rename to src/ui/lib/zcl_abapgit_exception_viewer.clas.abap
diff --git a/src/ui/zcl_abapgit_exception_viewer.clas.xml b/src/ui/lib/zcl_abapgit_exception_viewer.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_exception_viewer.clas.xml
rename to src/ui/lib/zcl_abapgit_exception_viewer.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_buttons.clas.abap b/src/ui/lib/zcl_abapgit_gui_buttons.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_buttons.clas.abap
rename to src/ui/lib/zcl_abapgit_gui_buttons.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_buttons.clas.xml b/src/ui/lib/zcl_abapgit_gui_buttons.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_buttons.clas.xml
rename to src/ui/lib/zcl_abapgit_gui_buttons.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.abap b/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_chunk_lib.clas.abap
rename to src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.testclasses.abap b/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_chunk_lib.clas.testclasses.abap
rename to src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_gui_chunk_lib.clas.xml b/src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_chunk_lib.clas.xml
rename to src/ui/lib/zcl_abapgit_gui_chunk_lib.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_component.clas.abap b/src/ui/lib/zcl_abapgit_gui_component.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_component.clas.abap
rename to src/ui/lib/zcl_abapgit_gui_component.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_component.clas.xml b/src/ui/lib/zcl_abapgit_gui_component.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_component.clas.xml
rename to src/ui/lib/zcl_abapgit_gui_component.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap b/src/ui/lib/zcl_abapgit_gui_hotkey_ctl.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_hotkey_ctl.clas.abap
rename to src/ui/lib/zcl_abapgit_gui_hotkey_ctl.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_hotkey_ctl.clas.xml b/src/ui/lib/zcl_abapgit_gui_hotkey_ctl.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_hotkey_ctl.clas.xml
rename to src/ui/lib/zcl_abapgit_gui_hotkey_ctl.clas.xml
diff --git a/src/ui/zcl_abapgit_html_action_utils.clas.abap b/src/ui/lib/zcl_abapgit_html_action_utils.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_action_utils.clas.abap
rename to src/ui/lib/zcl_abapgit_html_action_utils.clas.abap
diff --git a/src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap b/src/ui/lib/zcl_abapgit_html_action_utils.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_action_utils.clas.testclasses.abap
rename to src/ui/lib/zcl_abapgit_html_action_utils.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_html_action_utils.clas.xml b/src/ui/lib/zcl_abapgit_html_action_utils.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_html_action_utils.clas.xml
rename to src/ui/lib/zcl_abapgit_html_action_utils.clas.xml
diff --git a/src/ui/zcl_abapgit_html_form.clas.abap b/src/ui/lib/zcl_abapgit_html_form.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_form.clas.abap
rename to src/ui/lib/zcl_abapgit_html_form.clas.abap
diff --git a/src/ui/zcl_abapgit_html_form.clas.xml b/src/ui/lib/zcl_abapgit_html_form.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_html_form.clas.xml
rename to src/ui/lib/zcl_abapgit_html_form.clas.xml
diff --git a/src/ui/zcl_abapgit_html_form_utils.clas.abap b/src/ui/lib/zcl_abapgit_html_form_utils.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_form_utils.clas.abap
rename to src/ui/lib/zcl_abapgit_html_form_utils.clas.abap
diff --git a/src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap b/src/ui/lib/zcl_abapgit_html_form_utils.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_form_utils.clas.testclasses.abap
rename to src/ui/lib/zcl_abapgit_html_form_utils.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_html_form_utils.clas.xml b/src/ui/lib/zcl_abapgit_html_form_utils.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_html_form_utils.clas.xml
rename to src/ui/lib/zcl_abapgit_html_form_utils.clas.xml
diff --git a/src/ui/zcl_abapgit_html_toolbar.clas.abap b/src/ui/lib/zcl_abapgit_html_toolbar.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_html_toolbar.clas.abap
rename to src/ui/lib/zcl_abapgit_html_toolbar.clas.abap
diff --git a/src/ui/zcl_abapgit_html_toolbar.clas.xml b/src/ui/lib/zcl_abapgit_html_toolbar.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_html_toolbar.clas.xml
rename to src/ui/lib/zcl_abapgit_html_toolbar.clas.xml
diff --git a/src/ui/zcl_abapgit_log_viewer.clas.abap b/src/ui/lib/zcl_abapgit_log_viewer.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_log_viewer.clas.abap
rename to src/ui/lib/zcl_abapgit_log_viewer.clas.abap
diff --git a/src/ui/zcl_abapgit_log_viewer.clas.xml b/src/ui/lib/zcl_abapgit_log_viewer.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_log_viewer.clas.xml
rename to src/ui/lib/zcl_abapgit_log_viewer.clas.xml
diff --git a/src/ui/zif_abapgit_gui_menu_provider.intf.abap b/src/ui/lib/zif_abapgit_gui_menu_provider.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_gui_menu_provider.intf.abap
rename to src/ui/lib/zif_abapgit_gui_menu_provider.intf.abap
diff --git a/src/ui/zif_abapgit_gui_menu_provider.intf.xml b/src/ui/lib/zif_abapgit_gui_menu_provider.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_gui_menu_provider.intf.xml
rename to src/ui/lib/zif_abapgit_gui_menu_provider.intf.xml
diff --git a/src/ui/zif_abapgit_html_form.intf.abap b/src/ui/lib/zif_abapgit_html_form.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_html_form.intf.abap
rename to src/ui/lib/zif_abapgit_html_form.intf.abap
diff --git a/src/ui/zif_abapgit_html_form.intf.xml b/src/ui/lib/zif_abapgit_html_form.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_html_form.intf.xml
rename to src/ui/lib/zif_abapgit_html_form.intf.xml
diff --git a/src/ui/db/package.devc.xml b/src/ui/pages/package.devc.xml
similarity index 87%
rename from src/ui/db/package.devc.xml
rename to src/ui/pages/package.devc.xml
index ee425a89c..f2fff701d 100644
--- a/src/ui/db/package.devc.xml
+++ b/src/ui/pages/package.devc.xml
@@ -3,7 +3,7 @@
- abapGit - UI DB
+ abapGit - UI Pages
diff --git a/src/ui/zcl_abapgit_gui_page.clas.abap b/src/ui/pages/zcl_abapgit_gui_page.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page.clas.xml b/src/ui/pages/zcl_abapgit_gui_page.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_addofflin.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_addofflin.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_addofflin.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_addofflin.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_addofflin.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_addofflin.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_addofflin.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_addofflin.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_addonline.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_addonline.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_addonline.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_addonline.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_addonline.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_addonline.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_addonline.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_addonline.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_code_insp.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_code_insp.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_code_insp.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_code_insp.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_code_insp.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_code_insp.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_code_insp.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_code_insp.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_codi_base.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_codi_base.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_codi_base.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_codi_base.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_codi_base.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_commit.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_commit.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_commit.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_commit.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_commit.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_commit.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_commit.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_data.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_data.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_data.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_data.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_data.clas.testclasses.abap b/src/ui/pages/zcl_abapgit_gui_page_data.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_data.clas.testclasses.abap
rename to src/ui/pages/zcl_abapgit_gui_page_data.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_gui_page_data.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_data.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_data.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_data.clas.xml
diff --git a/src/ui/db/zcl_abapgit_gui_page_db.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_db.clas.abap
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_db.clas.abap
diff --git a/src/ui/db/zcl_abapgit_gui_page_db.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_db.clas.xml
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_db.clas.xml
diff --git a/src/ui/db/zcl_abapgit_gui_page_db_dis.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db_dis.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.abap
diff --git a/src/ui/db/zcl_abapgit_gui_page_db_dis.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.xml
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db_dis.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_db_dis.clas.xml
diff --git a/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_db_edit.clas.abap
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db_edit.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_db_edit.clas.abap
diff --git a/src/ui/db/zcl_abapgit_gui_page_db_edit.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_db_edit.clas.xml
similarity index 100%
rename from src/ui/db/zcl_abapgit_gui_page_db_edit.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_db_edit.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_debuginfo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_debuginfo.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_debuginfo.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_debuginfo.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_debuginfo.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_diff.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_diff.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_diff.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_diff.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_diff.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_diff.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_ex_object.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_ex_object.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_ex_object.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_ex_object.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_ex_object.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_ex_object.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_ex_object.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_ex_object.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_ex_pckage.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_ex_pckage.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_ex_pckage.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_ex_pckage.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_ex_pckage.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_ex_pckage.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_ex_pckage.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_ex_pckage.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_hoc.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_hoc.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_hoc.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_hoc.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_hoc.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_hoc.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_hoc.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_hoc.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_main.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_main.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_main.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_main.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_main.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_main.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_main.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_merge.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_merge.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_merge.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_merge.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_merge.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_merge.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_merge_res.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge_res.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_merge_res.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge_res.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_merge_res.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_merge_sel.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge_sel.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_merge_sel.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_merge_sel.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_merge_sel.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_patch.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_patch.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_patch.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_patch.clas.testclasses.abap b/src/ui/pages/zcl_abapgit_gui_page_patch.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_patch.clas.testclasses.abap
rename to src/ui/pages/zcl_abapgit_gui_page_patch.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_gui_page_patch.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_patch.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_patch.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_patch.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_repo_over.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.locals_imp.abap b/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.locals_imp.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_repo_over.clas.locals_imp.abap
rename to src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.locals_imp.abap
diff --git a/src/ui/zcl_abapgit_gui_page_repo_over.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_repo_over.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_repo_over.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_repo_view.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_repo_view.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_repo_view.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_repo_view.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_repo_view.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_repo_view.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_repo_view.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_repo_view.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_run_bckg.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_run_bckg.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_run_bckg.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_run_bckg.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_run_bckg.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_run_bckg.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_run_bckg.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_run_bckg.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_runit.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_runit.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_runit.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_runit.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_runit.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_runit.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_runit.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_runit.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_bckg.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_bckg.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_bckg.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_bckg.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_bckg.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_bckg.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_bckg.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_bckg.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_glob.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_glob.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_glob.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_glob.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_info.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_info.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_info.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_info.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_info.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_locl.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_locl.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_locl.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_locl.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_locl.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_pers.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_pers.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_pers.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_pers.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_pers.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_pers.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_pers.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_remo.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_remo.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_remo.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_remo.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_sett_repo.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_repo.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_sett_repo.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_sett_repo.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_sett_repo.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_stage.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_stage.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_stage.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_stage.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_stage.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_stage.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_stage.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_syntax.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_syntax.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_syntax.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_syntax.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_syntax.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_syntax.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_syntax.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_syntax.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_tags.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_tags.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_tags.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_tags.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_tags.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_tags.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_tags.clas.xml
diff --git a/src/ui/zcl_abapgit_gui_page_tutorial.clas.abap b/src/ui/pages/zcl_abapgit_gui_page_tutorial.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_tutorial.clas.abap
rename to src/ui/pages/zcl_abapgit_gui_page_tutorial.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_page_tutorial.clas.xml b/src/ui/pages/zcl_abapgit_gui_page_tutorial.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_page_tutorial.clas.xml
rename to src/ui/pages/zcl_abapgit_gui_page_tutorial.clas.xml
diff --git a/src/ui/routing/package.devc.xml b/src/ui/routing/package.devc.xml
new file mode 100644
index 000000000..19362537e
--- /dev/null
+++ b/src/ui/routing/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - UI Routing
+
+
+
+
diff --git a/src/ui/zcl_abapgit_gui_router.clas.abap b/src/ui/routing/zcl_abapgit_gui_router.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_gui_router.clas.abap
rename to src/ui/routing/zcl_abapgit_gui_router.clas.abap
diff --git a/src/ui/zcl_abapgit_gui_router.clas.xml b/src/ui/routing/zcl_abapgit_gui_router.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_gui_router.clas.xml
rename to src/ui/routing/zcl_abapgit_gui_router.clas.xml
diff --git a/src/ui/zcl_abapgit_services_abapgit.clas.abap b/src/ui/routing/zcl_abapgit_services_abapgit.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_services_abapgit.clas.abap
rename to src/ui/routing/zcl_abapgit_services_abapgit.clas.abap
diff --git a/src/ui/zcl_abapgit_services_abapgit.clas.xml b/src/ui/routing/zcl_abapgit_services_abapgit.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_services_abapgit.clas.xml
rename to src/ui/routing/zcl_abapgit_services_abapgit.clas.xml
diff --git a/src/ui/zcl_abapgit_services_basis.clas.abap b/src/ui/routing/zcl_abapgit_services_basis.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_services_basis.clas.abap
rename to src/ui/routing/zcl_abapgit_services_basis.clas.abap
diff --git a/src/ui/zcl_abapgit_services_basis.clas.testclasses.abap b/src/ui/routing/zcl_abapgit_services_basis.clas.testclasses.abap
similarity index 100%
rename from src/ui/zcl_abapgit_services_basis.clas.testclasses.abap
rename to src/ui/routing/zcl_abapgit_services_basis.clas.testclasses.abap
diff --git a/src/ui/zcl_abapgit_services_basis.clas.xml b/src/ui/routing/zcl_abapgit_services_basis.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_services_basis.clas.xml
rename to src/ui/routing/zcl_abapgit_services_basis.clas.xml
diff --git a/src/ui/zcl_abapgit_services_git.clas.abap b/src/ui/routing/zcl_abapgit_services_git.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_services_git.clas.abap
rename to src/ui/routing/zcl_abapgit_services_git.clas.abap
diff --git a/src/ui/zcl_abapgit_services_git.clas.xml b/src/ui/routing/zcl_abapgit_services_git.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_services_git.clas.xml
rename to src/ui/routing/zcl_abapgit_services_git.clas.xml
diff --git a/src/ui/zcl_abapgit_services_repo.clas.abap b/src/ui/routing/zcl_abapgit_services_repo.clas.abap
similarity index 100%
rename from src/ui/zcl_abapgit_services_repo.clas.abap
rename to src/ui/routing/zcl_abapgit_services_repo.clas.abap
diff --git a/src/ui/zcl_abapgit_services_repo.clas.xml b/src/ui/routing/zcl_abapgit_services_repo.clas.xml
similarity index 100%
rename from src/ui/zcl_abapgit_services_repo.clas.xml
rename to src/ui/routing/zcl_abapgit_services_repo.clas.xml
diff --git a/src/ui/zif_abapgit_services_git.intf.abap b/src/ui/routing/zif_abapgit_services_git.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_services_git.intf.abap
rename to src/ui/routing/zif_abapgit_services_git.intf.abap
diff --git a/src/ui/zif_abapgit_services_git.intf.xml b/src/ui/routing/zif_abapgit_services_git.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_services_git.intf.xml
rename to src/ui/routing/zif_abapgit_services_git.intf.xml
diff --git a/src/ui/zif_abapgit_services_repo.intf.abap b/src/ui/routing/zif_abapgit_services_repo.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_services_repo.intf.abap
rename to src/ui/routing/zif_abapgit_services_repo.intf.abap
diff --git a/src/ui/zif_abapgit_services_repo.intf.xml b/src/ui/routing/zif_abapgit_services_repo.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_services_repo.intf.xml
rename to src/ui/routing/zif_abapgit_services_repo.intf.xml