[rdk-b][common][bsp][Refactor image layout to ease porting]

[Description]
Refactor image layout to ease porting

[Release-log]
N/A

diff --git a/recipes-core/images/rdk-generic-broadband-image.bbappend b/recipes-core/images/rdk-generic-broadband-image.bbappend
index 2dc7a06..5863454 100644
--- a/recipes-core/images/rdk-generic-broadband-image.bbappend
+++ b/recipes-core/images/rdk-generic-broadband-image.bbappend
@@ -8,6 +8,20 @@
 
 IMAGE_INSTALL += " packagegroup-filogic-core \
     ${SYSTEMD_TOOLS} \
+    ethtool \
+    ebtables \
+    regs \
+    mii-mgr \
+    mtd \
+    smp \
+    mtk-factory-rw \
+    ${@bb.utils.contains('DISTRO_FEATURES','switch_gsw_mode','switch','',d)} \
+    mtd-utils-ubifs \
+    u-boot-fw-utils \
+    fw-upgrade \
+    init-filogic \
+    mac-sec \
+    mtkhnat-util \
     network-hotplug \
     libmcrypt \
     coreutils \
diff --git a/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend b/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
index 231a2a2..2089b3d 100644
--- a/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
+++ b/recipes-core/images/rdk-generic-broadband-tdk-image.bbappend
@@ -8,6 +8,20 @@
 
 IMAGE_INSTALL += " packagegroup-filogic-core \
     ${SYSTEMD_TOOLS} \
+    ethtool \
+    ebtables \
+    regs \
+    mii-mgr \
+    mtd \
+    smp \
+    mtk-factory-rw \
+    ${@bb.utils.contains('DISTRO_FEATURES','switch_gsw_mode','switch','',d)} \
+    mtd-utils-ubifs \
+    u-boot-fw-utils \
+    fw-upgrade \
+    init-filogic \
+    mac-sec \
+    mtkhnat-util \
     network-hotplug \
     libmcrypt \
     coreutils \
@@ -82,4 +96,4 @@
     fi
 
 }
-addtask filogic_gen_image after do_image_complete before do_populate_lic_deploy
\ No newline at end of file
+addtask filogic_gen_image after do_image_complete before do_populate_lic_deploy
diff --git a/recipes-core/packagegroups/packagegroup-filogic-core.bb b/recipes-core/packagegroups/packagegroup-filogic-core.bb
index 38285d6..1c0bd0f 100644
--- a/recipes-core/packagegroups/packagegroup-filogic-core.bb
+++ b/recipes-core/packagegroups/packagegroup-filogic-core.bb
@@ -24,25 +24,11 @@
     kernel-module-mt76 \
     kernel-module-mt7915e \
     iw \
-    ethtool \
-    ebtables \
-    regs \
-    mii-mgr \
-    mtd \
-    smp \
-    mtk-factory-rw \
     ubus  \
     ubusd \
     usteer \
-    ${@bb.utils.contains('DISTRO_FEATURES','switch_gsw_mode','switch','',d)} \
-    mtd-utils-ubifs \
-    u-boot-fw-utils \
-    fw-upgrade \
-    init-filogic \
     uci \
-    mac-sec \
     mt76-vendor \
     wifi-test-tool \
     atenl \
-    mtkhnat-util \
     "