diff --git a/CMakeLists.txt b/CMakeLists.txt
index a25551e707..9981c6563d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -95,7 +95,7 @@ enable_testing()
 set (EXAMPLE_DIRECTORY ${CMAKE_SOURCE_DIR}/examples)
 
 add_subdirectory(c++)
-add_subdirectory(tools-c++)
+add_subdirectory(tools)
 
 # Add another target called test-out that prints the results on failure
 if (CMAKE_CONFIGURATION_TYPES)
diff --git a/c++/src/orc/Adaptor.hh.in b/c++/src/Adaptor.hh.in
similarity index 100%
rename from c++/src/orc/Adaptor.hh.in
rename to c++/src/Adaptor.hh.in
diff --git a/c++/src/orc/ByteRLE.cc b/c++/src/ByteRLE.cc
similarity index 100%
rename from c++/src/orc/ByteRLE.cc
rename to c++/src/ByteRLE.cc
diff --git a/c++/src/orc/ByteRLE.hh b/c++/src/ByteRLE.hh
similarity index 100%
rename from c++/src/orc/ByteRLE.hh
rename to c++/src/ByteRLE.hh
diff --git a/c++/src/orc/C09Adapter.cc b/c++/src/C09Adapter.cc
similarity index 100%
rename from c++/src/orc/C09Adapter.cc
rename to c++/src/C09Adapter.cc
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index b1ed10ac7c..b7b52600db 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -82,8 +82,8 @@ CHECK_CXX_SOURCE_RUNS("
 )
 
 configure_file (
-  "orc/Adaptor.hh.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/orc/Adaptor.hh"
+  "Adaptor.hh.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"
   )
 
 include_directories (
@@ -104,23 +104,23 @@ add_custom_command(OUTPUT orc_proto.pb.h orc_proto.pb.cc
 )
 
 add_library (orc STATIC
-  "${CMAKE_CURRENT_BINARY_DIR}/orc/Adaptor.hh"
+  "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"
   orc_proto.pb.h
   wrap/orc-proto-wrapper.cc
-  orc/ByteRLE.cc
-  orc/ColumnPrinter.cc
-  orc/ColumnReader.cc
-  orc/Compression.cc
-  orc/Exceptions.cc
-  orc/Int128.cc
-  orc/MemoryPool.cc
-  orc/OrcFile.cc
-  orc/Reader.cc
-  orc/RLEv1.cc
-  orc/RLEv2.cc
-  orc/RLE.cc
-  orc/TypeImpl.cc
-  orc/Vector.cc
+  ByteRLE.cc
+  ColumnPrinter.cc
+  ColumnReader.cc
+  Compression.cc
+  Exceptions.cc
+  Int128.cc
+  MemoryPool.cc
+  OrcFile.cc
+  Reader.cc
+  RLEv1.cc
+  RLEv2.cc
+  RLE.cc
+  TypeImpl.cc
+  Vector.cc
   )
 
 install(TARGETS orc DESTINATION lib)
diff --git a/c++/src/orc/ColumnPrinter.cc b/c++/src/ColumnPrinter.cc
similarity index 99%
rename from c++/src/orc/ColumnPrinter.cc
rename to c++/src/ColumnPrinter.cc
index 3fd95e544f..190441c2bb 100644
--- a/c++/src/orc/ColumnPrinter.cc
+++ b/c++/src/ColumnPrinter.cc
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
 #include "orc/ColumnPrinter.hh"
 #include "orc/orc-config.hh"
 
+#include "Adaptor.hh"
+
 #include <limits>
 #include <sstream>
 #include <stdexcept>
diff --git a/c++/src/orc/ColumnReader.cc b/c++/src/ColumnReader.cc
similarity index 99%
rename from c++/src/orc/ColumnReader.cc
rename to c++/src/ColumnReader.cc
index 0b6a9cb163..78fb15f4eb 100644
--- a/c++/src/orc/ColumnReader.cc
+++ b/c++/src/ColumnReader.cc
@@ -16,11 +16,12 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
+#include "orc/Int128.hh"
+
+#include "Adaptor.hh"
 #include "ByteRLE.hh"
 #include "ColumnReader.hh"
 #include "Exceptions.hh"
-#include "orc/Int128.hh"
 #include "RLE.hh"
 
 #include <math.h>
diff --git a/c++/src/orc/ColumnReader.hh b/c++/src/ColumnReader.hh
similarity index 100%
rename from c++/src/orc/ColumnReader.hh
rename to c++/src/ColumnReader.hh
diff --git a/c++/src/orc/Compression.cc b/c++/src/Compression.cc
similarity index 99%
rename from c++/src/orc/Compression.cc
rename to c++/src/Compression.cc
index bc1c11a2e2..c9229ed028 100644
--- a/c++/src/orc/Compression.cc
+++ b/c++/src/Compression.cc
@@ -16,7 +16,6 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
 #include "Compression.hh"
 #include "Exceptions.hh"
 
diff --git a/c++/src/orc/Compression.hh b/c++/src/Compression.hh
similarity index 99%
rename from c++/src/orc/Compression.hh
rename to c++/src/Compression.hh
index ac9c0949eb..f35b60bcc2 100644
--- a/c++/src/orc/Compression.hh
+++ b/c++/src/Compression.hh
@@ -19,8 +19,9 @@
 #ifndef ORC_COMPRESSION_HH
 #define ORC_COMPRESSION_HH
 
-#include "orc/Adaptor.hh"
 #include "orc/OrcFile.hh"
+
+#include "Adaptor.hh"
 #include "wrap/zero-copy-stream-wrapper.h"
 
 #include <list>
diff --git a/c++/src/orc/Exceptions.cc b/c++/src/Exceptions.cc
similarity index 100%
rename from c++/src/orc/Exceptions.cc
rename to c++/src/Exceptions.cc
diff --git a/c++/src/orc/Exceptions.hh b/c++/src/Exceptions.hh
similarity index 98%
rename from c++/src/orc/Exceptions.hh
rename to c++/src/Exceptions.hh
index ae23181b31..470608586e 100644
--- a/c++/src/orc/Exceptions.hh
+++ b/c++/src/Exceptions.hh
@@ -19,7 +19,7 @@
 #ifndef ORC_EXCEPTIONS_HH
 #define ORC_EXCEPTIONS_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 #include <stdexcept>
 #include <string>
diff --git a/c++/src/orc/Int128.cc b/c++/src/Int128.cc
similarity index 99%
rename from c++/src/orc/Int128.cc
rename to c++/src/Int128.cc
index 75cff49826..ece78505b8 100644
--- a/c++/src/orc/Int128.cc
+++ b/c++/src/Int128.cc
@@ -17,7 +17,7 @@
  */
 
 #include "orc/Int128.hh"
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 #include <iomanip>
 #include <iostream>
diff --git a/c++/src/orc/MemoryPool.cc b/c++/src/MemoryPool.cc
similarity index 99%
rename from c++/src/orc/MemoryPool.cc
rename to c++/src/MemoryPool.cc
index 98aa296dd3..28cc9e1dee 100644
--- a/c++/src/orc/MemoryPool.cc
+++ b/c++/src/MemoryPool.cc
@@ -16,10 +16,11 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
 #include "orc/Int128.hh"
 #include "orc/MemoryPool.hh"
 
+#include "Adaptor.hh"
+
 #include <cstdlib>
 #include <iostream>
 #include <string.h>
diff --git a/c++/src/orc/OrcFile.cc b/c++/src/OrcFile.cc
similarity index 99%
rename from c++/src/orc/OrcFile.cc
rename to c++/src/OrcFile.cc
index 9e850de640..729adf2f7f 100644
--- a/c++/src/orc/OrcFile.cc
+++ b/c++/src/OrcFile.cc
@@ -16,8 +16,9 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
 #include "orc/OrcFile.hh"
+
+#include "Adaptor.hh"
 #include "Exceptions.hh"
 
 #include <errno.h>
diff --git a/c++/src/orc/RLE.cc b/c++/src/RLE.cc
similarity index 100%
rename from c++/src/orc/RLE.cc
rename to c++/src/RLE.cc
diff --git a/c++/src/orc/RLE.hh b/c++/src/RLE.hh
similarity index 100%
rename from c++/src/orc/RLE.hh
rename to c++/src/RLE.hh
diff --git a/c++/src/orc/RLEv1.cc b/c++/src/RLEv1.cc
similarity index 99%
rename from c++/src/orc/RLEv1.cc
rename to c++/src/RLEv1.cc
index 55e52d2d21..91bb79d36d 100644
--- a/c++/src/orc/RLEv1.cc
+++ b/c++/src/RLEv1.cc
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "RLEv1.hh"
+#include "Adaptor.hh"
 #include "Compression.hh"
 #include "Exceptions.hh"
+#include "RLEv1.hh"
 
 #include <algorithm>
 
diff --git a/c++/src/orc/RLEv1.hh b/c++/src/RLEv1.hh
similarity index 98%
rename from c++/src/orc/RLEv1.hh
rename to c++/src/RLEv1.hh
index df43a16e61..95e50a3635 100644
--- a/c++/src/orc/RLEv1.hh
+++ b/c++/src/RLEv1.hh
@@ -19,7 +19,7 @@
 #ifndef ORC_RLEV1_HH
 #define ORC_RLEV1_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 #include "RLE.hh"
 
 #include <memory>
diff --git a/c++/src/orc/RLEv2.cc b/c++/src/RLEv2.cc
similarity index 99%
rename from c++/src/orc/RLEv2.cc
rename to c++/src/RLEv2.cc
index f54fa3ed25..43428b4470 100644
--- a/c++/src/orc/RLEv2.cc
+++ b/c++/src/RLEv2.cc
@@ -16,9 +16,9 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "RLEv2.hh"
+#include "Adaptor.hh"
 #include "Compression.hh"
+#include "RLEv2.hh"
 
 #define MIN_REPEAT 3
 
diff --git a/c++/src/orc/RLEv2.hh b/c++/src/RLEv2.hh
similarity index 99%
rename from c++/src/orc/RLEv2.hh
rename to c++/src/RLEv2.hh
index 9e5d6d57d6..2923009d94 100644
--- a/c++/src/orc/RLEv2.hh
+++ b/c++/src/RLEv2.hh
@@ -19,9 +19,9 @@
 #ifndef ORC_RLEV2_HH
 #define ORC_RLEV2_HH
 
-#include "orc/Adaptor.hh"
-#include "RLE.hh"
+#include "Adaptor.hh"
 #include "Exceptions.hh"
+#include "RLE.hh"
 
 #include <vector>
 
diff --git a/c++/src/orc/Reader.cc b/c++/src/Reader.cc
similarity index 99%
rename from c++/src/orc/Reader.cc
rename to c++/src/Reader.cc
index 37dd3e070e..4f510e70ed 100644
--- a/c++/src/orc/Reader.cc
+++ b/c++/src/Reader.cc
@@ -16,14 +16,15 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "orc/Reader.hh"
+#include "orc/Int128.hh"
 #include "orc/OrcFile.hh"
+#include "orc/Reader.hh"
+
+#include "Adaptor.hh"
 #include "ColumnReader.hh"
 #include "Exceptions.hh"
 #include "RLE.hh"
 #include "TypeImpl.hh"
-#include "orc/Int128.hh"
 
 #include "wrap/coded-stream-wrapper.h"
 
diff --git a/c++/src/orc/TypeImpl.cc b/c++/src/TypeImpl.cc
similarity index 99%
rename from c++/src/orc/TypeImpl.cc
rename to c++/src/TypeImpl.cc
index 8168cb3b0d..4d37d27137 100644
--- a/c++/src/orc/TypeImpl.cc
+++ b/c++/src/TypeImpl.cc
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 #include "Exceptions.hh"
 #include "TypeImpl.hh"
 
diff --git a/c++/src/orc/TypeImpl.hh b/c++/src/TypeImpl.hh
similarity index 99%
rename from c++/src/orc/TypeImpl.hh
rename to c++/src/TypeImpl.hh
index 313cbe7d0c..756375f061 100644
--- a/c++/src/orc/TypeImpl.hh
+++ b/c++/src/TypeImpl.hh
@@ -19,9 +19,9 @@
 #ifndef TYPE_IMPL_HH
 #define TYPE_IMPL_HH
 
-#include "orc/Adaptor.hh"
 #include "orc/Vector.hh"
 
+#include "Adaptor.hh"
 #include "wrap/orc-proto-wrapper.hh"
 
 #include <vector>
diff --git a/c++/src/orc/Vector.cc b/c++/src/Vector.cc
similarity index 99%
rename from c++/src/orc/Vector.cc
rename to c++/src/Vector.cc
index d2c0a4b8b5..e65c69b3cc 100644
--- a/c++/src/orc/Vector.cc
+++ b/c++/src/Vector.cc
@@ -16,9 +16,10 @@
  * limitations under the License.
  */
 
-#include "Exceptions.hh"
 #include "orc/Vector.hh"
-#include "orc/Adaptor.hh"
+
+#include "Adaptor.hh"
+#include "Exceptions.hh"
 
 #include <iostream>
 #include <sstream>
diff --git a/c++/src/wrap/coded-stream-wrapper.h b/c++/src/wrap/coded-stream-wrapper.h
index 8fc3ec453b..1155dd7336 100644
--- a/c++/src/wrap/coded-stream-wrapper.h
+++ b/c++/src/wrap/coded-stream-wrapper.h
@@ -15,7 +15,7 @@
 #ifndef CODED_STREAM_WRAPPER_HH
 #define CODED_STREAM_WRAPPER_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_PUSH
 
diff --git a/c++/src/wrap/gmock.h b/c++/src/wrap/gmock.h
index e7675db81f..4a807eea95 100644
--- a/c++/src/wrap/gmock.h
+++ b/c++/src/wrap/gmock.h
@@ -18,7 +18,7 @@
 // we need to disable a whole set of warnings as we include gtest.h
 // restore most of the warnings after the file is loaded.
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_PUSH
 DIAGNOSTIC_IGNORE("-Wdeprecated")
diff --git a/c++/src/wrap/gtest-wrapper.h b/c++/src/wrap/gtest-wrapper.h
index 72b18679c3..fb95a1dab4 100644
--- a/c++/src/wrap/gtest-wrapper.h
+++ b/c++/src/wrap/gtest-wrapper.h
@@ -15,7 +15,7 @@
 #ifndef GTEST_WRAPPER_H
 #define GTEST_WRAPPER_H
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 // we need to disable a whole set of warnings as we include gtest.h
 // restore most of the warnings after the file is loaded.
diff --git a/c++/src/wrap/orc-proto-wrapper.cc b/c++/src/wrap/orc-proto-wrapper.cc
index 7de57b0e30..7234b7fee7 100644
--- a/c++/src/wrap/orc-proto-wrapper.cc
+++ b/c++/src/wrap/orc-proto-wrapper.cc
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_IGNORE("-Wconversion")
 DIAGNOSTIC_IGNORE("-Wdeprecated")
diff --git a/c++/src/wrap/orc-proto-wrapper.hh b/c++/src/wrap/orc-proto-wrapper.hh
index 35ea0e9bff..2f2304da87 100644
--- a/c++/src/wrap/orc-proto-wrapper.hh
+++ b/c++/src/wrap/orc-proto-wrapper.hh
@@ -15,7 +15,7 @@
 #ifndef ORC_PROTO_WRAPPER_HH
 #define ORC_PROTO_WRAPPER_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_PUSH
 DIAGNOSTIC_IGNORE("-Wconversion")
diff --git a/c++/src/wrap/snappy-wrapper.h b/c++/src/wrap/snappy-wrapper.h
index f0cf0184cb..aeab0f0033 100644
--- a/c++/src/wrap/snappy-wrapper.h
+++ b/c++/src/wrap/snappy-wrapper.h
@@ -15,7 +15,7 @@
 #ifndef SNAPPY_WRAPPER_HH
 #define SNAPPY_WRAPPER_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_PUSH
 
diff --git a/c++/src/wrap/zero-copy-stream-wrapper.h b/c++/src/wrap/zero-copy-stream-wrapper.h
index 45373e9966..6f03113e0d 100644
--- a/c++/src/wrap/zero-copy-stream-wrapper.h
+++ b/c++/src/wrap/zero-copy-stream-wrapper.h
@@ -15,7 +15,7 @@
 #ifndef ZERO_COPY_STREAM_WRAPPER_HH
 #define ZERO_COPY_STREAM_WRAPPER_HH
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 
 DIAGNOSTIC_PUSH
 
diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt
index 04867716b6..5a2105afac 100644
--- a/c++/test/CMakeLists.txt
+++ b/c++/test/CMakeLists.txt
@@ -23,13 +23,13 @@ include_directories(
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS} ${WARN_FLAGS}")
 
 add_executable (test-orc
-  orc/TestByteRle.cc
-  orc/TestColumnPrinter.cc
-  orc/TestColumnReader.cc
-  orc/TestCompression.cc
-  orc/TestDriver.cc
-  orc/TestInt128.cc
-  orc/TestRle.cc
+  TestByteRle.cc
+  TestColumnPrinter.cc
+  TestColumnReader.cc
+  TestCompression.cc
+  TestDriver.cc
+  TestInt128.cc
+  TestRle.cc
 )
 
 target_link_libraries (test-orc
diff --git a/c++/test/orc/OrcTest.hh b/c++/test/OrcTest.hh
similarity index 100%
rename from c++/test/orc/OrcTest.hh
rename to c++/test/OrcTest.hh
diff --git a/c++/test/orc/TestByteRle.cc b/c++/test/TestByteRle.cc
similarity index 99%
rename from c++/test/orc/TestByteRle.cc
rename to c++/test/TestByteRle.cc
index 4f6faeec5d..ecaa504c4e 100644
--- a/c++/test/orc/TestByteRle.cc
+++ b/c++/test/TestByteRle.cc
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "orc/ByteRLE.hh"
-#include "wrap/gtest-wrapper.h"
+#include "Adaptor.hh"
+#include "ByteRLE.hh"
 #include "OrcTest.hh"
+#include "wrap/gtest-wrapper.h"
 
 #include <iostream>
 #include <vector>
diff --git a/c++/test/orc/TestColumnPrinter.cc b/c++/test/TestColumnPrinter.cc
similarity index 99%
rename from c++/test/orc/TestColumnPrinter.cc
rename to c++/test/TestColumnPrinter.cc
index 652711aa85..a25bf3b67c 100644
--- a/c++/test/orc/TestColumnPrinter.cc
+++ b/c++/test/TestColumnPrinter.cc
@@ -17,8 +17,8 @@
  */
 
 #include "orc/ColumnPrinter.hh"
-#include "orc/Exceptions.hh"
 
+#include "Exceptions.hh"
 #include "wrap/gtest-wrapper.h"
 
 namespace orc {
diff --git a/c++/test/orc/TestColumnReader.cc b/c++/test/TestColumnReader.cc
similarity index 99%
rename from c++/test/orc/TestColumnReader.cc
rename to c++/test/TestColumnReader.cc
index aad73e5355..4c669d09c2 100644
--- a/c++/test/orc/TestColumnReader.cc
+++ b/c++/test/TestColumnReader.cc
@@ -16,10 +16,9 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "orc/ColumnReader.hh"
-#include "orc/Exceptions.hh"
-
+#include "Adaptor.hh"
+#include "ColumnReader.hh"
+#include "Exceptions.hh"
 #include "OrcTest.hh"
 
 #include "wrap/orc-proto-wrapper.hh"
diff --git a/c++/test/orc/TestCompression.cc b/c++/test/TestCompression.cc
similarity index 99%
rename from c++/test/orc/TestCompression.cc
rename to c++/test/TestCompression.cc
index 465f741fb0..921f50101a 100644
--- a/c++/test/orc/TestCompression.cc
+++ b/c++/test/TestCompression.cc
@@ -16,10 +16,10 @@
  * limitations under the License.
  */
 
-#include "orc/Compression.hh"
-#include "orc/Exceptions.hh"
-#include "wrap/gtest-wrapper.h"
+#include "Compression.hh"
+#include "Exceptions.hh"
 #include "OrcTest.hh"
+#include "wrap/gtest-wrapper.h"
 
 #include <cstdio>
 #include <fstream>
diff --git a/c++/test/orc/TestDriver.cc b/c++/test/TestDriver.cc
similarity index 100%
rename from c++/test/orc/TestDriver.cc
rename to c++/test/TestDriver.cc
diff --git a/c++/test/orc/TestInt128.cc b/c++/test/TestInt128.cc
similarity index 100%
rename from c++/test/orc/TestInt128.cc
rename to c++/test/TestInt128.cc
diff --git a/c++/test/orc/TestRle.cc b/c++/test/TestRle.cc
similarity index 99%
rename from c++/test/orc/TestRle.cc
rename to c++/test/TestRle.cc
index af10de02b5..5cd03a71ad 100644
--- a/c++/test/orc/TestRle.cc
+++ b/c++/test/TestRle.cc
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-#include "orc/Compression.hh"
-#include "orc/RLE.hh"
-#include "wrap/gtest-wrapper.h"
+#include "Adaptor.hh"
+#include "Compression.hh"
 #include "OrcTest.hh"
+#include "RLE.hh"
+#include "wrap/gtest-wrapper.h"
 
 #include <iostream>
 #include <vector>
diff --git a/site/develop/index.md b/site/develop/index.md
index 4f40997859..1ff3dfd60d 100644
--- a/site/develop/index.md
+++ b/site/develop/index.md
@@ -45,8 +45,10 @@ ORC uses git for version control. Get the source code:
 
 The important branches are:
 
-* master - The trunk for all developement
-* asf-site - The pages that are deployed to https://orc.apache.org/
+* [master](https://github.com/apache/orc/tree/master) -
+  The trunk for all developement
+* [asf-site](https://github.com/apache/orc/tree/asf-site) -
+  The pages that are deployed to https://orc.apache.org/
 
 Please check our [coding guidelines](/develop/coding.html).
 
diff --git a/tools-c++/CMakeLists.txt b/tools/CMakeLists.txt
similarity index 100%
rename from tools-c++/CMakeLists.txt
rename to tools/CMakeLists.txt
diff --git a/tools-c++/src/CMakeLists.txt b/tools/src/CMakeLists.txt
similarity index 100%
rename from tools-c++/src/CMakeLists.txt
rename to tools/src/CMakeLists.txt
diff --git a/tools-c++/src/FileContents.cc b/tools/src/FileContents.cc
similarity index 98%
rename from tools-c++/src/FileContents.cc
rename to tools/src/FileContents.cc
index 377c15df5b..afda84aafb 100644
--- a/tools-c++/src/FileContents.cc
+++ b/tools/src/FileContents.cc
@@ -17,7 +17,8 @@
  */
 
 #include "orc/ColumnPrinter.hh"
-#include "orc/Exceptions.hh"
+
+#include "Exceptions.hh"
 
 #include <memory>
 #include <string>
diff --git a/tools-c++/src/FileMetadata.cc b/tools/src/FileMetadata.cc
similarity index 100%
rename from tools-c++/src/FileMetadata.cc
rename to tools/src/FileMetadata.cc
diff --git a/tools-c++/src/FileScan.cc b/tools/src/FileScan.cc
similarity index 98%
rename from tools-c++/src/FileScan.cc
rename to tools/src/FileScan.cc
index c74e92d71f..85b7617bd9 100644
--- a/tools-c++/src/FileScan.cc
+++ b/tools/src/FileScan.cc
@@ -17,7 +17,8 @@
  */
 
 #include "orc/ColumnPrinter.hh"
-#include "orc/Exceptions.hh"
+
+#include "Exceptions.hh"
 
 #include <string>
 #include <memory>
diff --git a/tools-c++/src/FileStatistics.cc b/tools/src/FileStatistics.cc
similarity index 98%
rename from tools-c++/src/FileStatistics.cc
rename to tools/src/FileStatistics.cc
index 1b59abf721..5ae677bb99 100644
--- a/tools-c++/src/FileStatistics.cc
+++ b/tools/src/FileStatistics.cc
@@ -17,7 +17,7 @@
  */
 
 #include "orc/ColumnPrinter.hh"
-#include "orc/Exceptions.hh"
+#include "Exceptions.hh"
 
 #include <string>
 #include <memory>
diff --git a/tools-c++/test/CMakeLists.txt b/tools/test/CMakeLists.txt
similarity index 100%
rename from tools-c++/test/CMakeLists.txt
rename to tools/test/CMakeLists.txt
diff --git a/tools-c++/test/TestReader.cc b/tools/test/TestReader.cc
similarity index 99%
rename from tools-c++/test/TestReader.cc
rename to tools/test/TestReader.cc
index aae0f1da18..1e91a41cb9 100644
--- a/tools-c++/test/TestReader.cc
+++ b/tools/test/TestReader.cc
@@ -16,11 +16,11 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
-
-#include "gzip.hh"
 #include "orc/ColumnPrinter.hh"
 #include "orc/OrcFile.hh"
+
+#include "Adaptor.hh"
+#include "gzip.hh"
 #include "ToolTest.hh"
 
 #include "wrap/gmock.h"
diff --git a/tools-c++/test/ToolTest.cc b/tools/test/ToolTest.cc
similarity index 100%
rename from tools-c++/test/ToolTest.cc
rename to tools/test/ToolTest.cc
diff --git a/tools-c++/test/ToolTest.hh b/tools/test/ToolTest.hh
similarity index 100%
rename from tools-c++/test/ToolTest.hh
rename to tools/test/ToolTest.hh
diff --git a/tools-c++/test/gzip.cc b/tools/test/gzip.cc
similarity index 99%
rename from tools-c++/test/gzip.cc
rename to tools/test/gzip.cc
index 585393cfb1..462eca30f0 100644
--- a/tools-c++/test/gzip.cc
+++ b/tools/test/gzip.cc
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include "orc/Adaptor.hh"
+#include "Adaptor.hh"
 #include "gzip.hh"
 
 #include <iostream>
diff --git a/tools-c++/test/gzip.hh b/tools/test/gzip.hh
similarity index 100%
rename from tools-c++/test/gzip.hh
rename to tools/test/gzip.hh