diff --git a/pkgs/development/compilers/llvm/3.6/clang-exports.patch b/pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/3.6/clang-exports.patch
rename to pkgs/development/compilers/llvm/3.6/clang/cmake-exports.patch
diff --git a/pkgs/development/compilers/llvm/3.6/clang.nix b/pkgs/development/compilers/llvm/3.6/clang/default.nix
similarity index 96%
rename from pkgs/development/compilers/llvm/3.6/clang.nix
rename to pkgs/development/compilers/llvm/3.6/clang/default.nix
index 45ad74457122..2216dad3ef8e 100644
--- a/pkgs/development/compilers/llvm/3.6/clang.nix
+++ b/pkgs/development/compilers/llvm/3.6/clang/default.nix
@@ -23,7 +23,7 @@ in stdenv.mkDerivation {
   (stdenv.lib.optional stdenv.isLinux "-DGCC_INSTALL_PREFIX=${gcc}") ++
   (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include");
 
-  patches = [ ./clang-purity.patch ./clang-exports.patch ];
+  patches = [ ./purity.patch ./cmake-exports.patch ];
 
   postPatch = ''
     sed -i -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' lib/Driver/Tools.cpp
diff --git a/pkgs/development/compilers/llvm/3.6/clang-purity.patch b/pkgs/development/compilers/llvm/3.6/clang/purity.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/3.6/clang-purity.patch
rename to pkgs/development/compilers/llvm/3.6/clang/purity.patch
diff --git a/pkgs/development/compilers/llvm/3.6/default.nix b/pkgs/development/compilers/llvm/3.6/default.nix
index a6f5d10d05d3..dddd09c44eda 100644
--- a/pkgs/development/compilers/llvm/3.6/default.nix
+++ b/pkgs/development/compilers/llvm/3.6/default.nix
@@ -18,7 +18,7 @@ let
       inherit compiler-rt_src;
     };
 
-    clang = callPackage ./clang.nix {
+    clang = callPackage ./clang {
       inherit clang-tools-extra_src;
     };
 
@@ -26,6 +26,6 @@ let
 
     libcxx = callPackage ./libc++ { stdenv = pkgs.clangStdenv; };
 
-    libcxxabi = callPackage ./libc++abi { stdenv = pkgs.clangStdenv; };
+    libcxxabi = callPackage ./libc++abi.nix { stdenv = pkgs.clangStdenv; };
   };
 in self
diff --git a/pkgs/development/compilers/llvm/3.6/libc++abi/default.nix b/pkgs/development/compilers/llvm/3.6/libc++abi.nix
similarity index 100%
rename from pkgs/development/compilers/llvm/3.6/libc++abi/default.nix
rename to pkgs/development/compilers/llvm/3.6/libc++abi.nix