diff --git a/meta-arm-bsp/wic/corstone1000-flash-firmware-fvp.wks.in b/meta-arm-bsp/files/wic/corstone1000-flash-firmware-fvp.wks.in
similarity index 100%
rename from meta-arm-bsp/wic/corstone1000-flash-firmware-fvp.wks.in
rename to meta-arm-bsp/files/wic/corstone1000-flash-firmware-fvp.wks.in
diff --git a/meta-arm-bsp/wic/corstone1000-flash-firmware-mps3.wks.in b/meta-arm-bsp/files/wic/corstone1000-flash-firmware-mps3.wks.in
similarity index 100%
rename from meta-arm-bsp/wic/corstone1000-flash-firmware-mps3.wks.in
rename to meta-arm-bsp/files/wic/corstone1000-flash-firmware-mps3.wks.in
diff --git a/meta-arm-bsp/wic/efi-disk-esp-only.wks.in b/meta-arm-bsp/files/wic/efi-disk-esp-only.wks.in
similarity index 100%
rename from meta-arm-bsp/wic/efi-disk-esp-only.wks.in
rename to meta-arm-bsp/files/wic/efi-disk-esp-only.wks.in
diff --git a/meta-arm-bsp/wic/efi-disk-no-swap.wks.in b/meta-arm-bsp/files/wic/efi-disk-no-swap.wks.in
similarity index 100%
rename from meta-arm-bsp/wic/efi-disk-no-swap.wks.in
rename to meta-arm-bsp/files/wic/efi-disk-no-swap.wks.in
diff --git a/meta-arm/wic/efi-disk.wks.in b/meta-arm/files/wic/efi-disk.wks.in
similarity index 100%
rename from meta-arm/wic/efi-disk.wks.in
rename to meta-arm/files/wic/efi-disk.wks.in
diff --git a/meta-arm/wic/qemu-efi-disk.wks.in b/meta-arm/files/wic/qemu-efi-disk.wks.in
similarity index 100%
rename from meta-arm/wic/qemu-efi-disk.wks.in
rename to meta-arm/files/wic/qemu-efi-disk.wks.in
diff --git a/meta-arm/wic/qemuarm.cfg b/meta-arm/files/wic/qemuarm.cfg
similarity index 100%
rename from meta-arm/wic/qemuarm.cfg
rename to meta-arm/files/wic/qemuarm.cfg
diff --git a/meta-arm/wic/qemuarm.wks b/meta-arm/files/wic/qemuarm.wks
similarity index 100%
rename from meta-arm/wic/qemuarm.wks
rename to meta-arm/files/wic/qemuarm.wks
diff --git a/meta-arm/wic/qemuarm64.cfg b/meta-arm/files/wic/qemuarm64.cfg
similarity index 100%
rename from meta-arm/wic/qemuarm64.cfg
rename to meta-arm/files/wic/qemuarm64.cfg
diff --git a/meta-arm/wic/qemuarm64.wks b/meta-arm/files/wic/qemuarm64.wks
similarity index 100%
rename from meta-arm/wic/qemuarm64.wks
rename to meta-arm/files/wic/qemuarm64.wks