diff --git a/src/exits/package.devc.xml b/src/exits/package.devc.xml
new file mode 100644
index 000000000..7699f24c2
--- /dev/null
+++ b/src/exits/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - Exits
+
+
+
+
diff --git a/src/zcl_abapgit_exit.clas.abap b/src/exits/zcl_abapgit_exit.clas.abap
similarity index 100%
rename from src/zcl_abapgit_exit.clas.abap
rename to src/exits/zcl_abapgit_exit.clas.abap
diff --git a/src/zcl_abapgit_exit.clas.xml b/src/exits/zcl_abapgit_exit.clas.xml
similarity index 100%
rename from src/zcl_abapgit_exit.clas.xml
rename to src/exits/zcl_abapgit_exit.clas.xml
diff --git a/src/zif_abapgit_exit.intf.abap b/src/exits/zif_abapgit_exit.intf.abap
similarity index 100%
rename from src/zif_abapgit_exit.intf.abap
rename to src/exits/zif_abapgit_exit.intf.abap
diff --git a/src/zif_abapgit_exit.intf.xml b/src/exits/zif_abapgit_exit.intf.xml
similarity index 100%
rename from src/zif_abapgit_exit.intf.xml
rename to src/exits/zif_abapgit_exit.intf.xml
diff --git a/src/utils/zcl_abapgit_login_manager.clas.abap b/src/http/zcl_abapgit_login_manager.clas.abap
similarity index 100%
rename from src/utils/zcl_abapgit_login_manager.clas.abap
rename to src/http/zcl_abapgit_login_manager.clas.abap
diff --git a/src/utils/zcl_abapgit_login_manager.clas.testclasses.abap b/src/http/zcl_abapgit_login_manager.clas.testclasses.abap
similarity index 100%
rename from src/utils/zcl_abapgit_login_manager.clas.testclasses.abap
rename to src/http/zcl_abapgit_login_manager.clas.testclasses.abap
diff --git a/src/utils/zcl_abapgit_login_manager.clas.xml b/src/http/zcl_abapgit_login_manager.clas.xml
similarity index 100%
rename from src/utils/zcl_abapgit_login_manager.clas.xml
rename to src/http/zcl_abapgit_login_manager.clas.xml
diff --git a/src/utils/zcl_abapgit_url.clas.abap b/src/http/zcl_abapgit_url.clas.abap
similarity index 100%
rename from src/utils/zcl_abapgit_url.clas.abap
rename to src/http/zcl_abapgit_url.clas.abap
diff --git a/src/utils/zcl_abapgit_url.clas.testclasses.abap b/src/http/zcl_abapgit_url.clas.testclasses.abap
similarity index 100%
rename from src/utils/zcl_abapgit_url.clas.testclasses.abap
rename to src/http/zcl_abapgit_url.clas.testclasses.abap
diff --git a/src/utils/zcl_abapgit_url.clas.xml b/src/http/zcl_abapgit_url.clas.xml
similarity index 100%
rename from src/utils/zcl_abapgit_url.clas.xml
rename to src/http/zcl_abapgit_url.clas.xml
diff --git a/src/inspect/package.devc.xml b/src/inspect/package.devc.xml
new file mode 100644
index 000000000..9362d94fb
--- /dev/null
+++ b/src/inspect/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - Code Inspector
+
+
+
+
diff --git a/src/zcl_abapgit_code_inspector.clas.abap b/src/inspect/zcl_abapgit_code_inspector.clas.abap
similarity index 100%
rename from src/zcl_abapgit_code_inspector.clas.abap
rename to src/inspect/zcl_abapgit_code_inspector.clas.abap
diff --git a/src/zcl_abapgit_code_inspector.clas.xml b/src/inspect/zcl_abapgit_code_inspector.clas.xml
similarity index 100%
rename from src/zcl_abapgit_code_inspector.clas.xml
rename to src/inspect/zcl_abapgit_code_inspector.clas.xml
diff --git a/src/zif_abapgit_code_inspector.intf.abap b/src/inspect/zif_abapgit_code_inspector.intf.abap
similarity index 100%
rename from src/zif_abapgit_code_inspector.intf.abap
rename to src/inspect/zif_abapgit_code_inspector.intf.abap
diff --git a/src/zif_abapgit_code_inspector.intf.xml b/src/inspect/zif_abapgit_code_inspector.intf.xml
similarity index 100%
rename from src/zif_abapgit_code_inspector.intf.xml
rename to src/inspect/zif_abapgit_code_inspector.intf.xml
diff --git a/src/objects/jump/package.devc.xml b/src/objects/jump/package.devc.xml
new file mode 100644
index 000000000..abf893dd4
--- /dev/null
+++ b/src/objects/jump/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - Objects Jump
+
+
+
+
diff --git a/src/utils/zcl_abapgit_adt_link.clas.abap b/src/objects/jump/zcl_abapgit_adt_link.clas.abap
similarity index 100%
rename from src/utils/zcl_abapgit_adt_link.clas.abap
rename to src/objects/jump/zcl_abapgit_adt_link.clas.abap
diff --git a/src/utils/zcl_abapgit_adt_link.clas.xml b/src/objects/jump/zcl_abapgit_adt_link.clas.xml
similarity index 100%
rename from src/utils/zcl_abapgit_adt_link.clas.xml
rename to src/objects/jump/zcl_abapgit_adt_link.clas.xml
diff --git a/src/objects/core/zcl_abapgit_gui_jumper.clas.abap b/src/objects/jump/zcl_abapgit_gui_jumper.clas.abap
similarity index 100%
rename from src/objects/core/zcl_abapgit_gui_jumper.clas.abap
rename to src/objects/jump/zcl_abapgit_gui_jumper.clas.abap
diff --git a/src/objects/core/zcl_abapgit_gui_jumper.clas.xml b/src/objects/jump/zcl_abapgit_gui_jumper.clas.xml
similarity index 100%
rename from src/objects/core/zcl_abapgit_gui_jumper.clas.xml
rename to src/objects/jump/zcl_abapgit_gui_jumper.clas.xml
diff --git a/src/ui/zif_abapgit_gui_jumper.intf.abap b/src/objects/jump/zif_abapgit_gui_jumper.intf.abap
similarity index 100%
rename from src/ui/zif_abapgit_gui_jumper.intf.abap
rename to src/objects/jump/zif_abapgit_gui_jumper.intf.abap
diff --git a/src/ui/zif_abapgit_gui_jumper.intf.xml b/src/objects/jump/zif_abapgit_gui_jumper.intf.xml
similarity index 100%
rename from src/ui/zif_abapgit_gui_jumper.intf.xml
rename to src/objects/jump/zif_abapgit_gui_jumper.intf.xml
diff --git a/src/objects/rules/package.devc.xml b/src/objects/rules/package.devc.xml
new file mode 100644
index 000000000..b648d6c61
--- /dev/null
+++ b/src/objects/rules/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - Objects Field Rules
+
+
+
+
diff --git a/src/objects/zcl_abapgit_field_rules.clas.abap b/src/objects/rules/zcl_abapgit_field_rules.clas.abap
similarity index 100%
rename from src/objects/zcl_abapgit_field_rules.clas.abap
rename to src/objects/rules/zcl_abapgit_field_rules.clas.abap
diff --git a/src/objects/zcl_abapgit_field_rules.clas.xml b/src/objects/rules/zcl_abapgit_field_rules.clas.xml
similarity index 100%
rename from src/objects/zcl_abapgit_field_rules.clas.xml
rename to src/objects/rules/zcl_abapgit_field_rules.clas.xml
diff --git a/src/objects/zif_abapgit_field_rules.intf.abap b/src/objects/rules/zif_abapgit_field_rules.intf.abap
similarity index 100%
rename from src/objects/zif_abapgit_field_rules.intf.abap
rename to src/objects/rules/zif_abapgit_field_rules.intf.abap
diff --git a/src/objects/zif_abapgit_field_rules.intf.xml b/src/objects/rules/zif_abapgit_field_rules.intf.xml
similarity index 100%
rename from src/objects/zif_abapgit_field_rules.intf.xml
rename to src/objects/rules/zif_abapgit_field_rules.intf.xml
diff --git a/src/stage/package.devc.xml b/src/stage/package.devc.xml
new file mode 100644
index 000000000..45f1cf7ce
--- /dev/null
+++ b/src/stage/package.devc.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+ abapGit - Stage
+
+
+
+
diff --git a/src/zcl_abapgit_merge.clas.abap b/src/stage/zcl_abapgit_merge.clas.abap
similarity index 100%
rename from src/zcl_abapgit_merge.clas.abap
rename to src/stage/zcl_abapgit_merge.clas.abap
diff --git a/src/zcl_abapgit_merge.clas.xml b/src/stage/zcl_abapgit_merge.clas.xml
similarity index 100%
rename from src/zcl_abapgit_merge.clas.xml
rename to src/stage/zcl_abapgit_merge.clas.xml
diff --git a/src/zcl_abapgit_stage.clas.abap b/src/stage/zcl_abapgit_stage.clas.abap
similarity index 100%
rename from src/zcl_abapgit_stage.clas.abap
rename to src/stage/zcl_abapgit_stage.clas.abap
diff --git a/src/zcl_abapgit_stage.clas.xml b/src/stage/zcl_abapgit_stage.clas.xml
similarity index 100%
rename from src/zcl_abapgit_stage.clas.xml
rename to src/stage/zcl_abapgit_stage.clas.xml
diff --git a/src/zcl_abapgit_stage_logic.clas.abap b/src/stage/zcl_abapgit_stage_logic.clas.abap
similarity index 100%
rename from src/zcl_abapgit_stage_logic.clas.abap
rename to src/stage/zcl_abapgit_stage_logic.clas.abap
diff --git a/src/zcl_abapgit_stage_logic.clas.xml b/src/stage/zcl_abapgit_stage_logic.clas.xml
similarity index 100%
rename from src/zcl_abapgit_stage_logic.clas.xml
rename to src/stage/zcl_abapgit_stage_logic.clas.xml
diff --git a/src/zif_abapgit_merge.intf.abap b/src/stage/zif_abapgit_merge.intf.abap
similarity index 100%
rename from src/zif_abapgit_merge.intf.abap
rename to src/stage/zif_abapgit_merge.intf.abap
diff --git a/src/zif_abapgit_merge.intf.xml b/src/stage/zif_abapgit_merge.intf.xml
similarity index 100%
rename from src/zif_abapgit_merge.intf.xml
rename to src/stage/zif_abapgit_merge.intf.xml
diff --git a/src/zif_abapgit_stage_logic.intf.abap b/src/stage/zif_abapgit_stage_logic.intf.abap
similarity index 100%
rename from src/zif_abapgit_stage_logic.intf.abap
rename to src/stage/zif_abapgit_stage_logic.intf.abap
diff --git a/src/zif_abapgit_stage_logic.intf.xml b/src/stage/zif_abapgit_stage_logic.intf.xml
similarity index 100%
rename from src/zif_abapgit_stage_logic.intf.xml
rename to src/stage/zif_abapgit_stage_logic.intf.xml
diff --git a/src/zcl_abapgit_news.clas.abap b/src/utils/zcl_abapgit_news.clas.abap
similarity index 100%
rename from src/zcl_abapgit_news.clas.abap
rename to src/utils/zcl_abapgit_news.clas.abap
diff --git a/src/zcl_abapgit_news.clas.testclasses.abap b/src/utils/zcl_abapgit_news.clas.testclasses.abap
similarity index 100%
rename from src/zcl_abapgit_news.clas.testclasses.abap
rename to src/utils/zcl_abapgit_news.clas.testclasses.abap
diff --git a/src/zcl_abapgit_news.clas.xml b/src/utils/zcl_abapgit_news.clas.xml
similarity index 100%
rename from src/zcl_abapgit_news.clas.xml
rename to src/utils/zcl_abapgit_news.clas.xml
diff --git a/src/zcl_abapgit_version.clas.abap b/src/utils/zcl_abapgit_version.clas.abap
similarity index 100%
rename from src/zcl_abapgit_version.clas.abap
rename to src/utils/zcl_abapgit_version.clas.abap
diff --git a/src/zcl_abapgit_version.clas.testclasses.abap b/src/utils/zcl_abapgit_version.clas.testclasses.abap
similarity index 100%
rename from src/zcl_abapgit_version.clas.testclasses.abap
rename to src/utils/zcl_abapgit_version.clas.testclasses.abap
diff --git a/src/zcl_abapgit_version.clas.xml b/src/utils/zcl_abapgit_version.clas.xml
similarity index 100%
rename from src/zcl_abapgit_version.clas.xml
rename to src/utils/zcl_abapgit_version.clas.xml
diff --git a/test/abap_transpile.json b/test/abap_transpile.json
index ccd611c46..a1f37fb57 100644
--- a/test/abap_transpile.json
+++ b/test/abap_transpile.json
@@ -19,6 +19,7 @@
"zcl_abapgit_j",
"zcl_abapgit_l",
"zcl_abapgit_n",
+ "zcl_abapgit_exit",
"zcl_abapgit_object_intf",
"zcl_abapgit_objects_files",
"zcl_abapgit_objects_program",