diff --git a/cmake/modules/CUDA.cmake b/cmake/modules/CUDA.cmake
index c2864e9e2a29..480f22935f57 100644
--- a/cmake/modules/CUDA.cmake
+++ b/cmake/modules/CUDA.cmake
@@ -40,14 +40,14 @@ if(USE_CUDA)
 
   if(USE_CUDNN)
     message(STATUS "Build with cuDNN support")
-    file(GLOB CONTRIB_CUDNN_SRCS src/contrib/cudnn/*.cc)
+    file(GLOB CONTRIB_CUDNN_SRCS src/runtime/contrib/cudnn/*.cc)
     list(APPEND RUNTIME_SRCS ${CONTRIB_CUDNN_SRCS})
     list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUDNN_LIBRARY})
   endif(USE_CUDNN)
 
   if(USE_CUBLAS)
     message(STATUS "Build with cuBLAS support")
-    file(GLOB CONTRIB_CUBLAS_SRCS src/contrib/cublas/*.cc)
+    file(GLOB CONTRIB_CUBLAS_SRCS src/runtime/contrib/cublas/*.cc)
     list(APPEND RUNTIME_SRCS ${CONTRIB_CUBLAS_SRCS})
     list(APPEND TVM_RUNTIME_LINKER_LIBS ${CUDA_CUBLAS_LIBRARY})
   endif(USE_CUBLAS)
diff --git a/cmake/modules/Metal.cmake b/cmake/modules/Metal.cmake
index b6512982039e..bde66b0aad60 100644
--- a/cmake/modules/Metal.cmake
+++ b/cmake/modules/Metal.cmake
@@ -24,7 +24,7 @@ if(USE_METAL)
   list(APPEND RUNTIME_SRCS ${RUNTIME_METAL_SRCS})
 
   if(USE_MPS)
-    file(GLOB MPS_CONTRIB_SRC src/contrib/mps/*.mm)
+    file(GLOB MPS_CONTRIB_SRC src/runtime/contrib/mps/*.mm)
     list(APPEND RUNTIME_SRCS ${MPS_CONTRIB_SRC})
     find_library(MPS_CONTRIB_LIB MetalPerformanceShaders)
     list(APPEND TVM_RUNTIME_LINKER_LIBS ${MPS_CONTRIB_LIB})
diff --git a/cmake/modules/ROCM.cmake b/cmake/modules/ROCM.cmake
index a11133586cc0..b0874f3b27bc 100644
--- a/cmake/modules/ROCM.cmake
+++ b/cmake/modules/ROCM.cmake
@@ -37,14 +37,14 @@ if(USE_ROCM)
 
   if(USE_MIOPEN)
     message(STATUS "Build with MIOpen support")
-    file(GLOB MIOPEN_CONTRIB_SRCS src/contrib/miopen/*.cc)
+    file(GLOB MIOPEN_CONTRIB_SRCS src/runtime/contrib/miopen/*.cc)
     list(APPEND RUNTIME_SRCS ${MIOPEN_CONTRIB_SRCS})
     list(APPEND TVM_RUNTIME_LINKER_LIBS ${ROCM_MIOPEN_LIBRARY})
   endif(USE_MIOPEN)
 
   if(USE_ROCBLAS)
     message(STATUS "Build with RocBLAS support")
-    file(GLOB ROCBLAS_CONTRIB_SRCS src/contrib/rocblas/*.cc)
+    file(GLOB ROCBLAS_CONTRIB_SRCS src/runtime/contrib/rocblas/*.cc)
     list(APPEND RUNTIME_SRCS ${ROCBLAS_CONTRIB_SRCS})
     list(APPEND TVM_RUNTIME_LINKER_LIBS ${ROCM_ROCBLAS_LIBRARY})
   endif(USE_ROCBLAS)
diff --git a/cmake/modules/contrib/BLAS.cmake b/cmake/modules/contrib/BLAS.cmake
index 2efe877ec034..6a5828749762 100644
--- a/cmake/modules/contrib/BLAS.cmake
+++ b/cmake/modules/contrib/BLAS.cmake
@@ -16,7 +16,7 @@
 # under the License.
 
 # Plugin rules for cblas
-file(GLOB CBLAS_CONTRIB_SRC src/contrib/cblas/*.cc)
+file(GLOB CBLAS_CONTRIB_SRC src/runtime/contrib/cblas/*.cc)
 
 if(USE_BLAS STREQUAL "openblas")
   find_library(BLAS_LIBRARY openblas)
diff --git a/cmake/modules/contrib/NNPack.cmake b/cmake/modules/contrib/NNPack.cmake
index 078efec45553..3b289d636dae 100644
--- a/cmake/modules/contrib/NNPack.cmake
+++ b/cmake/modules/contrib/NNPack.cmake
@@ -20,7 +20,7 @@ if(USE_NNPACK)
     set(NNPACK_PATH ${CMAKE_CURRENT_SOURCE_DIR}/NNPack)
   endif()
 	set(PTHREAD_POOL_PATH ${NNPACK_PATH}/deps/pthreadpool)
-  file(GLOB NNPACK_CONTRIB_SRC src/contrib/nnpack/*.cc)
+  file(GLOB NNPACK_CONTRIB_SRC src/runtime/contrib/nnpack/*.cc)
   list(APPEND RUNTIME_SRCS ${NNPACK_CONTRIB_SRC})
 	include_directories(${NNPACK_PATH}/include)
 	include_directories(${PTHREAD_POOL_PATH}/include)
diff --git a/cmake/modules/contrib/Random.cmake b/cmake/modules/contrib/Random.cmake
index 1b28ec3b6945..dae2807fd6a5 100644
--- a/cmake/modules/contrib/Random.cmake
+++ b/cmake/modules/contrib/Random.cmake
@@ -17,6 +17,6 @@
 
 if(USE_RANDOM)
   message(STATUS "Build with contrib.random")
-  file(GLOB RANDOM_CONTRIB_SRC src/contrib/random/random.cc)
+  file(GLOB RANDOM_CONTRIB_SRC src/runtime/contrib/random/random.cc)
   list(APPEND RUNTIME_SRCS ${RANDOM_CONTRIB_SRC})
 endif(USE_RANDOM)
diff --git a/cmake/modules/contrib/Sort.cmake b/cmake/modules/contrib/Sort.cmake
index 52edd3851d36..5537e487ae23 100644
--- a/cmake/modules/contrib/Sort.cmake
+++ b/cmake/modules/contrib/Sort.cmake
@@ -17,6 +17,6 @@
 
 if(USE_SORT)
   message(STATUS "Build with contrib.sort")
-  file(GLOB SORT_CONTRIB_SRC src/contrib/sort/*.cc)
+  file(GLOB SORT_CONTRIB_SRC src/runtime/contrib/sort/*.cc)
   list(APPEND RUNTIME_SRCS ${SORT_CONTRIB_SRC})
 endif(USE_SORT)
diff --git a/src/contrib/cblas/cblas.cc b/src/runtime/contrib/cblas/cblas.cc
similarity index 99%
rename from src/contrib/cblas/cblas.cc
rename to src/runtime/contrib/cblas/cblas.cc
index 0f222e2f2a39..c6558673c108 100644
--- a/src/contrib/cblas/cblas.cc
+++ b/src/runtime/contrib/cblas/cblas.cc
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external cblas library call.
  */
 #include <dmlc/logging.h>
diff --git a/src/contrib/cblas/gemm_common.h b/src/runtime/contrib/cblas/gemm_common.h
similarity index 99%
rename from src/contrib/cblas/gemm_common.h
rename to src/runtime/contrib/cblas/gemm_common.h
index 2bcefb2f26bb..eff631d7e6c2 100644
--- a/src/contrib/cblas/gemm_common.h
+++ b/src/runtime/contrib/cblas/gemm_common.h
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2018 by Contributors
  * \file tvm/contrib/gemm.h
  * \brief Shared implementation of gemm
  */
diff --git a/src/contrib/cublas/cublas.cc b/src/runtime/contrib/cublas/cublas.cc
similarity index 99%
rename from src/contrib/cublas/cublas.cc
rename to src/runtime/contrib/cublas/cublas.cc
index 5cee5be28bec..f605b7c27af7 100644
--- a/src/contrib/cublas/cublas.cc
+++ b/src/runtime/contrib/cublas/cublas.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2018 by Contributors
  * \file Use external cblas library call.
  */
 #include <tvm/runtime/registry.h>
diff --git a/src/contrib/cublas/cublas_utils.cc b/src/runtime/contrib/cublas/cublas_utils.cc
similarity index 94%
rename from src/contrib/cublas/cublas_utils.cc
rename to src/runtime/contrib/cublas/cublas_utils.cc
index 086c20868e45..9953cda32379 100644
--- a/src/contrib/cublas/cublas_utils.cc
+++ b/src/runtime/contrib/cublas/cublas_utils.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,13 +18,12 @@
  */
 
 /*!
- *  Copyright (c) 2018 by Contributors
  * \file Use external cudnn utils function
  */
 #include "cublas_utils.h"
 #include <dmlc/thread_local.h>
 #include <tvm/runtime/registry.h>
-#include "../../runtime/cuda/cuda_common.h"
+#include "../../cuda/cuda_common.h"
 
 namespace tvm {
 namespace contrib {
diff --git a/src/contrib/cublas/cublas_utils.h b/src/runtime/contrib/cublas/cublas_utils.h
similarity index 93%
rename from src/contrib/cublas/cublas_utils.h
rename to src/runtime/contrib/cublas/cublas_utils.h
index 8a91373d7e4f..bc677ff69795 100644
--- a/src/contrib/cublas/cublas_utils.h
+++ b/src/runtime/contrib/cublas/cublas_utils.h
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -22,8 +22,8 @@
  * \file Use external cudnn utils function
  */
 
-#ifndef TVM_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
-#define TVM_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
+#ifndef TVM_RUNTIME_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
+#define TVM_RUNTIME_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
 
 #include <dmlc/logging.h>
 
@@ -67,4 +67,4 @@ struct CuBlasThreadEntry {
 }  // namespace contrib
 }  // namespace tvm
 
-#endif  // TVM_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
+#endif  // TVM_RUNTIME_CONTRIB_CUBLAS_CUBLAS_UTILS_H_
diff --git a/src/contrib/cudnn/conv_forward.cc b/src/runtime/contrib/cudnn/conv_forward.cc
similarity index 99%
rename from src/contrib/cudnn/conv_forward.cc
rename to src/runtime/contrib/cudnn/conv_forward.cc
index c4d8b37a4906..b1c4d9f38e97 100644
--- a/src/contrib/cudnn/conv_forward.cc
+++ b/src/runtime/contrib/cudnn/conv_forward.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external cudnn utils function
  */
 #include <tvm/runtime/registry.h>
diff --git a/src/contrib/cudnn/cudnn_utils.cc b/src/runtime/contrib/cudnn/cudnn_utils.cc
similarity index 98%
rename from src/contrib/cudnn/cudnn_utils.cc
rename to src/runtime/contrib/cudnn/cudnn_utils.cc
index 75bfc1333162..fa185e97d1f5 100644
--- a/src/contrib/cudnn/cudnn_utils.cc
+++ b/src/runtime/contrib/cudnn/cudnn_utils.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external cudnn utils function
  */
 #include "cudnn_utils.h"
diff --git a/src/contrib/cudnn/cudnn_utils.h b/src/runtime/contrib/cudnn/cudnn_utils.h
similarity index 92%
rename from src/contrib/cudnn/cudnn_utils.h
rename to src/runtime/contrib/cudnn/cudnn_utils.h
index c753854c3b78..8538f5100445 100644
--- a/src/contrib/cudnn/cudnn_utils.h
+++ b/src/runtime/contrib/cudnn/cudnn_utils.h
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,17 +18,16 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external cudnn utils function
  */
 
-#ifndef TVM_CONTRIB_CUDNN_CUDNN_UTILS_H_
-#define TVM_CONTRIB_CUDNN_CUDNN_UTILS_H_
+#ifndef TVM_RUNTIME_CONTRIB_CUDNN_CUDNN_UTILS_H_
+#define TVM_RUNTIME_CONTRIB_CUDNN_CUDNN_UTILS_H_
 
 #include <dmlc/logging.h>
 #include <cudnn.h>
 #include <tvm/runtime/device_api.h>
-#include "../../runtime/cuda/cuda_common.h"
+#include "../../cuda/cuda_common.h"
 
 
 namespace tvm {
@@ -90,4 +89,4 @@ struct CuDNNThreadEntry {
 }  // namespace contrib
 }  // namespace tvm
 
-#endif  // TVM_CONTRIB_CUDNN_CUDNN_UTILS_H_
+#endif  // TVM_RUNTIME_CONTRIB_CUDNN_CUDNN_UTILS_H_
diff --git a/src/contrib/miopen/conv_forward.cc b/src/runtime/contrib/miopen/conv_forward.cc
similarity index 99%
rename from src/contrib/miopen/conv_forward.cc
rename to src/runtime/contrib/miopen/conv_forward.cc
index 6479d7d0906a..5094cef60f92 100644
--- a/src/contrib/miopen/conv_forward.cc
+++ b/src/runtime/contrib/miopen/conv_forward.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external miopen utils function
  */
 #include <tvm/runtime/registry.h>
diff --git a/src/contrib/miopen/miopen_utils.cc b/src/runtime/contrib/miopen/miopen_utils.cc
similarity index 98%
rename from src/contrib/miopen/miopen_utils.cc
rename to src/runtime/contrib/miopen/miopen_utils.cc
index 8faa4bdfee4e..330ccdd043d0 100644
--- a/src/contrib/miopen/miopen_utils.cc
+++ b/src/runtime/contrib/miopen/miopen_utils.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,7 +18,6 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external miopen utils function
  */
 #include "miopen_utils.h"
diff --git a/src/contrib/miopen/miopen_utils.h b/src/runtime/contrib/miopen/miopen_utils.h
similarity index 91%
rename from src/contrib/miopen/miopen_utils.h
rename to src/runtime/contrib/miopen/miopen_utils.h
index 8f65fc7b28be..8831e4fac95c 100644
--- a/src/contrib/miopen/miopen_utils.h
+++ b/src/runtime/contrib/miopen/miopen_utils.h
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,18 +18,17 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external miopen utils function
  */
 
-#ifndef TVM_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
-#define TVM_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
+#ifndef TVM_RUNTIME_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
+#define TVM_RUNTIME_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
 
 #include <dmlc/logging.h>
 #include <miopen/miopen.h>
 #include <tvm/runtime/device_api.h>
 #include <string>
-#include "../../runtime/rocm/rocm_common.h"
+#include "../../rocm/rocm_common.h"
 
 namespace tvm {
 namespace contrib {
@@ -75,4 +74,4 @@ struct MIOpenThreadEntry {
 }  // namespace contrib
 }  // namespace tvm
 
-#endif  // TVM_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
+#endif  // TVM_RUNTIME_CONTRIB_MIOPEN_MIOPEN_UTILS_H_
diff --git a/src/contrib/mps/conv.mm b/src/runtime/contrib/mps/conv.mm
similarity index 100%
rename from src/contrib/mps/conv.mm
rename to src/runtime/contrib/mps/conv.mm
diff --git a/src/contrib/mps/gemm.mm b/src/runtime/contrib/mps/gemm.mm
similarity index 100%
rename from src/contrib/mps/gemm.mm
rename to src/runtime/contrib/mps/gemm.mm
diff --git a/src/contrib/mps/mps_utils.h b/src/runtime/contrib/mps/mps_utils.h
similarity index 89%
rename from src/contrib/mps/mps_utils.h
rename to src/runtime/contrib/mps/mps_utils.h
index 99288a8928d8..728646c537b9 100644
--- a/src/contrib/mps/mps_utils.h
+++ b/src/runtime/contrib/mps/mps_utils.h
@@ -18,12 +18,11 @@
  */
 
 /*!
- *  Copyright (c) 2017 by Contributors
  * \file Use external mps utils function
  */
 
-#ifndef TVM_CONTRIB_MPS_MPS_UTILS_H_
-#define TVM_CONTRIB_MPS_MPS_UTILS_H_
+#ifndef TVM_RUNTIME_CONTRIB_MPS_MPS_UTILS_H_
+#define TVM_RUNTIME_CONTRIB_MPS_MPS_UTILS_H_
 
 #import <MetalPerformanceShaders/MetalPerformanceShaders.h>
 #include <dmlc/logging.h>
@@ -32,7 +31,7 @@
 #include <tvm/runtime/registry.h>
 #include <tvm/runtime/util.h>
 #include <vector>
-#include "../../runtime/metal/metal_common.h"
+#include "../../metal/metal_common.h"
 
 namespace tvm {
 namespace contrib {
@@ -56,4 +55,4 @@ struct MetalThreadEntry {
 }  // namespace contrib
 }  // namespace tvm
 
-#endif  // TVM_CONTRIB_MPS_MPS_UTILS_H_
+#endif  // TVM_RUNTIME_CONTRIB_MPS_MPS_UTILS_H_
diff --git a/src/contrib/mps/mps_utils.mm b/src/runtime/contrib/mps/mps_utils.mm
similarity index 100%
rename from src/contrib/mps/mps_utils.mm
rename to src/runtime/contrib/mps/mps_utils.mm
diff --git a/src/contrib/nnpack/convolution.cc b/src/runtime/contrib/nnpack/convolution.cc
similarity index 100%
rename from src/contrib/nnpack/convolution.cc
rename to src/runtime/contrib/nnpack/convolution.cc
diff --git a/src/contrib/nnpack/fully_connected.cc b/src/runtime/contrib/nnpack/fully_connected.cc
similarity index 100%
rename from src/contrib/nnpack/fully_connected.cc
rename to src/runtime/contrib/nnpack/fully_connected.cc
diff --git a/src/contrib/nnpack/nnpack_utils.cc b/src/runtime/contrib/nnpack/nnpack_utils.cc
similarity index 100%
rename from src/contrib/nnpack/nnpack_utils.cc
rename to src/runtime/contrib/nnpack/nnpack_utils.cc
diff --git a/src/contrib/nnpack/nnpack_utils.h b/src/runtime/contrib/nnpack/nnpack_utils.h
similarity index 88%
rename from src/contrib/nnpack/nnpack_utils.h
rename to src/runtime/contrib/nnpack/nnpack_utils.h
index 9491802ca8a5..8e936fcd716a 100644
--- a/src/contrib/nnpack/nnpack_utils.h
+++ b/src/runtime/contrib/nnpack/nnpack_utils.h
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -21,8 +21,8 @@
  *  Copyright (c) 2017 by Contributors
  * \file Use external nnpack library call.
  */
-#ifndef TVM_CONTRIB_NNPACK_NNPACK_UTILS_H_
-#define TVM_CONTRIB_NNPACK_NNPACK_UTILS_H_
+#ifndef TVM_RUNTIME_CONTRIB_NNPACK_NNPACK_UTILS_H_
+#define TVM_RUNTIME_CONTRIB_NNPACK_NNPACK_UTILS_H_
 #include <tvm/runtime/registry.h>
 #include <tvm/runtime/util.h>
 #include <dmlc/thread_local.h>
@@ -41,4 +41,4 @@ struct NNPackThreadLocalEntry {
 bool NNPackConfig(uint64_t nthreads);
 }  // namespace contrib
 }  // namespace tvm
-#endif  // TVM_CONTRIB_NNPACK_NNPACK_UTILS_H_
+#endif  // TVM_RUNTIME_CONTRIB_NNPACK_NNPACK_UTILS_H_
diff --git a/src/contrib/random/mt_random_engine.cc b/src/runtime/contrib/random/mt_random_engine.cc
similarity index 100%
rename from src/contrib/random/mt_random_engine.cc
rename to src/runtime/contrib/random/mt_random_engine.cc
diff --git a/src/contrib/random/random.cc b/src/runtime/contrib/random/random.cc
similarity index 100%
rename from src/contrib/random/random.cc
rename to src/runtime/contrib/random/random.cc
diff --git a/src/contrib/random/sgx_random_engine.cc b/src/runtime/contrib/random/sgx_random_engine.cc
similarity index 99%
rename from src/contrib/random/sgx_random_engine.cc
rename to src/runtime/contrib/random/sgx_random_engine.cc
index 98e2b616bb69..8134c54dbe29 100644
--- a/src/contrib/random/sgx_random_engine.cc
+++ b/src/runtime/contrib/random/sgx_random_engine.cc
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -26,7 +26,7 @@
 #include <sgx_trts.h>
 #include <algorithm>
 #include <cmath>
-#include "../../runtime/sgx/common.h"
+#include "../../sgx/common.h"
 
 namespace tvm {
 namespace contrib {
diff --git a/src/contrib/rocblas/rocblas.cc b/src/runtime/contrib/rocblas/rocblas.cc
similarity index 100%
rename from src/contrib/rocblas/rocblas.cc
rename to src/runtime/contrib/rocblas/rocblas.cc
diff --git a/src/contrib/sort/sort.cc b/src/runtime/contrib/sort/sort.cc
similarity index 100%
rename from src/contrib/sort/sort.cc
rename to src/runtime/contrib/sort/sort.cc