diff --git a/src/zcl_abapgit_objects.clas.abap b/src/objects/zcl_abapgit_objects.clas.abap
similarity index 100%
rename from src/zcl_abapgit_objects.clas.abap
rename to src/objects/zcl_abapgit_objects.clas.abap
diff --git a/src/zcl_abapgit_objects.clas.testclasses.abap b/src/objects/zcl_abapgit_objects.clas.testclasses.abap
similarity index 100%
rename from src/zcl_abapgit_objects.clas.testclasses.abap
rename to src/objects/zcl_abapgit_objects.clas.testclasses.abap
diff --git a/src/zcl_abapgit_objects.clas.xml b/src/objects/zcl_abapgit_objects.clas.xml
similarity index 100%
rename from src/zcl_abapgit_objects.clas.xml
rename to src/objects/zcl_abapgit_objects.clas.xml
diff --git a/src/zcl_abapgit_objects_bridge.clas.abap b/src/objects/zcl_abapgit_objects_bridge.clas.abap
similarity index 100%
rename from src/zcl_abapgit_objects_bridge.clas.abap
rename to src/objects/zcl_abapgit_objects_bridge.clas.abap
diff --git a/src/zcl_abapgit_objects_bridge.clas.xml b/src/objects/zcl_abapgit_objects_bridge.clas.xml
similarity index 100%
rename from src/zcl_abapgit_objects_bridge.clas.xml
rename to src/objects/zcl_abapgit_objects_bridge.clas.xml
diff --git a/src/objects/zif_abapgit_gui_functions.intf.abap b/src/ui/zif_abapgit_gui_functions.intf.abap
similarity index 100%
rename from src/objects/zif_abapgit_gui_functions.intf.abap
rename to src/ui/zif_abapgit_gui_functions.intf.abap
diff --git a/src/objects/zif_abapgit_gui_functions.intf.xml b/src/ui/zif_abapgit_gui_functions.intf.xml
similarity index 100%
rename from src/objects/zif_abapgit_gui_functions.intf.xml
rename to src/ui/zif_abapgit_gui_functions.intf.xml
diff --git a/src/utils/zcl_abapgit_version.clas.abap b/src/zcl_abapgit_version.clas.abap
similarity index 100%
rename from src/utils/zcl_abapgit_version.clas.abap
rename to src/zcl_abapgit_version.clas.abap
diff --git a/src/utils/zcl_abapgit_version.clas.xml b/src/zcl_abapgit_version.clas.xml
similarity index 100%
rename from src/utils/zcl_abapgit_version.clas.xml
rename to src/zcl_abapgit_version.clas.xml