diff --git a/debian/patches/lldb-libname.diff b/debian/patches/lldb/lldb-libname.diff
similarity index 100%
rename from debian/patches/lldb-libname.diff
rename to debian/patches/lldb/lldb-libname.diff
diff --git a/debian/patches/lldb-soname.diff b/debian/patches/lldb/lldb-soname.diff
similarity index 100%
rename from debian/patches/lldb-soname.diff
rename to debian/patches/lldb/lldb-soname.diff
diff --git a/debian/patches/print-lldb-path.patch b/debian/patches/lldb/print-lldb-path.patch
similarity index 100%
rename from debian/patches/print-lldb-path.patch
rename to debian/patches/lldb/print-lldb-path.patch
diff --git a/debian/patches/test-disable-lldb-i386.diff b/debian/patches/lldb/test-disable-lldb-i386.diff
similarity index 100%
rename from debian/patches/test-disable-lldb-i386.diff
rename to debian/patches/lldb/test-disable-lldb-i386.diff
diff --git a/debian/patches/series b/debian/patches/series
index a2fe91ba..1d83b5f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,7 +28,7 @@ disable-display-PASS-UNSUPPORTED-XFAIL.diff
 
 # Lib names
 0044-soname.diff
-lldb-soname.diff
+lldb/lldb-soname.diff
 #lldb-libname.diff
 openmp-soname.diff
 
@@ -131,12 +131,12 @@ D98575.patch
 x86-fuzzer.patch
 
 python3-shebang.patch
-print-lldb-path.patch
+lldb/print-lldb-path.patch
 lower-python-dep.diff
 scan-build-py-fix-default-bin.diff
 
 omp-riscv64.patch
-test-disable-lldb-i386.diff
+lldb/test-disable-lldb-i386.diff
 unbreak-atomic-mips.diff
 llvm-fix-lld-linker-check.diff
 openmp-fix-runtimes-build.diff
@@ -159,3 +159,5 @@ revert-update-doc.diff
 fix-typo.diff
 ubuntu-kinetic.patch
 fix-typo-1018770.diff
+lldb/lldb-swig.diff
+lldb/lldb-swig-2.diff