Move libs/support/tflite to libs/tflite (#3920)

Move libs/support/tflite to libs/tflite
Update header include path

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

106 files changed, 287 insertions, 288 deletions

diff --git a/contrib/tf_test/tf_test.cpp b/contrib/tf_test/tf_test.cpp
index 7597a9aea..56ec1d2a9 100644
--- a/contrib/tf_test/tf_test.cpp
+++ b/contrib/tf_test/tf_test.cpp
@@ -17,11 +17,11 @@
 #include <tensorflow/contrib/lite/model.h>
 #include <tensorflow/core/public/session.h>
 
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
-#include "support/tflite/kernels/register.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
+#include "tflite/kernels/register.h"
 
 #include "util/fp32.h"
 
diff --git a/contrib/tflite_classify/src/InferenceInterface.h b/contrib/tflite_classify/src/InferenceInterface.h
index 2f01190bd..b15a0444f 100644
--- a/contrib/tflite_classify/src/InferenceInterface.h
+++ b/contrib/tflite_classify/src/InferenceInterface.h
@@ -23,11 +23,11 @@
 #ifndef __TFLITE_CLASSIFY_INFERENCE_INTERFACE_H__
 #define __TFLITE_CLASSIFY_INFERENCE_INTERFACE_H__
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
 
 #include <iostream>
 #include <string>
diff --git a/libs/support/CMakeLists.txt b/libs/support/CMakeLists.txt
deleted file mode 100644
index 3e0ecbb06..000000000
--- a/libs/support/CMakeLists.txt
+++ /dev/null
@@ -1 +0,0 @@
-add_subdirectory(tflite)
diff --git a/libs/support/tflite/CMakeLists.txt b/libs/tflite/CMakeLists.txt
index c2534812b..78193b12b 100644
--- a/libs/support/tflite/CMakeLists.txt
+++ b/libs/tflite/CMakeLists.txt
@@ -4,7 +4,7 @@ list(REMOVE_ITEM SOURCES ${TESTS})
 
 add_library(nnfw_support_tflite STATIC ${SOURCES})
 set_target_properties(nnfw_support_tflite PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/support/include)
+target_include_directories(nnfw_support_tflite PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR}/include)
 target_link_libraries(nnfw_support_tflite tensorflow-lite ${LIB_PTHREAD} dl)
 target_link_libraries(nnfw_support_tflite static_nnfw_util)
 
diff --git a/libs/support/include/support/tflite/Assert.h b/libs/tflite/include/tflite/Assert.h
index ee1956832..ee1956832 100644
--- a/libs/support/include/support/tflite/Assert.h
+++ b/libs/tflite/include/tflite/Assert.h
diff --git a/libs/support/include/support/tflite/Diff.h b/libs/tflite/include/tflite/Diff.h
index 29d5ae6bd..45b7c9ea5 100644
--- a/libs/support/include/support/tflite/Diff.h
+++ b/libs/tflite/include/tflite/Diff.h
@@ -30,7 +30,7 @@
 #include "util/tensor/Shape.h"
 #include "util/tensor/Comparator.h"
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <functional>
 #include <vector>
@@ -84,8 +84,8 @@ private:
   const nnfw::util::tensor::Comparator &_comparator;
 };
 
-#include "support/tflite/interp/Builder.h"
-#include "support/tflite/Quantization.h"
+#include "tflite/interp/Builder.h"
+#include "tflite/Quantization.h"
 
 #include <random>
 
diff --git a/libs/support/include/support/tflite/FeatureView.h b/libs/tflite/include/tflite/FeatureView.h
index 29a6d7b3e..b7266cacb 100644
--- a/libs/support/include/support/tflite/FeatureView.h
+++ b/libs/tflite/include/tflite/FeatureView.h
@@ -25,8 +25,8 @@
 
 #include "tensorflow/contrib/lite/interpreter.h"
 
-#include "support/tflite/InputIndex.h"
-#include "support/tflite/OutputIndex.h"
+#include "tflite/InputIndex.h"
+#include "tflite/OutputIndex.h"
 
 #include "util/feature/Shape.h"
 #include "util/feature/Reader.h"
