diff --git a/platform/generic/objects.mk b/platform/generic/objects.mk
index 6f63e69e..49077546 100644
--- a/platform/generic/objects.mk
+++ b/platform/generic/objects.mk
@@ -9,9 +9,3 @@
 
 platform-objs-y += platform.o
 platform-objs-y += platform_override_modules.o
-
-carray-platform_override_modules-y += sifive_fu540
-platform-objs-y += sifive_fu540.o
-
-carray-platform_override_modules-y += sifive_fu740
-platform-objs-y += sifive_fu740.o
diff --git a/platform/generic/sifive_fu540.c b/platform/generic/sifive/fu540.c
similarity index 100%
rename from platform/generic/sifive_fu540.c
rename to platform/generic/sifive/fu540.c
diff --git a/platform/generic/sifive_fu740.c b/platform/generic/sifive/fu740.c
similarity index 100%
rename from platform/generic/sifive_fu740.c
rename to platform/generic/sifive/fu740.c
diff --git a/platform/generic/sifive/objects.mk b/platform/generic/sifive/objects.mk
new file mode 100644
index 00000000..c17e2df1
--- /dev/null
+++ b/platform/generic/sifive/objects.mk
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: BSD-2-Clause
+#
+
+carray-platform_override_modules-y += sifive_fu540
+platform-objs-y += sifive/fu540.o
+
+carray-platform_override_modules-y += sifive_fu740
+platform-objs-y += sifive/fu740.o