diff --git a/src/zcl_abapgit_http_client.clas.abap b/src/http/zcl_abapgit_http_client.clas.abap
similarity index 100%
rename from src/zcl_abapgit_http_client.clas.abap
rename to src/http/zcl_abapgit_http_client.clas.abap
diff --git a/src/zcl_abapgit_http_client.clas.xml b/src/http/zcl_abapgit_http_client.clas.xml
similarity index 100%
rename from src/zcl_abapgit_http_client.clas.xml
rename to src/http/zcl_abapgit_http_client.clas.xml
diff --git a/src/zcl_abapgit_longtexts.clas.abap b/src/objects/zcl_abapgit_longtexts.clas.abap
similarity index 100%
rename from src/zcl_abapgit_longtexts.clas.abap
rename to src/objects/zcl_abapgit_longtexts.clas.abap
diff --git a/src/zcl_abapgit_longtexts.clas.xml b/src/objects/zcl_abapgit_longtexts.clas.xml
similarity index 100%
rename from src/zcl_abapgit_longtexts.clas.xml
rename to src/objects/zcl_abapgit_longtexts.clas.xml
diff --git a/src/zcl_abapgit_object_enhc.clas.abap b/src/objects/zcl_abapgit_object_enhc.clas.abap
similarity index 100%
rename from src/zcl_abapgit_object_enhc.clas.abap
rename to src/objects/zcl_abapgit_object_enhc.clas.abap
diff --git a/src/zcl_abapgit_object_enhc.clas.xml b/src/objects/zcl_abapgit_object_enhc.clas.xml
similarity index 100%
rename from src/zcl_abapgit_object_enhc.clas.xml
rename to src/objects/zcl_abapgit_object_enhc.clas.xml
diff --git a/src/zcl_abapgit_string_utils.clas.abap b/src/utils/zcl_abapgit_string_utils.clas.abap
similarity index 100%
rename from src/zcl_abapgit_string_utils.clas.abap
rename to src/utils/zcl_abapgit_string_utils.clas.abap
diff --git a/src/zcl_abapgit_string_utils.clas.xml b/src/utils/zcl_abapgit_string_utils.clas.xml
similarity index 100%
rename from src/zcl_abapgit_string_utils.clas.xml
rename to src/utils/zcl_abapgit_string_utils.clas.xml