diff --git a/src/z2ui5_cl_demo_app_351.clas.abap b/src/00/z2ui5_cl_demo_app_s_06.clas.abap
similarity index 73%
rename from src/z2ui5_cl_demo_app_351.clas.abap
rename to src/00/z2ui5_cl_demo_app_s_06.clas.abap
index a706dc12..676ce975 100644
--- a/src/z2ui5_cl_demo_app_351.clas.abap
+++ b/src/00/z2ui5_cl_demo_app_s_06.clas.abap
@@ -1,4 +1,4 @@
-CLASS z2ui5_cl_demo_app_351 DEFINITION
+CLASS z2ui5_cl_demo_app_s_06 DEFINITION
   PUBLIC
   CREATE PUBLIC .
 
@@ -10,7 +10,7 @@ ENDCLASS.
 
 
 
-CLASS Z2UI5_CL_DEMO_APP_351 IMPLEMENTATION.
+CLASS z2ui5_cl_demo_app_s_06 IMPLEMENTATION.
 
   METHOD z2ui5_if_app~main.
     client->nav_app_call( NEW zcl_2ui5_start( ) ).
diff --git a/src/z2ui5_cl_demo_app_351.clas.locals_imp.abap b/src/00/z2ui5_cl_demo_app_s_06.clas.locals_imp.abap
similarity index 99%
rename from src/z2ui5_cl_demo_app_351.clas.locals_imp.abap
rename to src/00/z2ui5_cl_demo_app_s_06.clas.locals_imp.abap
index 65bd7793..cf319a71 100644
--- a/src/z2ui5_cl_demo_app_351.clas.locals_imp.abap
+++ b/src/00/z2ui5_cl_demo_app_s_06.clas.locals_imp.abap
@@ -1,7 +1,7 @@
 CLASS zcl_2ui5_start DEFINITION DEFERRED.
 CLASS zcl_2ui5_lock DEFINITION DEFERRED.
 
-CLASS zcl_2ui5_start DEFINITION INHERITING FROM z2ui5_cl_demo_app_351.
+CLASS zcl_2ui5_start DEFINITION INHERITING FROM z2ui5_cl_demo_app_s_06.
   PUBLIC SECTION.
     DATA text TYPE string VALUE 'call booking mask'.
     METHODS z2ui5_if_app~main                       REDEFINITION.
@@ -9,7 +9,7 @@ CLASS zcl_2ui5_start DEFINITION INHERITING FROM z2ui5_cl_demo_app_351.
   PRIVATE SECTION.
 ENDCLASS.
 
-CLASS zcl_2ui5_lock DEFINITION INHERITING FROM z2ui5_cl_demo_app_351.
+CLASS zcl_2ui5_lock DEFINITION INHERITING FROM z2ui5_cl_demo_app_s_06.
   PUBLIC SECTION.
     DATA varkey TYPE char120.
     METHODS z2ui5_if_app~main                       REDEFINITION.
diff --git a/src/z2ui5_cl_demo_app_351.clas.xml b/src/00/z2ui5_cl_demo_app_s_06.clas.xml
similarity index 90%
rename from src/z2ui5_cl_demo_app_351.clas.xml
rename to src/00/z2ui5_cl_demo_app_s_06.clas.xml
index e55019ce..3c0d3701 100644
--- a/src/z2ui5_cl_demo_app_351.clas.xml
+++ b/src/00/z2ui5_cl_demo_app_s_06.clas.xml
@@ -3,7 +3,7 @@
  <asx:abap xmlns:asx="http://www.sap.com/abapxml" version="1.0">
   <asx:values>
    <VSEOCLASS>
-    <CLSNAME>Z2UI5_CL_DEMO_APP_351</CLSNAME>
+    <CLSNAME>Z2UI5_CL_DEMO_APP_S_06</CLSNAME>
     <LANGU>E</LANGU>
     <DESCRIPT>Navigation with app state change v2</DESCRIPT>
     <STATE>1</STATE>
diff --git a/src/z2ui5_cl_demo_app_192.clas.locals_imp.abap b/src/z2ui5_cl_demo_app_192.clas.locals_imp.abap
deleted file mode 100644
index 23304b98..00000000
--- a/src/z2ui5_cl_demo_app_192.clas.locals_imp.abap
+++ /dev/null
@@ -1,23 +0,0 @@
-*"* use this source file for the definition and implementation of
-*"* local helper classes, interface definitions and type
-*"* declarations
-CLASS lcl_merged_data DEFINITION.
-
-  PUBLIC SECTION.
-
-    TYPES: BEGIN OF ty_s_key_value,
-             fname   TYPE string,
-             value   TYPE string,
-             tabname TYPE string,
-             comp    TYPE abap_componentdescr,
-           END OF ty_s_key_value,
-           ty_t_key_values TYPE STANDARD TABLE OF ty_s_key_value WITH EMPTY KEY.
-
-    TYPES: BEGIN OF ty_s_merged_data,
-             t_kopf  TYPE REF TO data,
-             t_pos   TYPE REF TO data,
-             t_keyva TYPE ty_t_key_values,
-           END OF ty_s_merged_data.
-
-
-ENDCLASS.
diff --git a/src/z2ui5_cl_demo_app_193.clas.locals_imp.abap b/src/z2ui5_cl_demo_app_193.clas.locals_imp.abap
deleted file mode 100644
index 7c08e06c..00000000
--- a/src/z2ui5_cl_demo_app_193.clas.locals_imp.abap
+++ /dev/null
@@ -1,23 +0,0 @@
-*"* use this source file for the definition and implementation of
-*"* local helper classes, interface definitions and type
-*"* declarations
-CLASS lcl_merged_data DEFINITION.
-
-  PUBLIC SECTION.
-
-    TYPES: BEGIN OF ty_s_key_value,
-             fname   TYPE char30,
-             value   TYPE string,
-             tabname TYPE char30,
-             comp    TYPE abap_componentdescr,
-           END OF ty_s_key_value,
-           ty_t_key_values TYPE STANDARD TABLE OF ty_s_key_value WITH EMPTY KEY.
-
-    TYPES: BEGIN OF ty_s_merged_data,
-             t_kopf  TYPE REF TO data,
-             t_pos   TYPE REF TO data,
-             t_keyva TYPE ty_t_key_values,
-           END OF ty_s_merged_data.
-
-
-ENDCLASS.