diff --git a/src/persist/zif_abapgit_persist_repo.intf.abap b/src/persist/zif_abapgit_persist_repo.intf.abap
index 484a2dad5..c4e1f258e 100644
--- a/src/persist/zif_abapgit_persist_repo.intf.abap
+++ b/src/persist/zif_abapgit_persist_repo.intf.abap
@@ -4,15 +4,15 @@ INTERFACE zif_abapgit_persist_repo
 
   METHODS add
     IMPORTING
-      !iv_url         TYPE string
-      !iv_branch_name TYPE string
-      !iv_branch      TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL
-      iv_display_name TYPE string OPTIONAL
-      !iv_package     TYPE devclass
-      !iv_offline     TYPE abap_bool DEFAULT abap_false
-      !is_dot_abapgit TYPE zif_abapgit_dot_abapgit=>ty_dot_abapgit
+      !iv_url          TYPE string
+      !iv_branch_name  TYPE string
+      !iv_branch       TYPE zif_abapgit_git_definitions=>ty_sha1 OPTIONAL
+      !iv_display_name TYPE string OPTIONAL
+      !iv_package      TYPE devclass
+      !iv_offline      TYPE abap_bool DEFAULT abap_false
+      !is_dot_abapgit  TYPE zif_abapgit_dot_abapgit=>ty_dot_abapgit
     RETURNING
-      VALUE(rv_key)   TYPE zif_abapgit_persistence=>ty_repo-key
+      VALUE(rv_key)    TYPE zif_abapgit_persistence=>ty_repo-key
     RAISING
       zcx_abapgit_exception .
   METHODS delete
@@ -22,7 +22,7 @@ INTERFACE zif_abapgit_persist_repo
       zcx_abapgit_exception .
   METHODS exists
     IMPORTING
-      !iv_key TYPE zif_abapgit_persistence=>ty_repo-key
+      !iv_key       TYPE zif_abapgit_persistence=>ty_repo-key
     RETURNING
       VALUE(rv_yes) TYPE abap_bool.
   METHODS list
diff --git a/src/repo/zcl_abapgit_repo.clas.abap b/src/repo/zcl_abapgit_repo.clas.abap
index c0bcb3bc0..4d9148651 100644
--- a/src/repo/zcl_abapgit_repo.clas.abap
+++ b/src/repo/zcl_abapgit_repo.clas.abap
@@ -751,27 +751,6 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD zif_abapgit_repo~get_files_local_filtered.
-
-    DATA lo_serialize TYPE REF TO zcl_abapgit_serialize.
-    DATA lt_filter TYPE zif_abapgit_definitions=>ty_tadir_tt.
-
-
-    CREATE OBJECT lo_serialize
-      EXPORTING
-        io_dot_abapgit    = get_dot_abapgit( )
-        is_local_settings = get_local_settings( ).
-
-    lt_filter = ii_obj_filter->get_filter( ).
-
-    rt_files = lo_serialize->files_local(
-      iv_package     = get_package( )
-      ii_data_config = get_data_config( )
-      ii_log         = ii_log
-      it_filter      = lt_filter ).
-
-  ENDMETHOD.
-
   METHOD zif_abapgit_repo~get_files_local.
 
     DATA lo_serialize TYPE REF TO zcl_abapgit_serialize.
@@ -798,6 +777,28 @@ CLASS zcl_abapgit_repo IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD zif_abapgit_repo~get_files_local_filtered.
+
+    DATA lo_serialize TYPE REF TO zcl_abapgit_serialize.
+    DATA lt_filter TYPE zif_abapgit_definitions=>ty_tadir_tt.
+
+
+    CREATE OBJECT lo_serialize
+      EXPORTING
+        io_dot_abapgit    = get_dot_abapgit( )
+        is_local_settings = get_local_settings( ).
+
+    lt_filter = ii_obj_filter->get_filter( ).
+
+    rt_files = lo_serialize->files_local(
+      iv_package     = get_package( )
+      ii_data_config = get_data_config( )
+      ii_log         = ii_log
+      it_filter      = lt_filter ).
+
+  ENDMETHOD.
+
+
   METHOD zif_abapgit_repo~get_files_remote.
     DATA lt_filter TYPE zif_abapgit_definitions=>ty_tadir_tt.
     DATA lr_filter TYPE REF TO zcl_abapgit_repo_filter.
diff --git a/src/ui/routing/zcl_abapgit_services_repo.clas.abap b/src/ui/routing/zcl_abapgit_services_repo.clas.abap
index b4a59e5ee..b51798ccc 100644
--- a/src/ui/routing/zcl_abapgit_services_repo.clas.abap
+++ b/src/ui/routing/zcl_abapgit_services_repo.clas.abap
@@ -122,7 +122,7 @@ ENDCLASS.
 
 
 
-CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
+CLASS zcl_abapgit_services_repo IMPLEMENTATION.
 
 
   METHOD activate_objects.
@@ -180,24 +180,6 @@ CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
   ENDMETHOD.
 
 
-  METHOD check_package_exists.
-
-    IF zcl_abapgit_factory=>get_sap_package( iv_package )->exists( ) = abap_false.
-      " Check if any package is included in remote
-      READ TABLE it_remote TRANSPORTING NO FIELDS
-        WITH KEY file
-        COMPONENTS filename = zcl_abapgit_filename_logic=>c_package_file.
-      IF sy-subrc <> 0.
-        " If not, give error
-        zcx_abapgit_exception=>raise(
-          iv_text     = |Package { iv_package } does not exist and there's no package included in the repository|
-          iv_longtext = 'Either select an existing package, create a new one, or add a package to the repository' ).
-      ENDIF.
-    ENDIF.
-
-  ENDMETHOD.
-
-
   METHOD check_for_restart.
 
     CONSTANTS:
@@ -254,6 +236,24 @@ CLASS ZCL_ABAPGIT_SERVICES_REPO IMPLEMENTATION.
   ENDMETHOD.
 
 
+  METHOD check_package_exists.
+
+    IF zcl_abapgit_factory=>get_sap_package( iv_package )->exists( ) = abap_false.
+      " Check if any package is included in remote
+      READ TABLE it_remote TRANSPORTING NO FIELDS
+        WITH KEY file
+        COMPONENTS filename = zcl_abapgit_filename_logic=>c_package_file.
+      IF sy-subrc <> 0.
+        " If not, give error
+        zcx_abapgit_exception=>raise(
+          iv_text     = |Package { iv_package } does not exist and there's no package included in the repository|
+          iv_longtext = 'Either select an existing package, create a new one, or add a package to the repository' ).
+      ENDIF.
+    ENDIF.
+
+  ENDMETHOD.
+
+
   METHOD create_package.
 
     DATA ls_package_data TYPE scompkdtln.