diff --git a/llvm/projects/visc-rt/CMakeLists.txt b/llvm/tools/hpvm/visc-rt/CMakeLists.txt
similarity index 100%
rename from llvm/projects/visc-rt/CMakeLists.txt
rename to llvm/tools/hpvm/visc-rt/CMakeLists.txt
diff --git a/llvm/projects/visc-rt/deviceStatusSwitchIntervals.txt b/llvm/tools/hpvm/visc-rt/deviceStatusSwitchIntervals.txt
similarity index 100%
rename from llvm/projects/visc-rt/deviceStatusSwitchIntervals.txt
rename to llvm/tools/hpvm/visc-rt/deviceStatusSwitchIntervals.txt
diff --git a/llvm/projects/visc-rt/device_abstraction.h b/llvm/tools/hpvm/visc-rt/device_abstraction.h
similarity index 100%
rename from llvm/projects/visc-rt/device_abstraction.h
rename to llvm/tools/hpvm/visc-rt/device_abstraction.h
diff --git a/llvm/projects/visc-rt/makefile b/llvm/tools/hpvm/visc-rt/makefile
similarity index 88%
rename from llvm/projects/visc-rt/makefile
rename to llvm/tools/hpvm/visc-rt/makefile
index b621292c3be552b722c3d1f87e69c3a2c5a149d2..01cc2b7b3fd548f918ea8f43ad5c5bbd4642edc6 100644
--- a/llvm/projects/visc-rt/makefile
+++ b/llvm/tools/hpvm/visc-rt/makefile
@@ -1,5 +1,5 @@
-LLVM_SRC_ROOT = ../../../llvm
-LLVM_BUILD_ROOT = ../..
+#LLVM_SRC_ROOT = ../../../llvm
+LLVM_BUILD_ROOT = ${LLVM_SRC_ROOT}/../build/
 
 OPENCL_INC_PATH = /opt/intel/opencl-sdk/include
 
diff --git a/llvm/projects/visc-rt/policy.h b/llvm/tools/hpvm/visc-rt/policy.h
similarity index 100%
rename from llvm/projects/visc-rt/policy.h
rename to llvm/tools/hpvm/visc-rt/policy.h
diff --git a/llvm/projects/visc-rt/visc-rt.cpp b/llvm/tools/hpvm/visc-rt/visc-rt.cpp
similarity index 100%
rename from llvm/projects/visc-rt/visc-rt.cpp
rename to llvm/tools/hpvm/visc-rt/visc-rt.cpp
diff --git a/llvm/projects/visc-rt/visc-rt.h b/llvm/tools/hpvm/visc-rt/visc-rt.h
similarity index 98%
rename from llvm/projects/visc-rt/visc-rt.h
rename to llvm/tools/hpvm/visc-rt/visc-rt.h
index 5e7546f582f09173d5da4f4129218275873e17bb..84965135e8a5a43218237911c659dd6dd751621b 100644
--- a/llvm/projects/visc-rt/visc-rt.h
+++ b/llvm/tools/hpvm/visc-rt/visc-rt.h
@@ -13,10 +13,11 @@
 #include <string>
 //#include <condition_variable>
 
-#include "llvm/SupportVISC/VISCHint.h"
-#include "llvm/SupportVISC/VISCTimer.h"
+#include "../include/SupportVISC/VISCHint.h"
+#include "../include/SupportVISC/VISCTimer.h"
 #include "device_abstraction.h"
 #include "policy.h"
+
 #ifndef DEBUG_BUILD
 #define DEBUG(s) {}
 #else