diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/compiler-rt-X86-support-extension.patch
rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-X86-support-extension.patch
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/compiler-rt-armv7l.patch
rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-armv7l.patch
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/compiler-rt-codesign.patch
rename to pkgs/development/compilers/llvm/12/compiler-rt/compiler-rt-codesign.patch
diff --git a/pkgs/development/compilers/llvm/12/compiler-rt.nix b/pkgs/development/compilers/llvm/12/compiler-rt/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/12/compiler-rt.nix
rename to pkgs/development/compilers/llvm/12/compiler-rt/default.nix
diff --git a/pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/sanitizers-nongnu.patch
rename to pkgs/development/compilers/llvm/12/compiler-rt/sanitizers-nongnu.patch
diff --git a/pkgs/development/compilers/llvm/12/default.nix b/pkgs/development/compilers/llvm/12/default.nix
index 593db716ac6b..ad7121c36a8a 100644
--- a/pkgs/development/compilers/llvm/12/default.nix
+++ b/pkgs/development/compilers/llvm/12/default.nix
@@ -32,7 +32,7 @@ let
     '';
   in {
 
-    llvm = callPackage ./llvm.nix { };
+    llvm = callPackage ./llvm { };
 
     clang-unwrapped = callPackage ./clang {
       inherit (tools) lld;
@@ -80,11 +80,11 @@ let
       extraBuildCommands = mkExtraBuildCommands cc;
     };
 
-    lld = callPackage ./lld.nix {
+    lld = callPackage ./lld {
       libunwind = libraries.libunwind;
     };
 
-    lldb = callPackage ./lldb.nix {
+    lldb = callPackage ./lldb {
       inherit (darwin) libobjc bootstrap_cmds;
       inherit (darwin.apple_sdk.libs) xpc;
       inherit (darwin.apple_sdk.frameworks) Foundation Carbon Cocoa;
@@ -172,7 +172,7 @@ let
     callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; });
   in {
 
-    compiler-rt = callPackage ./compiler-rt.nix ({} //
+    compiler-rt = callPackage ./compiler-rt ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt;
       }));
@@ -186,7 +186,7 @@ let
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
 
-    libcxxabi = callPackage ./libc++abi.nix ({} //
+    libcxxabi = callPackage ./libc++abi ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
         libunwind = libraries.libunwind;
@@ -194,7 +194,7 @@ let
 
     openmp = callPackage ./openmp.nix {};
 
-    libunwind = callPackage ./libunwind.nix ({} //
+    libunwind = callPackage ./libunwind ({} //
       (lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
         stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx;
       }));
diff --git a/pkgs/development/compilers/llvm/12/libc++abi.nix b/pkgs/development/compilers/llvm/12/libc++abi/default.nix
similarity index 97%
rename from pkgs/development/compilers/llvm/12/libc++abi.nix
rename to pkgs/development/compilers/llvm/12/libc++abi/default.nix
index e35480c7bf24..c5e9aa954b3b 100644
--- a/pkgs/development/compilers/llvm/12/libc++abi.nix
+++ b/pkgs/development/compilers/llvm/12/libc++abi/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation {
   '' + lib.optionalString stdenv.isDarwin ''
     export TRIPLE=x86_64-apple-darwin
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
-    patch -p1 -d libcxx -i ${../libcxx-0001-musl-hacks.patch}
+    patch -p1 -d libcxx -i ${../../libcxx-0001-musl-hacks.patch}
   '' + lib.optionalString stdenv.hostPlatform.isWasm ''
     patch -p1 -d llvm -i ${./libcxxabi-wasm.patch}
   '';
diff --git a/pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/libcxxabi-wasm.patch
rename to pkgs/development/compilers/llvm/12/libc++abi/libcxxabi-wasm.patch
diff --git a/pkgs/development/compilers/llvm/12/libunwind.nix b/pkgs/development/compilers/llvm/12/libunwind/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/12/libunwind.nix
rename to pkgs/development/compilers/llvm/12/libunwind/default.nix
diff --git a/pkgs/development/compilers/llvm/12/lld.nix b/pkgs/development/compilers/llvm/12/lld/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/12/lld.nix
rename to pkgs/development/compilers/llvm/12/lld/default.nix
diff --git a/pkgs/development/compilers/llvm/12/lldb.nix b/pkgs/development/compilers/llvm/12/lldb/default.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/12/lldb.nix
rename to pkgs/development/compilers/llvm/12/lldb/default.nix
diff --git a/pkgs/development/compilers/llvm/12/lldb-procfs.patch b/pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/lldb-procfs.patch
rename to pkgs/development/compilers/llvm/12/lldb/lldb-procfs.patch
diff --git a/pkgs/development/compilers/llvm/12/llvm.nix b/pkgs/development/compilers/llvm/12/llvm/default.nix
similarity index 99%
rename from pkgs/development/compilers/llvm/12/llvm.nix
rename to pkgs/development/compilers/llvm/12/llvm/default.nix
index 6e6127ba9494..6075f9d8d55b 100644
--- a/pkgs/development/compilers/llvm/12/llvm.nix
+++ b/pkgs/development/compilers/llvm/12/llvm/default.nix
@@ -73,7 +73,7 @@ in stdenv.mkDerivation (rec {
       --replace "PassBuilderCallbacksTest.cpp" ""
     rm unittests/IR/PassBuilderCallbacksTest.cpp
   '' + optionalString stdenv.hostPlatform.isMusl ''
-    patch -p1 -i ${../TLI-musl.patch}
+    patch -p1 -i ${../../TLI-musl.patch}
     substituteInPlace unittests/Support/CMakeLists.txt \
       --replace "add_subdirectory(DynamicLibrary)" ""
     rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp
diff --git a/pkgs/development/compilers/llvm/12/llvm-outputs.patch b/pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/12/llvm-outputs.patch
rename to pkgs/development/compilers/llvm/12/llvm/llvm-outputs.patch