diff --git a/libs/support/include/support/tflite/InputIndex.h b/libs/tflite/include/tflite/InputIndex.h
index 3c668858f..3c668858f 100644
--- a/libs/support/include/support/tflite/InputIndex.h
+++ b/libs/tflite/include/tflite/InputIndex.h
diff --git a/libs/support/include/support/tflite/InterpreterSession.h b/libs/tflite/include/tflite/InterpreterSession.h
index 70bac22e6..70bac22e6 100644
--- a/libs/support/include/support/tflite/InterpreterSession.h
+++ b/libs/tflite/include/tflite/InterpreterSession.h
diff --git a/libs/support/include/support/tflite/NNAPISession.h b/libs/tflite/include/tflite/NNAPISession.h
index d6ad46bbc..1c5e501af 100644
--- a/libs/support/include/support/tflite/NNAPISession.h
+++ b/libs/tflite/include/tflite/NNAPISession.h
@@ -24,7 +24,7 @@
 #define __NNFW_SUPPORT_TFLITE_NNAPI_SESSION_H__
 
 #include "Session.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 
 namespace nnfw
 {
diff --git a/libs/support/include/support/tflite/OutputIndex.h b/libs/tflite/include/tflite/OutputIndex.h
index d43841693..d43841693 100644
--- a/libs/support/include/support/tflite/OutputIndex.h
+++ b/libs/tflite/include/tflite/OutputIndex.h
diff --git a/libs/support/include/support/tflite/Quantization.h b/libs/tflite/include/tflite/Quantization.h
index fb1b675b9..fb1b675b9 100644
--- a/libs/support/include/support/tflite/Quantization.h
+++ b/libs/tflite/include/tflite/Quantization.h
diff --git a/libs/support/include/support/tflite/Session.h b/libs/tflite/include/tflite/Session.h
index 038520889..038520889 100644
--- a/libs/support/include/support/tflite/Session.h
+++ b/libs/tflite/include/tflite/Session.h
diff --git a/libs/support/include/support/tflite/TensorLogger.h b/libs/tflite/include/tflite/TensorLogger.h
index e124caecc..9af5ffe90 100644
--- a/libs/support/include/support/tflite/TensorLogger.h
+++ b/libs/tflite/include/tflite/TensorLogger.h
@@ -24,7 +24,7 @@
 #define __NNFW_SUPPORT_TFLITE_TENSOR_LOGGER_H__
 
 #include "util/tensor/IndexIterator.h"
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <tensorflow/contrib/lite/interpreter.h>
 #include <tensorflow/contrib/lite/context.h>
diff --git a/libs/support/include/support/tflite/TensorShapeUtils.h b/libs/tflite/include/tflite/TensorShapeUtils.h
index 99b90e9a8..99b90e9a8 100644
--- a/libs/support/include/support/tflite/TensorShapeUtils.h
+++ b/libs/tflite/include/tflite/TensorShapeUtils.h
diff --git a/libs/support/include/support/tflite/TensorUtils.h b/libs/tflite/include/tflite/TensorUtils.h
index b45445321..b45445321 100644
--- a/libs/support/include/support/tflite/TensorUtils.h
+++ b/libs/tflite/include/tflite/TensorUtils.h
diff --git a/libs/support/include/support/tflite/TensorView.h b/libs/tflite/include/tflite/TensorView.h
index 97216e497..97216e497 100644
--- a/libs/support/include/support/tflite/TensorView.h
+++ b/libs/tflite/include/tflite/TensorView.h
diff --git a/libs/support/include/support/tflite/interp/Builder.h b/libs/tflite/include/tflite/interp/Builder.h
index 8bfceb67d..8bfceb67d 100644
--- a/libs/support/include/support/tflite/interp/Builder.h
+++ b/libs/tflite/include/tflite/interp/Builder.h
diff --git a/libs/support/include/support/tflite/interp/FlatBufferBuilder.h b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
index f7e7b65cd..275868615 100644
--- a/libs/support/include/support/tflite/interp/FlatBufferBuilder.h
+++ b/libs/tflite/include/tflite/interp/FlatBufferBuilder.h
@@ -25,7 +25,7 @@
 
 #include <tensorflow/contrib/lite/model.h>
 
-#include "support/tflite/interp/Builder.h"
+#include "tflite/interp/Builder.h"
 
 namespace nnfw
 {
diff --git a/libs/support/include/support/tflite/interp/FunctionBuilder.h b/libs/tflite/include/tflite/interp/FunctionBuilder.h
index 0e2f368a5..bdf765ddc 100644
--- a/libs/support/include/support/tflite/interp/FunctionBuilder.h
+++ b/libs/tflite/include/tflite/interp/FunctionBuilder.h
@@ -25,7 +25,7 @@
 
 #include <tensorflow/contrib/lite/model.h>
 
-#include "support/tflite/interp/Builder.h"
+#include "tflite/interp/Builder.h"
 
 namespace nnfw
 {
diff --git a/libs/support/include/support/tflite/kernels/Abs.h b/libs/tflite/include/tflite/kernels/Abs.h
index aaf96ae7c..aaf96ae7c 100644
--- a/libs/support/include/support/tflite/kernels/Abs.h
+++ b/libs/tflite/include/tflite/kernels/Abs.h
diff --git a/libs/support/include/support/tflite/kernels/CustomOps.h b/libs/tflite/include/tflite/kernels/CustomOps.h
index fa33c7b2b..b106ca2ce 100644
--- a/libs/support/include/support/tflite/kernels/CustomOps.h
+++ b/libs/tflite/include/tflite/kernels/CustomOps.h
@@ -24,10 +24,10 @@
 #define __NNFW_SUPPORT_TFLITE_KERNELS_CUSTOM_OP_H__
 
 #include "tensorflow/contrib/lite/context.h"
-#include "support/tflite/kernels/TensorFlowMax.h"
-#include "support/tflite/kernels/SquaredDifference.h"
-#include "support/tflite/kernels/TensorFlowSum.h"
-#include "support/tflite/kernels/Abs.h"
+#include "tflite/kernels/TensorFlowMax.h"
+#include "tflite/kernels/SquaredDifference.h"
+#include "tflite/kernels/TensorFlowSum.h"
+#include "tflite/kernels/Abs.h"
 
 namespace tflite
 {
diff --git a/libs/support/include/support/tflite/kernels/SquaredDifference.h b/libs/tflite/include/tflite/kernels/SquaredDifference.h
index 0ceb83b0c..0ceb83b0c 100644
--- a/libs/support/include/support/tflite/kernels/SquaredDifference.h
+++ b/libs/tflite/include/tflite/kernels/SquaredDifference.h
diff --git a/libs/support/include/support/tflite/kernels/TensorFlowMax.h b/libs/tflite/include/tflite/kernels/TensorFlowMax.h
index 9cc821542..9cc821542 100644
--- a/libs/support/include/support/tflite/kernels/TensorFlowMax.h
+++ b/libs/tflite/include/tflite/kernels/TensorFlowMax.h
diff --git a/libs/support/include/support/tflite/kernels/TensorFlowSum.h b/libs/tflite/include/tflite/kernels/TensorFlowSum.h
index b1eff635d..b1eff635d 100644
--- a/libs/support/include/support/tflite/kernels/TensorFlowSum.h
+++ b/libs/tflite/include/tflite/kernels/TensorFlowSum.h
diff --git a/libs/support/include/support/tflite/kernels/register.h b/libs/tflite/include/tflite/kernels/register.h
index 389c35151..389c35151 100644
--- a/libs/support/include/support/tflite/kernels/register.h
+++ b/libs/tflite/include/tflite/kernels/register.h
diff --git a/libs/support/include/support/tflite/nnapi_delegate.h b/libs/tflite/include/tflite/nnapi_delegate.h
index b396d77f2..b396d77f2 100644
--- a/libs/support/include/support/tflite/nnapi_delegate.h
+++ b/libs/tflite/include/tflite/nnapi_delegate.h
diff --git a/libs/support/tflite/src/Diff.cpp b/libs/tflite/src/Diff.cpp
index 8d7082e55..f2b4254be 100644
--- a/libs/support/tflite/src/Diff.cpp
+++ b/libs/tflite/src/Diff.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/Diff.h"
+#include "tflite/nnapi_delegate.h"
 
 #include "util/fp32.h"
 
@@ -273,7 +273,7 @@ template <> uint8_t RandomGenerator::generate<uint8_t>(void)
   return static_cast<uint8_t>((_dist(_rand) - min_range) * type_range / (max_range - min_range));
 }
 
-#include "support/tflite/TensorLogger.h"
+#include "tflite/TensorLogger.h"
 //
 // Random Test Runner
 //
diff --git a/libs/support/tflite/src/FeatureView.cpp b/libs/tflite/src/FeatureView.cpp
index 4c7636780..7b226eddc 100644
--- a/libs/support/tflite/src/FeatureView.cpp
+++ b/libs/tflite/src/FeatureView.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "support/tflite/FeatureView.h"
-#include "support/tflite/TensorUtils.h"
+#include "tflite/FeatureView.h"
+#include "tflite/TensorUtils.h"
 
 #include <cassert>
 
diff --git a/libs/support/tflite/src/Quantization.cpp b/libs/tflite/src/Quantization.cpp
index b23204d41..9c162c342 100644
--- a/libs/support/tflite/src/Quantization.cpp
+++ b/libs/tflite/src/Quantization.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/Quantization.h"
+#include "tflite/Quantization.h"
 
 TfLiteQuantizationParams make_default_quantization(void)
 {
diff --git a/libs/support/tflite/src/TensorShapeUtils.cpp b/libs/tflite/src/TensorShapeUtils.cpp
index 611ba920e..3913748a8 100644
--- a/libs/support/tflite/src/TensorShapeUtils.cpp
+++ b/libs/tflite/src/TensorShapeUtils.cpp
@@ -1,4 +1,4 @@
-#include "support/tflite/TensorShapeUtils.h"
+#include "tflite/TensorShapeUtils.h"
 
 namespace nnfw
 {
diff --git a/libs/support/tflite/src/TensorView.test.cpp b/libs/tflite/src/TensorView.test.cpp
index 1d3a70500..0c461fe5a 100644
--- a/libs/support/tflite/src/TensorView.test.cpp
+++ b/libs/tflite/src/TensorView.test.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 #include <cassert>
 
diff --git a/libs/support/tflite/src/interp/FlatBufferBuilder.cpp b/libs/tflite/src/interp/FlatBufferBuilder.cpp
index 67df13f34..87e022c80 100644
--- a/libs/support/tflite/src/interp/FlatBufferBuilder.cpp
+++ b/libs/tflite/src/interp/FlatBufferBuilder.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "support/tflite/interp/FlatBufferBuilder.h"
+#include "tflite/interp/FlatBufferBuilder.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 
 namespace nnfw
 {
diff --git a/libs/support/tflite/src/interp/FunctionBuilder.cpp b/libs/tflite/src/interp/FunctionBuilder.cpp
index 65783bd37..c06d86d5d 100644
--- a/libs/support/tflite/src/interp/FunctionBuilder.cpp
+++ b/libs/tflite/src/interp/FunctionBuilder.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 namespace nnfw
 {
diff --git a/libs/support/tflite/src/kernels/Abs.cpp b/libs/tflite/src/kernels/Abs.cpp
index c8a16bbc7..87f09dec5 100644
--- a/libs/support/tflite/src/kernels/Abs.cpp
+++ b/libs/tflite/src/kernels/Abs.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/Abs.h"
+#include "tflite/kernels/Abs.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>
diff --git a/libs/support/tflite/src/kernels/SquaredDifference.cpp b/libs/tflite/src/kernels/SquaredDifference.cpp
index 25e10a8ed..fda743645 100644
--- a/libs/support/tflite/src/kernels/SquaredDifference.cpp
+++ b/libs/tflite/src/kernels/SquaredDifference.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/SquaredDifference.h"
+#include "tflite/kernels/SquaredDifference.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>
diff --git a/libs/support/tflite/src/kernels/TensorFlowMax.cpp b/libs/tflite/src/kernels/TensorFlowMax.cpp
index 4280b88b6..7a85bc8f8 100644
--- a/libs/support/tflite/src/kernels/TensorFlowMax.cpp
+++ b/libs/tflite/src/kernels/TensorFlowMax.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/TensorFlowMax.h"
+#include "tflite/kernels/TensorFlowMax.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>
diff --git a/libs/support/tflite/src/kernels/TensorFlowSum.cpp b/libs/tflite/src/kernels/TensorFlowSum.cpp
index c7a3803d8..1eba62f75 100644
--- a/libs/support/tflite/src/kernels/TensorFlowSum.cpp
+++ b/libs/tflite/src/kernels/TensorFlowSum.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/TensorFlowSum.h"
+#include "tflite/kernels/TensorFlowSum.h"
 #include "tensorflow/contrib/lite/kernels/kernel_util.h"
 
 #include <iostream>
diff --git a/libs/support/tflite/src/kernels/register.cpp b/libs/tflite/src/kernels/register.cpp
index ef138d8eb..9757e4a64 100644
--- a/libs/support/tflite/src/kernels/register.cpp
+++ b/libs/tflite/src/kernels/register.cpp
@@ -16,8 +16,8 @@ limitations under the License.
 
 // NOTE This code is derived from the following file (in TensorFlow)
 //        'externals/tensorflow/tensorflow/contrib/lite/kernels/register.cc'
-#include "support/tflite/kernels/register.h"
-#include "support/tflite/kernels/CustomOps.h"
+#include "tflite/kernels/register.h"
+#include "tflite/kernels/CustomOps.h"
 
 // TODO Use namespace nnfw
 namespace tflite
diff --git a/libs/support/tflite/src/nnapi_delegate.cpp b/libs/tflite/src/nnapi_delegate.cpp
index 55c52336e..759c16c88 100644
--- a/libs/support/tflite/src/nnapi_delegate.cpp
+++ b/libs/tflite/src/nnapi_delegate.cpp
@@ -19,7 +19,7 @@ limitations under the License.
 
 // NOTE This code is derived from the following file (in TensorFlow v1.12)
 //        'externals/tensorflow/tensorflow/contrib/lite/nnapi_delegate.cc'
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
diff --git a/libs/support/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc b/libs/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
index a91e4de60..a91e4de60 100644
--- a/libs/support/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
+++ b/libs/tflite/src/nnapi_delegate_ex_AddOpsAndParams_lambda.inc
diff --git a/tools/nnapi_quickcheck/tests/add_1.cpp b/tools/nnapi_quickcheck/tests/add_1.cpp
index 52aa2afa0..098b8591b 100644
--- a/tools/nnapi_quickcheck/tests/add_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_2.cpp b/tools/nnapi_quickcheck/tests/add_2.cpp
index 9b5b19c06..12851f1b0 100644
--- a/tools/nnapi_quickcheck/tests/add_2.cpp
+++ b/tools/nnapi_quickcheck/tests/add_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_3.cpp b/tools/nnapi_quickcheck/tests/add_3.cpp
index e692fe314..a7b2f436e 100644
--- a/tools/nnapi_quickcheck/tests/add_3.cpp
+++ b/tools/nnapi_quickcheck/tests/add_3.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/TensorShapeUtils.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/TensorShapeUtils.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_4.cpp b/tools/nnapi_quickcheck/tests/add_4.cpp
index e519f1731..217438fb1 100644
--- a/tools/nnapi_quickcheck/tests/add_4.cpp
+++ b/tools/nnapi_quickcheck/tests/add_4.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_5.cpp b/tools/nnapi_quickcheck/tests/add_5.cpp
index cacb5e42d..2f02c8292 100644
--- a/tools/nnapi_quickcheck/tests/add_5.cpp
+++ b/tools/nnapi_quickcheck/tests/add_5.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_6.cpp b/tools/nnapi_quickcheck/tests/add_6.cpp
index 245b7ad39..3af2c4af3 100644
--- a/tools/nnapi_quickcheck/tests/add_6.cpp
+++ b/tools/nnapi_quickcheck/tests/add_6.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_7.cpp b/tools/nnapi_quickcheck/tests/add_7.cpp
index 43d285c72..1ebf18e32 100644
--- a/tools/nnapi_quickcheck/tests/add_7.cpp
+++ b/tools/nnapi_quickcheck/tests/add_7.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_8.cpp b/tools/nnapi_quickcheck/tests/add_8.cpp
index ec11c3969..d4a5e4838 100644
--- a/tools/nnapi_quickcheck/tests/add_8.cpp
+++ b/tools/nnapi_quickcheck/tests/add_8.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_9.cpp b/tools/nnapi_quickcheck/tests/add_9.cpp
index f3cf02875..6c0cc2240 100644
--- a/tools/nnapi_quickcheck/tests/add_9.cpp
+++ b/tools/nnapi_quickcheck/tests/add_9.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/add_quan_1.cpp b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
index 45f0ba681..daf15e091 100644
--- a/tools/nnapi_quickcheck/tests/add_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/add_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
index c938ed690..e68cfc5b3 100644
--- a/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
index ba41c030c..b24733ab0 100644
--- a/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/avg_pool_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/cast_1.cpp b/tools/nnapi_quickcheck/tests/cast_1.cpp
index 01d49cd59..bf493d091 100644
--- a/tools/nnapi_quickcheck/tests/cast_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/cast_2.cpp b/tools/nnapi_quickcheck/tests/cast_2.cpp
index b0032210d..d85781d0c 100644
--- a/tools/nnapi_quickcheck/tests/cast_2.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
index 763ca940c..ede763701 100644
--- a/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
+++ b/tools/nnapi_quickcheck/tests/cast_q_to_f_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/concat_1.cpp b/tools/nnapi_quickcheck/tests/concat_1.cpp
index 77d670fed..cc14d083a 100644
--- a/tools/nnapi_quickcheck/tests/concat_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
index cd522b049..f804b819b 100644
--- a/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/concat_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/conv_1.cpp b/tools/nnapi_quickcheck/tests/conv_1.cpp
index 10046d1ce..57b6abdfd 100644
--- a/tools/nnapi_quickcheck/tests/conv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
index aebf2333a..025cccadd 100644
--- a/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/conv_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dconv_1.cpp b/tools/nnapi_quickcheck/tests/dconv_1.cpp
index bd0cacfd0..21d648331 100644
--- a/tools/nnapi_quickcheck/tests/dconv_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
index 43f305f06..7cb9383e4 100644
--- a/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dconv_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/dequantize_1.cpp b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
index fe310a11d..467392dc3 100644
--- a/tools/nnapi_quickcheck/tests/dequantize_1.cpp
+++ b/tools/nnapi_quickcheck/tests/dequantize_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/div_1.cpp b/tools/nnapi_quickcheck/tests/div_1.cpp
index ffa0d6cac..1fe0f7a28 100644
--- a/tools/nnapi_quickcheck/tests/div_1.cpp
+++ b/tools/nnapi_quickcheck/tests/div_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/div_2.cpp b/tools/nnapi_quickcheck/tests/div_2.cpp
index c836c259a..883167e95 100644
--- a/tools/nnapi_quickcheck/tests/div_2.cpp
+++ b/tools/nnapi_quickcheck/tests/div_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
index 57af253f5..ea5df23d2 100644
--- a/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_1.cpp
@@ -16,16 +16,16 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
index 1cb75fea0..c434d75f8 100644
--- a/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/fully_connected_quan_1.cpp
@@ -16,16 +16,16 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
 #include "env.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/gather_1.cpp b/tools/nnapi_quickcheck/tests/gather_1.cpp
index 0d5b30eb6..b916676c7 100644
--- a/tools/nnapi_quickcheck/tests/gather_1.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/gather_2.cpp b/tools/nnapi_quickcheck/tests/gather_2.cpp
index b3cb3c6ef..4b115685d 100644
--- a/tools/nnapi_quickcheck/tests/gather_2.cpp
+++ b/tools/nnapi_quickcheck/tests/gather_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
index dc6902d66..e9e3bc1f7 100644
--- a/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/logistic_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/max_pool_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
index bb538141d..07fa9ac5b 100644
--- a/tools/nnapi_quickcheck/tests/max_pool_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
index 5768ddde8..d241c43ba 100644
--- a/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/max_pool_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/mul_1.cpp b/tools/nnapi_quickcheck/tests/mul_1.cpp
index 3a4ae5c8e..cf7282bc7 100644
--- a/tools/nnapi_quickcheck/tests/mul_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/mul_2.cpp b/tools/nnapi_quickcheck/tests/mul_2.cpp
index b117cd602..734be8e3f 100644
--- a/tools/nnapi_quickcheck/tests/mul_2.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
index 7207a90fb..72903fe42 100644
--- a/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/mul_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,8 +24,8 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/relu1_1.cpp b/tools/nnapi_quickcheck/tests/relu1_1.cpp
index aeefe2f06..b729c50c3 100644
--- a/tools/nnapi_quickcheck/tests/relu1_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu1_1.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -23,9 +23,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu6_1.cpp b/tools/nnapi_quickcheck/tests/relu6_1.cpp
index 76bbe954c..cafbe8377 100644
--- a/tools/nnapi_quickcheck/tests/relu6_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
index fe849f955..3d8ce4f7c 100644
--- a/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu6_quan_1.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -23,9 +23,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_1.cpp b/tools/nnapi_quickcheck/tests/relu_1.cpp
index f754c3d8e..c7141ca6a 100644
--- a/tools/nnapi_quickcheck/tests/relu_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_2.cpp b/tools/nnapi_quickcheck/tests/relu_2.cpp
index c08764520..74ab113c2 100644
--- a/tools/nnapi_quickcheck/tests/relu_2.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_3.cpp b/tools/nnapi_quickcheck/tests/relu_3.cpp
index 6c41bc12a..f876e18ee 100644
--- a/tools/nnapi_quickcheck/tests/relu_3.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_3.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
index 59fe5d254..7bc6181ad 100644
--- a/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/relu_quan_1.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -23,9 +23,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/reshape_1.cpp b/tools/nnapi_quickcheck/tests/reshape_1.cpp
index 21d35a5ca..a35623ced 100644
--- a/tools/nnapi_quickcheck/tests/reshape_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
index 7f852fd80..fb1db77e7 100644
--- a/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/reshape_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
index 37d8ab525..3c7ce28b1 100644
--- a/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
+++ b/tools/nnapi_quickcheck/tests/resize_bilinear_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_quickcheck/tests/softmax_1.cpp b/tools/nnapi_quickcheck/tests/softmax_1.cpp
index 5e15b6169..b9cc6bf0f 100644
--- a/tools/nnapi_quickcheck/tests/softmax_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/softmax_2.cpp b/tools/nnapi_quickcheck/tests/softmax_2.cpp
index 489016af5..402435718 100644
--- a/tools/nnapi_quickcheck/tests/softmax_2.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
index 347262fa6..2c12e1104 100644
--- a/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
+++ b/tools/nnapi_quickcheck/tests/softmax_quan_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_1.cpp b/tools/nnapi_quickcheck/tests/split_1.cpp
index 742c5dbed..735a0777f 100644
--- a/tools/nnapi_quickcheck/tests/split_1.cpp
+++ b/tools/nnapi_quickcheck/tests/split_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_2.cpp b/tools/nnapi_quickcheck/tests/split_2.cpp
index d70e35ca7..0d4bf3e13 100644
--- a/tools/nnapi_quickcheck/tests/split_2.cpp
+++ b/tools/nnapi_quickcheck/tests/split_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_3.cpp b/tools/nnapi_quickcheck/tests/split_3.cpp
index 47359642d..eaa65bdc2 100644
--- a/tools/nnapi_quickcheck/tests/split_3.cpp
+++ b/tools/nnapi_quickcheck/tests/split_3.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/split_4.cpp b/tools/nnapi_quickcheck/tests/split_4.cpp
index d16e75d5c..394c392b6 100644
--- a/tools/nnapi_quickcheck/tests/split_4.cpp
+++ b/tools/nnapi_quickcheck/tests/split_4.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -25,9 +25,9 @@
 #include "util/environment.h"
 #include "util/feature/Shape.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <random>
diff --git a/tools/nnapi_quickcheck/tests/sub_1.cpp b/tools/nnapi_quickcheck/tests/sub_1.cpp
index 2734f525e..9e4ff4ce7 100644
--- a/tools/nnapi_quickcheck/tests/sub_1.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_2.cpp b/tools/nnapi_quickcheck/tests/sub_2.cpp
index 88e060847..2702edbf1 100644
--- a/tools/nnapi_quickcheck/tests/sub_2.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_2.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_3.cpp b/tools/nnapi_quickcheck/tests/sub_3.cpp
index fd2d4aaea..6122e2486 100644
--- a/tools/nnapi_quickcheck/tests/sub_3.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_3.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_4.cpp b/tools/nnapi_quickcheck/tests/sub_4.cpp
index 993acddce..28922fe4b 100644
--- a/tools/nnapi_quickcheck/tests/sub_4.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_4.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_5.cpp b/tools/nnapi_quickcheck/tests/sub_5.cpp
index 610be5754..e421a12c2 100644
--- a/tools/nnapi_quickcheck/tests/sub_5.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_5.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/sub_6.cpp b/tools/nnapi_quickcheck/tests/sub_6.cpp
index b9e37c8d7..00bfc5423 100644
--- a/tools/nnapi_quickcheck/tests/sub_6.cpp
+++ b/tools/nnapi_quickcheck/tests/sub_6.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/tanh_1.cpp b/tools/nnapi_quickcheck/tests/tanh_1.cpp
index 67847eceb..6a9a29933 100644
--- a/tools/nnapi_quickcheck/tests/tanh_1.cpp
+++ b/tools/nnapi_quickcheck/tests/tanh_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <iostream>
 #include <cassert>
diff --git a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
index bb9d8535e..4b145e5a7 100644
--- a/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
+++ b/tools/nnapi_quickcheck/tests/topk_v2_1.cpp
@@ -16,7 +16,7 @@
 
 #include "gtest/gtest.h"
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
@@ -24,9 +24,9 @@
 #include "memory.h"
 #include "util/environment.h"
 
-#include "support/tflite/Diff.h"
-#include "support/tflite/Quantization.h"
-#include "support/tflite/interp/FunctionBuilder.h"
+#include "tflite/Diff.h"
+#include "tflite/Quantization.h"
+#include "tflite/interp/FunctionBuilder.h"
 
 #include <chrono>
 #include <iostream>
diff --git a/tools/nnapi_test/src/nnapi_test.cc b/tools/nnapi_test/src/nnapi_test.cc
index 1f98bb07d..4a1908767 100644
--- a/tools/nnapi_test/src/nnapi_test.cc
+++ b/tools/nnapi_test/src/nnapi_test.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/interp/FlatBufferBuilder.h"
-#include "support/tflite/Diff.h"
+#include "tflite/interp/FlatBufferBuilder.h"
+#include "tflite/Diff.h"
 
 #include <iostream>
 #include <stdexcept>
diff --git a/tools/tflite_benchmark/src/tflite_benchmark.cc b/tools/tflite_benchmark/src/tflite_benchmark.cc
index 1726db30a..03e7760a6 100644
--- a/tools/tflite_benchmark/src/tflite_benchmark.cc
+++ b/tools/tflite_benchmark/src/tflite_benchmark.cc
@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
-#include "support/tflite/Diff.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
+#include "tflite/Diff.h"
 #include "util/tensor/IndexIterator.h"
 
 #include <boost/accumulators/accumulators.hpp>
diff --git a/tools/tflite_benchmark_model/benchmark_tflite_model.cc b/tools/tflite_benchmark_model/benchmark_tflite_model.cc
index 4d25e773e..a02cf538a 100644
--- a/tools/tflite_benchmark_model/benchmark_tflite_model.cc
+++ b/tools/tflite_benchmark_model/benchmark_tflite_model.cc
@@ -42,7 +42,7 @@ limitations under the License.
 #ifdef TFLITE_FLEX
 #include "tensorflow/contrib/lite/delegates/flex/delegate.h"
 #endif  // TFLITE_FLEX
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/op_resolver.h"
 #include "tensorflow/contrib/lite/string_util.h"
@@ -50,7 +50,7 @@ limitations under the License.
 
 // For profiling nnapi_delegate
 #include "util/profiling/profiling.h"
-#include "support/tflite/nnapi_delegate.h"
+#include "tflite/nnapi_delegate.h"
 
 namespace {
   nnfw::NNAPIDelegate nnfw_delegate_;
diff --git a/tools/tflite_examples/src/conv.cpp b/tools/tflite_examples/src/conv.cpp
index a647346ee..56f5d3eff 100644
--- a/tools/tflite_examples/src/conv.cpp
+++ b/tools/tflite_examples/src/conv.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 #include "tensorflow/contrib/lite/builtin_op_data.h"
 
diff --git a/tools/tflite_run/src/tensor_loader.h b/tools/tflite_run/src/tensor_loader.h
index f2a699185..2d4fdb7ee 100644
--- a/tools/tflite_run/src/tensor_loader.h
+++ b/tools/tflite_run/src/tensor_loader.h
@@ -6,7 +6,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "support/tflite/TensorView.h"
+#include "tflite/TensorView.h"
 
 namespace tflite
 {
diff --git a/tools/tflite_run/src/tflite_run.cc b/tools/tflite_run/src/tflite_run.cc
index 23a23809b..e737b13b3 100644
--- a/tools/tflite_run/src/tflite_run.cc
+++ b/tools/tflite_run/src/tflite_run.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "support/tflite/kernels/register.h"
+#include "tflite/kernels/register.h"
 #include "tensorflow/contrib/lite/model.h"
 
 #include "bin_image.h"
@@ -24,11 +24,11 @@
 #include "util/benchmark.h"
 #include "util/environment.h"
 #include "util/fp32.h"
-#include "support/tflite/Diff.h"
-#include "support/tflite/Assert.h"
-#include "support/tflite/Session.h"
-#include "support/tflite/InterpreterSession.h"
-#include "support/tflite/NNAPISession.h"
+#include "tflite/Diff.h"
+#include "tflite/Assert.h"
+#include "tflite/Session.h"
+#include "tflite/InterpreterSession.h"
+#include "tflite/NNAPISession.h"
 #include "util/tensor/IndexIterator.h"
 
 #include <iostream>