DO xml gen and manage folder

menu/page_catalog_group_recommend.skt

@@ -1,7 +1,3 @@
-<?hurr 
-    #include=menu_head.py 
-?>
-
 <Popup>
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
@@ -11,9 +7,9 @@
 <EventOpen>
 	; On open
 	<?hurr
-        #include=menu_catalog_default_init.xml
+        #include=components/menu_catalog_default_init.xml
     ?>
-    
+
     Var Menu1Selected = "PressForever"
 
     Var OreoBigButtonEnable = "Enable"
@@ -27,38 +23,25 @@
         Var esp122101001Enable = "Invisible"
 
     EndIf
-    
+
     SAVELOG PreviseXMLFileName2
 
     Var Timeout = 0
 
-    If show_eng = "true" Then 
-    
+    If show_eng = "true" Then
+
         Var text_unavailable = "UNAVAILABLE###size=16"
     Else
         Var text_unavailable = "หมด###size=32"
-    
+
     EndIf
 
-    <?hurr 
-        #include=menu_catalog_new_menu.xml
+    <?hurr
+        #include=components/menu_catalog_new_menu.xml
     ?>
 
 </EventOpen>
 
-
-<?hurr 
-    #include=menu_catalog_new.py
-?>
-
-
-<?hurr 
-    #include=menu_new_layout_gen_v2.py
-?>
-<?hurr 
-    #include=menu_new_layout_gen.py
-?>
-
 <Button>
 <X> 780 </X>
 <Y> 500 </Y>
@@ -67,17 +50,17 @@
 <Interval> 500 </Interval>
 <Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
 <Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
+<EventClick>
     Machine RemoveCup
     Machine DoorLidOpen
     Var buttonRemoveCup = "Invisible"
 </EventClick>
 </Button>
 
-
+<?hurr
+    #generate_layout=menu_new_v2
+?>
 
 ;BigLogoLayout
 
-</Popup>
-
-
+</Popup>