diff --git a/llvm/lib/Transforms/CMakeLists.txt b/llvm/lib/Transforms/CMakeLists.txt
index 402ee7729e558947ae1c27c5c8023fb3af028687..628c2bb19bcebed8b71108061cb31b126240cc22 100644
--- a/llvm/lib/Transforms/CMakeLists.txt
+++ b/llvm/lib/Transforms/CMakeLists.txt
@@ -7,16 +7,16 @@ add_subdirectory(Vectorize)
 add_subdirectory(Hello)
 add_subdirectory(ObjCARC)
 add_subdirectory(Coroutines)
-add_subdirectory(BuildDFG)
-add_subdirectory(ClearDFG)
+#add_subdirectory(BuildDFG)
+#add_subdirectory(ClearDFG)
 #add_subdirectory(DFG2LLVM_NVPTX)
 #add_subdirectory(DFG2LLVM_SPIR)
-add_subdirectory(DFG2LLVM_X86)
-add_subdirectory(LocalMem)
-add_subdirectory(InPlaceDFG)
-add_subdirectory(GenVISC)
-add_subdirectory(MergeDFN)
-add_subdirectory(ReplaceIntrinsics)
+#add_subdirectory(DFG2LLVM_X86)
+#add_subdirectory(LocalMem)
+#add_subdirectory(InPlaceDFG)
+#add_subdirectory(GenVISC)
+#add_subdirectory(MergeDFN)
+#add_subdirectory(ReplaceIntrinsics)
 #add_subdirectory(DFG2LLVM_X86_dsoc)
 #add_subdirectory(InlineTensorCalls)
 #add_subdirectory(ExtractHPVMLeafNodes)
diff --git a/llvm/lib/Transforms/LLVMBuild.txt b/llvm/lib/Transforms/LLVMBuild.txt
index df5e2907e2a32d452e7e3885fa242f94788c171a..a9a6e01bea6d5b21ce567e802d3c10440e1380c3 100644
--- a/llvm/lib/Transforms/LLVMBuild.txt
+++ b/llvm/lib/Transforms/LLVMBuild.txt
@@ -25,15 +25,6 @@ subdirectories =
   Utils
   Vectorize
   ObjCARC
-  BuildDFG
-  ClearDFG
-  DFG2LLVM_NVPTX
-  DFG2LLVM_SPIR
-  DFG2LLVM_X86
-  LocalMem
-  InPlaceDFG
-  GenVISC
-  MergeDFN
 
 [component_0]
 type = Group
diff --git a/llvm/lib/Transforms/BuildDFG/BuildDFG.cpp b/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
similarity index 100%
rename from llvm/lib/Transforms/BuildDFG/BuildDFG.cpp
rename to llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.cpp
diff --git a/llvm/lib/Transforms/BuildDFG/BuildDFG.exports b/llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.exports
similarity index 100%
rename from llvm/lib/Transforms/BuildDFG/BuildDFG.exports
rename to llvm/tools/hpvm/lib/Transforms/BuildDFG/BuildDFG.exports
diff --git a/llvm/lib/Transforms/BuildDFG/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/BuildDFG/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/BuildDFG/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/BuildDFG/CMakeLists.txt
diff --git a/llvm/lib/Transforms/BuildDFG/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/BuildDFG/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/BuildDFG/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/ClearDFG/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/ClearDFG/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/ClearDFG/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/ClearDFG/CMakeLists.txt
diff --git a/llvm/lib/Transforms/ClearDFG/ClearDFG.cpp b/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
similarity index 100%
rename from llvm/lib/Transforms/ClearDFG/ClearDFG.cpp
rename to llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.cpp
diff --git a/llvm/lib/Transforms/ClearDFG/ClearDFG.exports b/llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.exports
similarity index 100%
rename from llvm/lib/Transforms/ClearDFG/ClearDFG.exports
rename to llvm/tools/hpvm/lib/Transforms/ClearDFG/ClearDFG.exports
diff --git a/llvm/lib/Transforms/ClearDFG/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/ClearDFG/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/ClearDFG/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/CMakeLists.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.cpp
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/DFG2LLVM_NVPTX.exports
diff --git a/llvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_NVPTX/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/CMakeLists.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.cpp
diff --git a/llvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/DFG2LLVM_SPIR.exports
diff --git a/llvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_SPIR/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/CMakeLists.txt
diff --git a/llvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.cpp
diff --git a/llvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/DFG2LLVM_X86.exports
diff --git a/llvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/DFG2LLVM_X86/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/GenVISC/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/GenVISC/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/GenVISC/CMakeLists.txt
diff --git a/llvm/lib/Transforms/GenVISC/GenVISC.cpp b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
similarity index 100%
rename from llvm/lib/Transforms/GenVISC/GenVISC.cpp
rename to llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.cpp
diff --git a/llvm/lib/Transforms/GenVISC/GenVISC.exports b/llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.exports
similarity index 100%
rename from llvm/lib/Transforms/GenVISC/GenVISC.exports
rename to llvm/tools/hpvm/lib/Transforms/GenVISC/GenVISC.exports
diff --git a/llvm/lib/Transforms/GenVISC/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/GenVISC/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/GenVISC/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/LocalMem/CMakeLists.txt b/llvm/tools/hpvm/lib/Transforms/LocalMem/CMakeLists.txt
similarity index 100%
rename from llvm/lib/Transforms/LocalMem/CMakeLists.txt
rename to llvm/tools/hpvm/lib/Transforms/LocalMem/CMakeLists.txt
diff --git a/llvm/lib/Transforms/LocalMem/LLVMBuild.txt b/llvm/tools/hpvm/lib/Transforms/LocalMem/LLVMBuild.txt
similarity index 100%
rename from llvm/lib/Transforms/LocalMem/LLVMBuild.txt
rename to llvm/tools/hpvm/lib/Transforms/LocalMem/LLVMBuild.txt
diff --git a/llvm/lib/Transforms/LocalMem/LocalMem.cpp b/llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.cpp
similarity index 100%
rename from llvm/lib/Transforms/LocalMem/LocalMem.cpp
rename to llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.cpp
diff --git a/llvm/lib/Transforms/LocalMem/LocalMem.exports b/llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.exports
similarity index 100%
rename from llvm/lib/Transforms/LocalMem/LocalMem.exports
rename to llvm/tools/hpvm/lib/Transforms/LocalMem/LocalMem.exports