diff --git a/shortcut-fe/fast-classifier/src/Makefile b/fast-classifier/src/Makefile
similarity index 100%
rename from shortcut-fe/fast-classifier/src/Makefile
rename to fast-classifier/src/Makefile
diff --git a/shortcut-fe/fast-classifier/src/fast-classifier.c b/fast-classifier/src/fast-classifier.c
similarity index 100%
rename from shortcut-fe/fast-classifier/src/fast-classifier.c
rename to fast-classifier/src/fast-classifier.c
diff --git a/shortcut-fe/fast-classifier/src/fast-classifier.h b/fast-classifier/src/fast-classifier.h
similarity index 100%
rename from shortcut-fe/fast-classifier/src/fast-classifier.h
rename to fast-classifier/src/fast-classifier.h
diff --git a/shortcut-fe/fast-classifier/src/nl_classifier_test.c b/fast-classifier/src/nl_classifier_test.c
similarity index 100%
rename from shortcut-fe/fast-classifier/src/nl_classifier_test.c
rename to fast-classifier/src/nl_classifier_test.c
diff --git a/shortcut-fe/fast-classifier/src/userspace_example.c b/fast-classifier/src/userspace_example.c
similarity index 100%
rename from shortcut-fe/fast-classifier/src/userspace_example.c
rename to fast-classifier/src/userspace_example.c
diff --git a/shortcut-fe/shortcut-fe/Makefile b/shortcut-fe/Makefile
similarity index 100%
rename from shortcut-fe/shortcut-fe/Makefile
rename to shortcut-fe/Makefile
diff --git a/shortcut-fe/fast-classifier/Makefile b/shortcut-fe/fast-classifier/Makefile
deleted file mode 100644
index 09c1174dd..000000000
--- a/shortcut-fe/fast-classifier/Makefile
+++ /dev/null
@@ -1,109 +0,0 @@
-#
-# Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=fast-classifier
-PKG_RELEASE:=6
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fast-classifier/Default
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  DEPENDS:=+kmod-ipt-conntrack +kmod-shortcut-fe
-  TITLE:=Kernel driver for FAST Classifier
-  FILES:=$(PKG_BUILD_DIR)/fast-classifier.ko
-  KCONFIG:= \
-	   CONFIG_NF_CONNTRACK_EVENTS=y \
-	   CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y \
-	   CONFIG_NF_CONNTRACK_MARK=y \
-	   CONFIG_XFRM=y
-  CONFLICTS:=kmod-shortcut-fe-drv kmod-shortcut-fe-cm
-endef
-
-define KernelPackage/fast-classifier
-  $(call KernelPackage/fast-classifier/Default)
-endef
-
-define KernelPackage/fast-classifier-noload
-  $(call KernelPackage/fast-classifier/Default)
-endef
-
-define KernelPackage/fast-classifier/Default/description
-FAST Classifier talks to SFE to make decisions about offloading connections
-endef
-
-define KernelPackage/fast-classifier/description
-$(call KernelPackage/fast-classifier/Default/description)
-endef
-
-define KernelPackage/fast-classifier-noload/description
-$(call KernelPackage/fast-classifier/Default/description)
-
-This package does not load fast-classifier at boot by default
-endef
-
-define Package/fast-classifier-example
-  TITLE:=Example user space program for fast-classifier
-  DEPENDS:=+libnl +kmod-fast-classifier
-endef
-
-define Package/fast-classifier-example/description
-Example user space program that communicates with fast
-classifier kernel module
-endef
-
-HAVE_ECM:=$(CONFIG_PACKAGE_kmod-qca-nss-ecm-premium)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-noload)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-premium-noload)$(CONFIG_PACKAGE_kmod-qca-nss-ecm-standard)
-
-define Build/Compile/kmod
-	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)" \
-		CONFIG_FAST_CLASSIFIER=m \
-		EXTRA_CFLAGS+="-DSFE_SUPPORT_IPV6" \
-		$(if $(HAVE_ECM),EXTRA_CFLAGS+="-DCONFIG_SFE_ECM" CONFIG_SFE_ECM=y,) \
-		modules
-endef
-
-define Build/Compile/example
-	$(TARGET_CC) -o $(PKG_BUILD_DIR)/userspace_fast_classifier \
-		-I $(PKG_BUILD_DIR) \
-		-I$(STAGING_DIR)/usr/include/libnl \
-		-I$(STAGING_DIR)/usr/include/libnl3 \
-		-lnl-genl-3 -lnl-3 \
-		$(PKG_BUILD_DIR)/nl_classifier_test.c
-endef
-
-define Build/Compile
-	$(Build/Compile/kmod)
-	$(if $(CONFIG_PACKAGE_fast-classifier-example),$(Build/Compile/example))
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_BUILD_DIR)/fast-classifier.h $(1)/usr/include/
-endef
-
-define Package/fast-classifier-example/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(CP) $(PKG_BUILD_DIR)/userspace_fast_classifier $(1)/sbin/
-endef
-
-$(eval $(call KernelPackage,fast-classifier))
-#$(eval $(call KernelPackage,fast-classifier-noload))
-#$(eval $(call BuildPackage,fast-classifier-example))
diff --git a/shortcut-fe/shortcut-fe/files/usr/bin/sfe_dump b/shortcut-fe/files/usr/bin/sfe_dump
old mode 100755
new mode 100644
similarity index 100%
rename from shortcut-fe/shortcut-fe/files/usr/bin/sfe_dump
rename to shortcut-fe/files/usr/bin/sfe_dump
diff --git a/shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe b/shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe
deleted file mode 100644
index 838512a36..000000000
--- a/shortcut-fe/shortcut-fe/files/etc/init.d/shortcut-fe
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh /etc/rc.common
-#
-# Copyright (c) 2014-2015 The Linux Foundation. All rights reserved.
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-#SFE connection manager has a lower priority, it should be started after other connection manager
-#to detect the existence of connection manager with higher priority
-START=70
-
-have_cm() {
-	[ -d "/sys/kernel/debug/ecm" ] && echo 1 && return
-
-	echo 0
-}
-
-#load shortcut-fe and connection manager
-load_sfe() {
-	local kernel_version=$(uname -r)
-
-	[ -d "/sys/module/shortcut_fe" ] || insmod /lib/modules/$kernel_version/shortcut-fe.ko
-	[ -d "/sys/module/shortcut_fe_ipv6" ] || insmod /lib/modules/$kernel_version/shortcut-fe-ipv6.ko
-
-	[ -e "/lib/modules/$kernel_version/shortcut-fe-cm.ko" ] && {
-		[ -d /sys/module/shortcut_fe_cm ] || insmod /lib/modules/$kernel_version/shortcut-fe-cm.ko
-	}
-	[ -e "/lib/modules/$kernel_version/fast-classifier.ko" ] && {
-		[ -d /sys/module/fast_classifier ] || insmod /lib/modules/$kernel_version/fast-classifier.ko
-	}
-}
-
-start() {
-	[ "$(have_cm)" = "0" ] && load_sfe
-}
-
-stop() {
-	[ -d "/sys/module/shortcut_fe_cm" ] && rmmod shortcut_fe_cm
-  [ -d "/sys/module/shortcut_fe_ipv6" ] && rmmod shortcut_fe_ipv6
-  [ -d "/sys/module/shortcut_fe" ] && rmmod shortcut_fe
-  [ -d "/sys/module/shortcut_fe_drv" ] && rmmod shortcut_fe_drv
-	[ -d "/sys/module/fast_classifier" ] && rmmod fast_classifier
-}
diff --git a/shortcut-fe/simulated-driver/Makefile b/shortcut-fe/simulated-driver/Makefile
deleted file mode 100644
index ecf9c41bd..000000000
--- a/shortcut-fe/simulated-driver/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-#
-# Copyright (c) 2015,2016 The Linux Foundation. All rights reserved.
-# Permission to use, copy, modify, and/or distribute this software for
-# any purpose with or without fee is hereby granted, provided that the
-# above copyright notice and this permission notice appear in all copies.
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-# OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=shortcut-fe-simulated-driver
-PKG_RELEASE:=1
-
-PKG_SOURCE_URL:=https://source.codeaurora.org/quic/qsdk/oss/lklm/shortcut-fe
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2021-03-17
-PKG_SOURCE_VERSION:=697977d8d0ccf0ab596e5692d08608a75dd7f33d
-PKG_MIRROR_HASH:=659fa82a431e15af797a6c7069faeee02810453ad8b576c51c29f95a1761a045
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/shortcut-fe-drv
-  SECTION:=kernel
-  CATEGORY:=Kernel modules
-  SUBMENU:=Network Support
-  DEPENDS:=@TARGET_ipq806x||TARGET_ipq807x +kmod-shortcut-fe
-  KCONFIG:= \
-	   CONFIG_NET_CLS_ACT=y \
-	   CONFIG_XFRM=y
-  TITLE:=Simulated sfe driver for ECM
-  FILES:=$(PKG_BUILD_DIR)/simulated-driver/shortcut-fe-drv.ko
-endef
-
-define KernelPackage/shortcut-fe-drv/Description
-Simulated sfe driver which act as an adapter to convert message
-between a connection manager and the SFE core engine.
-endef
-
-define Build/Compile
-	$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)/simulated-driver" \
-		EXTRA_CFLAGS="-DSFE_SUPPORT_IPV6" \
-		modules
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/shortcut-fe
-	$(CP) -rf $(PKG_BUILD_DIR)/simulated-driver/sfe_drv.h $(1)/usr/include/shortcut-fe
-endef
-
-$(eval $(call KernelPackage,shortcut-fe-drv))
diff --git a/shortcut-fe/simulated-driver/patches/200-nss-qdisc-support.patch b/shortcut-fe/simulated-driver/patches/200-nss-qdisc-support.patch
deleted file mode 100644
index 638ad8a84..000000000
--- a/shortcut-fe/simulated-driver/patches/200-nss-qdisc-support.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./simulated-driver/sfe_drv.c.orig	2020-06-16 12:49:47.680153371 +0800
-+++ ./simulated-driver/sfe_drv.c	2020-06-16 12:50:18.540153371 +0800
-@@ -1167,7 +1167,7 @@ int sfe_drv_recv(struct sk_buff *skb)
- 	 * If ingress Qdisc configured, and packet not processed by ingress Qdisc yet
- 	 * We can not accelerate this packet.
- 	 */
--	if (dev->ingress_queue && !(skb->tc_verd & TC_NCLS)) {
-+	if (dev->ingress_queue && !(skb->tc_verd_qca_nss & TC_NCLS)) {
- 		return 0;
- 	}
- #endif
diff --git a/shortcut-fe/shortcut-fe/src/Kconfig b/shortcut-fe/src/Kconfig
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/Kconfig
rename to shortcut-fe/src/Kconfig
diff --git a/shortcut-fe/shortcut-fe/src/Makefile b/shortcut-fe/src/Makefile
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/Makefile
rename to shortcut-fe/src/Makefile
diff --git a/shortcut-fe/src/sfe.h b/shortcut-fe/src/sfe.h
new file mode 100644
index 000000000..279e7b3dc
--- /dev/null
+++ b/shortcut-fe/src/sfe.h
@@ -0,0 +1,114 @@
+/*
+ * sfe.h
+ *	Shortcut forwarding engine.
+ *
+ * Copyright (c) 2013-2017 The Linux Foundation. All rights reserved.
+ * Permission to use, copy, modify, and/or distribute this software for
+ * any purpose with or without fee is hereby granted, provided that the
+ * above copyright notice and this permission notice appear in all copies.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+
+/*
+ * The following are debug macros used throughout the SFE.
+ *
+ * The DEBUG_LEVEL enables the followings based on its value,
+ * when dynamic debug option is disabled.
+ *
+ * 0 = OFF
+ * 1 = ASSERTS / ERRORS
+ * 2 = 1 + WARN
+ * 3 = 2 + INFO
+ * 4 = 3 + TRACE
+ */
+#define DEBUG_LEVEL 2
+
+#if (DEBUG_LEVEL < 1)
+#define DEBUG_ASSERT(s, ...)
+#define DEBUG_ERROR(s, ...)
+#else
+#define DEBUG_ASSERT(c, s, ...) if (!(c)) { pr_emerg("ASSERT: %s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__); BUG(); }
+#define DEBUG_ERROR(s, ...) pr_err("%s:%d:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+#if defined(CONFIG_DYNAMIC_DEBUG)
+/*
+ * Compile messages for dynamic enable/disable
+ */
+#define DEBUG_WARN(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define DEBUG_INFO(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#define DEBUG_TRACE(s, ...) pr_debug("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#else
+
+/*
+ * Statically compile messages at different levels
+ */
+#if (DEBUG_LEVEL < 2)
+#define DEBUG_WARN(s, ...)
+#else
+#define DEBUG_WARN(s, ...) pr_warn("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+#if (DEBUG_LEVEL < 3)
+#define DEBUG_INFO(s, ...)
+#else
+#define DEBUG_INFO(s, ...) pr_notice("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+
+#if (DEBUG_LEVEL < 4)
+#define DEBUG_TRACE(s, ...)
+#else
+#define DEBUG_TRACE(s, ...) pr_info("%s[%d]:" s, __FUNCTION__, __LINE__, ##__VA_ARGS__)
+#endif
+#endif
+
+#ifdef CONFIG_NF_FLOW_COOKIE
+typedef int (*flow_cookie_set_func_t)(u32 protocol, __be32 src_ip, __be16 src_port,
+				      __be32 dst_ip, __be16 dst_port, u16 flow_cookie);
+/*
+ * sfe_register_flow_cookie_cb
+ *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
+ *
+ * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
+ * can use this function to configure flow cookie for a flow.
+ * return: 0, success; !=0, fail
+ */
+int sfe_register_flow_cookie_cb(flow_cookie_set_func_t cb);
+
+/*
+ * sfe_unregister_flow_cookie_cb
+ *	unregister function which is used to configure flow cookie for a flow
+ *
+ * return: 0, success; !=0, fail
+ */
+int sfe_unregister_flow_cookie_cb(flow_cookie_set_func_t cb);
+
+typedef int (*sfe_ipv6_flow_cookie_set_func_t)(u32 protocol, __be32 src_ip[4], __be16 src_port,
+						__be32 dst_ip[4], __be16 dst_port, u16 flow_cookie);
+
+/*
+ * sfe_ipv6_register_flow_cookie_cb
+ *	register a function in SFE to let SFE use this function to configure flow cookie for a flow
+ *
+ * Hardware driver which support flow cookie should register a callback function in SFE. Then SFE
+ * can use this function to configure flow cookie for a flow.
+ * return: 0, success; !=0, fail
+ */
+int sfe_ipv6_register_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
+
+/*
+ * sfe_ipv6_unregister_flow_cookie_cb
+ *	unregister function which is used to configure flow cookie for a flow
+ *
+ * return: 0, success; !=0, fail
+ */
+int sfe_ipv6_unregister_flow_cookie_cb(sfe_ipv6_flow_cookie_set_func_t cb);
+
+#endif /*CONFIG_NF_FLOW_COOKIE*/
diff --git a/shortcut-fe/shortcut-fe/src/sfe_backport.h b/shortcut-fe/src/sfe_backport.h
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/sfe_backport.h
rename to shortcut-fe/src/sfe_backport.h
diff --git a/shortcut-fe/shortcut-fe/src/sfe_cm.c b/shortcut-fe/src/sfe_cm.c
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/sfe_cm.c
rename to shortcut-fe/src/sfe_cm.c
diff --git a/shortcut-fe/shortcut-fe/src/sfe_ipv4.c b/shortcut-fe/src/sfe_ipv4.c
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/sfe_ipv4.c
rename to shortcut-fe/src/sfe_ipv4.c
diff --git a/shortcut-fe/shortcut-fe/src/sfe_ipv6.c b/shortcut-fe/src/sfe_ipv6.c
similarity index 100%
rename from shortcut-fe/shortcut-fe/src/sfe_ipv6.c
rename to shortcut-fe/src/sfe_ipv6.c