diff --git a/src/zabapgit_popups.prog.abap b/src/zabapgit_popups.prog.abap
index 11cc8e0be..fbc651331 100644
--- a/src/zabapgit_popups.prog.abap
+++ b/src/zabapgit_popups.prog.abap
@@ -17,7 +17,8 @@ CLASS lcl_popups DEFINITION FINAL.
 
     CLASS-METHODS:
       popup_package_export
-        RETURNING VALUE(rv_package) TYPE devclass
+        EXPORTING ev_package      TYPE devclass
+                  ev_folder_logic TYPE string
         RAISING   lcx_exception,
       popup_object
         RETURNING VALUE(rs_tadir) TYPE tadir
@@ -145,8 +146,9 @@ CLASS lcl_popups IMPLEMENTATION.
 
     FIELD-SYMBOLS: <ls_field> LIKE LINE OF lt_fields.
 
-    "               TAB           FLD       LABEL     DEF                 ATTR
-    _add_dialog_fld 'TDEVC'      'DEVCLASS' 'Package' ''                  ''.
+    "               TAB     FLD        LABEL          DEF      ATTR
+    _add_dialog_fld 'TDEVC' 'DEVCLASS' 'Package'      ''       ''.
+    _add_dialog_fld 'TDEVC' 'INTSYS'   'Folder logic' 'PREFIX' ''.
 
     CALL FUNCTION 'POPUP_GET_VALUES'
       EXPORTING
@@ -170,8 +172,12 @@ CLASS lcl_popups IMPLEMENTATION.
     READ TABLE lt_fields INDEX 1 ASSIGNING <ls_field>.
     ASSERT sy-subrc = 0.
     TRANSLATE <ls_field>-value TO UPPER CASE.
+    ev_package = <ls_field>-value.
 
-    rv_package = <ls_field>-value.
+    READ TABLE lt_fields INDEX 2 ASSIGNING <ls_field>.
+    ASSERT sy-subrc = 0.
+    TRANSLATE <ls_field>-value TO UPPER CASE.
+    ev_folder_logic = <ls_field>-value.
 
   ENDMETHOD.                    "popup_package_export
 
diff --git a/src/zabapgit_zip.prog.abap b/src/zabapgit_zip.prog.abap
index e80b18bc4..2765cc6ef 100644
--- a/src/zabapgit_zip.prog.abap
+++ b/src/zabapgit_zip.prog.abap
@@ -388,14 +388,17 @@ CLASS lcl_zip IMPLEMENTATION.
           ls_data TYPE lcl_persistence_repo=>ty_repo.
 
 
-    ls_data-package = lcl_popups=>popup_package_export( ).
+    ls_data-key = 'DUMMY'.
+    ls_data-dot_abapgit = lcl_dot_abapgit=>build_default( )->get_data( ).
+
+    lcl_popups=>popup_package_export(
+      IMPORTING
+        ev_package      = ls_data-package
+        ev_folder_logic = ls_data-dot_abapgit-folder_logic ).
     IF ls_data-package IS INITIAL.
       RAISE EXCEPTION TYPE lcx_cancel.
     ENDIF.
 
-    ls_data-key = 'DUMMY'.
-    ls_data-dot_abapgit = lcl_dot_abapgit=>build_default( )->get_data( ).
-
     CREATE OBJECT lo_repo
       EXPORTING
         is_data = ls_data.