diff --git a/subprojects/.gitignore b/subprojects/.gitignore
index 27f44036..f8265540 100644
--- a/subprojects/.gitignore
+++ b/subprojects/.gitignore
@@ -1,9 +1,12 @@
 /*/*
 
 # The above pattern doesn't match submodules
+/bitsery
+/function2
 /tomlplusplus
 /vst3
 
 # And we obviously don't want to ignore our overlays
-!/bitsery-patch/*
+!/packagefiles/bitsery
+!/packagefiles/function2
 !/function2-patch/*
diff --git a/subprojects/bitsery.wrap b/subprojects/bitsery.wrap
index e4c86048..4832fb25 100644
--- a/subprojects/bitsery.wrap
+++ b/subprojects/bitsery.wrap
@@ -3,5 +3,4 @@ url = https://github.com/fraillt/bitsery.git
 # This is tag v5.2.2
 revision = c0fc083c9de805e5825d7553507569febf6a6f93
 depth = 1
-
-patch_directory = subprojects/bitsery-patch
+patch_directory = bitsery
diff --git a/subprojects/function2.wrap b/subprojects/function2.wrap
index 7500ee37..8f6867a6 100644
--- a/subprojects/function2.wrap
+++ b/subprojects/function2.wrap
@@ -3,5 +3,4 @@ url = https://github.com/Naios/function2.git
 # Tag 4.2.0
 revision = 02ca99831de59c7c3a4b834789260253cace0ced
 depth = 1
-
-patch_directory = subprojects/function2-patch
+patch_directory = function2
diff --git a/subprojects/bitsery-patch/meson.build b/subprojects/packagefiles/bitsery/meson.build
similarity index 66%
rename from subprojects/bitsery-patch/meson.build
rename to subprojects/packagefiles/bitsery/meson.build
index 31eb696c..9c8380c1 100644
--- a/subprojects/bitsery-patch/meson.build
+++ b/subprojects/packagefiles/bitsery/meson.build
@@ -1,3 +1,3 @@
-project('bitsery', 'cpp', version : '5.2.0')
+project('bitsery', 'cpp', version : '5.2.2')
 
 bitsery_dep = declare_dependency(include_directories : include_directories('include'))
diff --git a/subprojects/function2-patch/meson.build b/subprojects/packagefiles/function2/meson.build
similarity index 100%
rename from subprojects/function2-patch/meson.build
rename to subprojects/packagefiles/function2/meson.build