diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30348cd7..4368bbbc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,8 +57,6 @@ INCLUDE(${cmake_dir}/CMakeLists_launcher.txt)
 INCLUDE(${cmake_dir}/CMakeLists_gtest.txt)
 INCLUDE(${cmake_dir}/CMakeLists_test.txt)
 
-#add_subdirectory(third_party/gtest)
-
 if (CONF_CPACK)
    # Setup the CPack config.
    INCLUDE(${cmake_dir}/CMakeLists_cpack.txt)
diff --git a/cmake/CMakeLists_gtest.txt b/cmake/CMakeLists_gtest.txt
index 2b042299..ef7913f5 100644
--- a/cmake/CMakeLists_gtest.txt
+++ b/cmake/CMakeLists_gtest.txt
@@ -13,12 +13,10 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-SET(root_lib ${root_dir}/lib)
-
 SET(inc_gtest_dirs
-	${root_dir}/third_party/gtest
-	${root_dir}/third_party/gtest/include
+	${root_dir}/tools/gtest
+	${root_dir}/tools/gtest/include
 )
 
 INCLUDE_DIRECTORIES(${inc_gtest_dirs})
-ADD_LIBRARY(gtest STATIC ${root_dir}/third_party/gtest/src/gtest-all.cc)
+ADD_LIBRARY(gtest STATIC ${root_dir}/tools/gtest/src/gtest-all.cc)
diff --git a/cmake/CMakeLists_lib.txt b/cmake/CMakeLists_lib.txt
index 4c12daa9..3c93f381 100644
--- a/cmake/CMakeLists_lib.txt
+++ b/cmake/CMakeLists_lib.txt
@@ -309,7 +309,6 @@ SET(src_lib_synergy
 	${root_lib}/synergy/ProtocolTypes.cpp
 	${root_lib}/synergy/XScreen.cpp
 	${root_lib}/synergy/XSynergy.cpp
-	${root_dir}/third_party/gtest/src/gtest-all.cc
 )
 
 SET(inc_lib_synergy
diff --git a/cmake/CMakeLists_test.txt b/cmake/CMakeLists_test.txt
index 19c03e32..d91d40b1 100644
--- a/cmake/CMakeLists_test.txt
+++ b/cmake/CMakeLists_test.txt
@@ -15,7 +15,7 @@
 
 # Include all files that have unit tests
 set(unittests
-	${root_dir}/third_party/gtest/src/gtest_main.cc
+	${root_dir}/tools/gtest/src/gtest_main.cc
 	${root_dir}/src/unittest/synergy/CClipboardTests.cpp
 )
 
@@ -41,24 +41,6 @@ if(UNIX)
 	endif()
 endif()
 
-set(inc
-	${root_dir}
-	${root_dir}/lib
-	${root_dir}/lib/arch
-	${root_dir}/lib/base
-	${root_dir}/lib/client
-	${root_dir}/lib/common
-	${root_dir}/lib/io
-	${root_dir}/lib/mt
-	${root_dir}/lib/net
-	${root_dir}/lib/platform
-	${root_dir}/lib/synergy
-	${root_dir}/third_party/gtest
-	${root_dir}/third_party/gtest/include
-)
-
-include_directories(${inc})
-
 add_executable(unittests ${unittests})
 target_link_libraries(unittests synergy gtest ${libs})
 
diff --git a/hm.py b/hm.py
index 43ab17a2..5abbb8d0 100644
--- a/hm.py
+++ b/hm.py
@@ -30,6 +30,8 @@
 # This will create an in-source UNIX Makefile.
 
 import sys, os
+sys.path.append('tools')
+
 from build import toolchain
 from getopt import gnu_getopt
 
diff --git a/build/README.txt b/tools/build/README.txt
similarity index 100%
rename from build/README.txt
rename to tools/build/README.txt
diff --git a/build/__init__.py b/tools/build/__init__.py
similarity index 100%
rename from build/__init__.py
rename to tools/build/__init__.py
diff --git a/build/ftputil.py b/tools/build/ftputil.py
similarity index 100%
rename from build/ftputil.py
rename to tools/build/ftputil.py
diff --git a/build/toolchain.py b/tools/build/toolchain.py
similarity index 100%
rename from build/toolchain.py
rename to tools/build/toolchain.py
diff --git a/third_party/gtest/CHANGES b/tools/gtest/CHANGES
similarity index 100%
rename from third_party/gtest/CHANGES
rename to tools/gtest/CHANGES
diff --git a/third_party/gtest/CMakeLists.txt b/tools/gtest/CMakeLists.txt
similarity index 100%
rename from third_party/gtest/CMakeLists.txt
rename to tools/gtest/CMakeLists.txt
diff --git a/third_party/gtest/CONTRIBUTORS b/tools/gtest/CONTRIBUTORS
similarity index 100%
rename from third_party/gtest/CONTRIBUTORS
rename to tools/gtest/CONTRIBUTORS
diff --git a/third_party/gtest/COPYING b/tools/gtest/COPYING
similarity index 100%
rename from third_party/gtest/COPYING
rename to tools/gtest/COPYING
diff --git a/third_party/gtest/Makefile.am b/tools/gtest/Makefile.am
similarity index 100%
rename from third_party/gtest/Makefile.am
rename to tools/gtest/Makefile.am
diff --git a/third_party/gtest/Makefile.in b/tools/gtest/Makefile.in
similarity index 100%
rename from third_party/gtest/Makefile.in
rename to tools/gtest/Makefile.in
diff --git a/third_party/gtest/README b/tools/gtest/README
similarity index 100%
rename from third_party/gtest/README
rename to tools/gtest/README
diff --git a/third_party/gtest/aclocal.m4 b/tools/gtest/aclocal.m4
similarity index 100%
rename from third_party/gtest/aclocal.m4
rename to tools/gtest/aclocal.m4
diff --git a/third_party/gtest/build-aux/config.guess b/tools/gtest/build-aux/config.guess
similarity index 100%
rename from third_party/gtest/build-aux/config.guess
rename to tools/gtest/build-aux/config.guess
diff --git a/third_party/gtest/build-aux/config.h.in b/tools/gtest/build-aux/config.h.in
similarity index 100%
rename from third_party/gtest/build-aux/config.h.in
rename to tools/gtest/build-aux/config.h.in
diff --git a/third_party/gtest/build-aux/config.sub b/tools/gtest/build-aux/config.sub
similarity index 100%
rename from third_party/gtest/build-aux/config.sub
rename to tools/gtest/build-aux/config.sub
diff --git a/third_party/gtest/build-aux/depcomp b/tools/gtest/build-aux/depcomp
similarity index 100%
rename from third_party/gtest/build-aux/depcomp
rename to tools/gtest/build-aux/depcomp
diff --git a/third_party/gtest/build-aux/install-sh b/tools/gtest/build-aux/install-sh
similarity index 100%
rename from third_party/gtest/build-aux/install-sh
rename to tools/gtest/build-aux/install-sh
diff --git a/third_party/gtest/build-aux/ltmain.sh b/tools/gtest/build-aux/ltmain.sh
similarity index 100%
rename from third_party/gtest/build-aux/ltmain.sh
rename to tools/gtest/build-aux/ltmain.sh
diff --git a/third_party/gtest/build-aux/missing b/tools/gtest/build-aux/missing
similarity index 100%
rename from third_party/gtest/build-aux/missing
rename to tools/gtest/build-aux/missing
diff --git a/third_party/gtest/codegear/gtest.cbproj b/tools/gtest/codegear/gtest.cbproj
similarity index 100%
rename from third_party/gtest/codegear/gtest.cbproj
rename to tools/gtest/codegear/gtest.cbproj
diff --git a/third_party/gtest/codegear/gtest.groupproj b/tools/gtest/codegear/gtest.groupproj
similarity index 100%
rename from third_party/gtest/codegear/gtest.groupproj
rename to tools/gtest/codegear/gtest.groupproj
diff --git a/third_party/gtest/codegear/gtest_all.cc b/tools/gtest/codegear/gtest_all.cc
similarity index 100%
rename from third_party/gtest/codegear/gtest_all.cc
rename to tools/gtest/codegear/gtest_all.cc
diff --git a/third_party/gtest/codegear/gtest_link.cc b/tools/gtest/codegear/gtest_link.cc
similarity index 100%
rename from third_party/gtest/codegear/gtest_link.cc
rename to tools/gtest/codegear/gtest_link.cc
diff --git a/third_party/gtest/codegear/gtest_main.cbproj b/tools/gtest/codegear/gtest_main.cbproj
similarity index 100%
rename from third_party/gtest/codegear/gtest_main.cbproj
rename to tools/gtest/codegear/gtest_main.cbproj
diff --git a/third_party/gtest/codegear/gtest_unittest.cbproj b/tools/gtest/codegear/gtest_unittest.cbproj
similarity index 100%
rename from third_party/gtest/codegear/gtest_unittest.cbproj
rename to tools/gtest/codegear/gtest_unittest.cbproj
diff --git a/third_party/gtest/configure b/tools/gtest/configure
similarity index 100%
rename from third_party/gtest/configure
rename to tools/gtest/configure
diff --git a/third_party/gtest/configure.ac b/tools/gtest/configure.ac
similarity index 100%
rename from third_party/gtest/configure.ac
rename to tools/gtest/configure.ac
diff --git a/third_party/gtest/fused-src/gtest/gtest-all.cc b/tools/gtest/fused-src/gtest/gtest-all.cc
similarity index 100%
rename from third_party/gtest/fused-src/gtest/gtest-all.cc
rename to tools/gtest/fused-src/gtest/gtest-all.cc
diff --git a/third_party/gtest/fused-src/gtest/gtest.h b/tools/gtest/fused-src/gtest/gtest.h
similarity index 100%
rename from third_party/gtest/fused-src/gtest/gtest.h
rename to tools/gtest/fused-src/gtest/gtest.h
diff --git a/third_party/gtest/fused-src/gtest/gtest_main.cc b/tools/gtest/fused-src/gtest/gtest_main.cc
similarity index 100%
rename from third_party/gtest/fused-src/gtest/gtest_main.cc
rename to tools/gtest/fused-src/gtest/gtest_main.cc
diff --git a/third_party/gtest/include/gtest/gtest-death-test.h b/tools/gtest/include/gtest/gtest-death-test.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-death-test.h
rename to tools/gtest/include/gtest/gtest-death-test.h
diff --git a/third_party/gtest/include/gtest/gtest-message.h b/tools/gtest/include/gtest/gtest-message.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-message.h
rename to tools/gtest/include/gtest/gtest-message.h
diff --git a/third_party/gtest/include/gtest/gtest-param-test.h b/tools/gtest/include/gtest/gtest-param-test.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-param-test.h
rename to tools/gtest/include/gtest/gtest-param-test.h
diff --git a/third_party/gtest/include/gtest/gtest-param-test.h.pump b/tools/gtest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-param-test.h.pump
rename to tools/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/third_party/gtest/include/gtest/gtest-spi.h b/tools/gtest/include/gtest/gtest-spi.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-spi.h
rename to tools/gtest/include/gtest/gtest-spi.h
diff --git a/third_party/gtest/include/gtest/gtest-test-part.h b/tools/gtest/include/gtest/gtest-test-part.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-test-part.h
rename to tools/gtest/include/gtest/gtest-test-part.h
diff --git a/third_party/gtest/include/gtest/gtest-typed-test.h b/tools/gtest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest-typed-test.h
rename to tools/gtest/include/gtest/gtest-typed-test.h
diff --git a/third_party/gtest/include/gtest/gtest.h b/tools/gtest/include/gtest/gtest.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest.h
rename to tools/gtest/include/gtest/gtest.h
diff --git a/third_party/gtest/include/gtest/gtest_pred_impl.h b/tools/gtest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest_pred_impl.h
rename to tools/gtest/include/gtest/gtest_pred_impl.h
diff --git a/third_party/gtest/include/gtest/gtest_prod.h b/tools/gtest/include/gtest/gtest_prod.h
similarity index 100%
rename from third_party/gtest/include/gtest/gtest_prod.h
rename to tools/gtest/include/gtest/gtest_prod.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-death-test-internal.h b/tools/gtest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-death-test-internal.h
rename to tools/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-filepath.h b/tools/gtest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-filepath.h
rename to tools/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-internal.h b/tools/gtest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-internal.h
rename to tools/gtest/include/gtest/internal/gtest-internal.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-linked_ptr.h b/tools/gtest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-linked_ptr.h
rename to tools/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-param-util-generated.h b/tools/gtest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-param-util-generated.h
rename to tools/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-param-util-generated.h.pump b/tools/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to tools/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/third_party/gtest/include/gtest/internal/gtest-param-util.h b/tools/gtest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-param-util.h
rename to tools/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-port.h b/tools/gtest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-port.h
rename to tools/gtest/include/gtest/internal/gtest-port.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-string.h b/tools/gtest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-string.h
rename to tools/gtest/include/gtest/internal/gtest-string.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-tuple.h b/tools/gtest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-tuple.h
rename to tools/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-tuple.h.pump b/tools/gtest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-tuple.h.pump
rename to tools/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/third_party/gtest/include/gtest/internal/gtest-type-util.h b/tools/gtest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-type-util.h
rename to tools/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/third_party/gtest/include/gtest/internal/gtest-type-util.h.pump b/tools/gtest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from third_party/gtest/include/gtest/internal/gtest-type-util.h.pump
rename to tools/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/third_party/gtest/m4/acx_pthread.m4 b/tools/gtest/m4/acx_pthread.m4
similarity index 100%
rename from third_party/gtest/m4/acx_pthread.m4
rename to tools/gtest/m4/acx_pthread.m4
diff --git a/third_party/gtest/m4/gtest.m4 b/tools/gtest/m4/gtest.m4
similarity index 100%
rename from third_party/gtest/m4/gtest.m4
rename to tools/gtest/m4/gtest.m4
diff --git a/third_party/gtest/make/Makefile b/tools/gtest/make/Makefile
similarity index 100%
rename from third_party/gtest/make/Makefile
rename to tools/gtest/make/Makefile
diff --git a/third_party/gtest/msvc/gtest-md.sln b/tools/gtest/msvc/gtest-md.sln
similarity index 100%
rename from third_party/gtest/msvc/gtest-md.sln
rename to tools/gtest/msvc/gtest-md.sln
diff --git a/third_party/gtest/msvc/gtest-md.vcproj b/tools/gtest/msvc/gtest-md.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest-md.vcproj
rename to tools/gtest/msvc/gtest-md.vcproj
diff --git a/third_party/gtest/msvc/gtest.sln b/tools/gtest/msvc/gtest.sln
similarity index 100%
rename from third_party/gtest/msvc/gtest.sln
rename to tools/gtest/msvc/gtest.sln
diff --git a/third_party/gtest/msvc/gtest.vcproj b/tools/gtest/msvc/gtest.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest.vcproj
rename to tools/gtest/msvc/gtest.vcproj
diff --git a/third_party/gtest/msvc/gtest_main-md.vcproj b/tools/gtest/msvc/gtest_main-md.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_main-md.vcproj
rename to tools/gtest/msvc/gtest_main-md.vcproj
diff --git a/third_party/gtest/msvc/gtest_main.vcproj b/tools/gtest/msvc/gtest_main.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_main.vcproj
rename to tools/gtest/msvc/gtest_main.vcproj
diff --git a/third_party/gtest/msvc/gtest_prod_test-md.vcproj b/tools/gtest/msvc/gtest_prod_test-md.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_prod_test-md.vcproj
rename to tools/gtest/msvc/gtest_prod_test-md.vcproj
diff --git a/third_party/gtest/msvc/gtest_prod_test.vcproj b/tools/gtest/msvc/gtest_prod_test.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_prod_test.vcproj
rename to tools/gtest/msvc/gtest_prod_test.vcproj
diff --git a/third_party/gtest/msvc/gtest_unittest-md.vcproj b/tools/gtest/msvc/gtest_unittest-md.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_unittest-md.vcproj
rename to tools/gtest/msvc/gtest_unittest-md.vcproj
diff --git a/third_party/gtest/msvc/gtest_unittest.vcproj b/tools/gtest/msvc/gtest_unittest.vcproj
similarity index 100%
rename from third_party/gtest/msvc/gtest_unittest.vcproj
rename to tools/gtest/msvc/gtest_unittest.vcproj
diff --git a/third_party/gtest/samples/prime_tables.h b/tools/gtest/samples/prime_tables.h
similarity index 100%
rename from third_party/gtest/samples/prime_tables.h
rename to tools/gtest/samples/prime_tables.h
diff --git a/third_party/gtest/samples/sample1.cc b/tools/gtest/samples/sample1.cc
similarity index 100%
rename from third_party/gtest/samples/sample1.cc
rename to tools/gtest/samples/sample1.cc
diff --git a/third_party/gtest/samples/sample1.h b/tools/gtest/samples/sample1.h
similarity index 100%
rename from third_party/gtest/samples/sample1.h
rename to tools/gtest/samples/sample1.h
diff --git a/third_party/gtest/samples/sample10_unittest.cc b/tools/gtest/samples/sample10_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample10_unittest.cc
rename to tools/gtest/samples/sample10_unittest.cc
diff --git a/third_party/gtest/samples/sample1_unittest.cc b/tools/gtest/samples/sample1_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample1_unittest.cc
rename to tools/gtest/samples/sample1_unittest.cc
diff --git a/third_party/gtest/samples/sample2.cc b/tools/gtest/samples/sample2.cc
similarity index 100%
rename from third_party/gtest/samples/sample2.cc
rename to tools/gtest/samples/sample2.cc
diff --git a/third_party/gtest/samples/sample2.h b/tools/gtest/samples/sample2.h
similarity index 100%
rename from third_party/gtest/samples/sample2.h
rename to tools/gtest/samples/sample2.h
diff --git a/third_party/gtest/samples/sample2_unittest.cc b/tools/gtest/samples/sample2_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample2_unittest.cc
rename to tools/gtest/samples/sample2_unittest.cc
diff --git a/third_party/gtest/samples/sample3-inl.h b/tools/gtest/samples/sample3-inl.h
similarity index 100%
rename from third_party/gtest/samples/sample3-inl.h
rename to tools/gtest/samples/sample3-inl.h
diff --git a/third_party/gtest/samples/sample3_unittest.cc b/tools/gtest/samples/sample3_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample3_unittest.cc
rename to tools/gtest/samples/sample3_unittest.cc
diff --git a/third_party/gtest/samples/sample4.cc b/tools/gtest/samples/sample4.cc
similarity index 100%
rename from third_party/gtest/samples/sample4.cc
rename to tools/gtest/samples/sample4.cc
diff --git a/third_party/gtest/samples/sample4.h b/tools/gtest/samples/sample4.h
similarity index 100%
rename from third_party/gtest/samples/sample4.h
rename to tools/gtest/samples/sample4.h
diff --git a/third_party/gtest/samples/sample4_unittest.cc b/tools/gtest/samples/sample4_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample4_unittest.cc
rename to tools/gtest/samples/sample4_unittest.cc
diff --git a/third_party/gtest/samples/sample5_unittest.cc b/tools/gtest/samples/sample5_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample5_unittest.cc
rename to tools/gtest/samples/sample5_unittest.cc
diff --git a/third_party/gtest/samples/sample6_unittest.cc b/tools/gtest/samples/sample6_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample6_unittest.cc
rename to tools/gtest/samples/sample6_unittest.cc
diff --git a/third_party/gtest/samples/sample7_unittest.cc b/tools/gtest/samples/sample7_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample7_unittest.cc
rename to tools/gtest/samples/sample7_unittest.cc
diff --git a/third_party/gtest/samples/sample8_unittest.cc b/tools/gtest/samples/sample8_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample8_unittest.cc
rename to tools/gtest/samples/sample8_unittest.cc
diff --git a/third_party/gtest/samples/sample9_unittest.cc b/tools/gtest/samples/sample9_unittest.cc
similarity index 100%
rename from third_party/gtest/samples/sample9_unittest.cc
rename to tools/gtest/samples/sample9_unittest.cc
diff --git a/third_party/gtest/scripts/fuse_gtest_files.py b/tools/gtest/scripts/fuse_gtest_files.py
similarity index 100%
rename from third_party/gtest/scripts/fuse_gtest_files.py
rename to tools/gtest/scripts/fuse_gtest_files.py
diff --git a/third_party/gtest/scripts/gen_gtest_pred_impl.py b/tools/gtest/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from third_party/gtest/scripts/gen_gtest_pred_impl.py
rename to tools/gtest/scripts/gen_gtest_pred_impl.py
diff --git a/third_party/gtest/scripts/gtest-config.in b/tools/gtest/scripts/gtest-config.in
similarity index 100%
rename from third_party/gtest/scripts/gtest-config.in
rename to tools/gtest/scripts/gtest-config.in
diff --git a/third_party/gtest/scripts/pump.py b/tools/gtest/scripts/pump.py
similarity index 100%
rename from third_party/gtest/scripts/pump.py
rename to tools/gtest/scripts/pump.py
diff --git a/third_party/gtest/scripts/test/Makefile b/tools/gtest/scripts/test/Makefile
similarity index 100%
rename from third_party/gtest/scripts/test/Makefile
rename to tools/gtest/scripts/test/Makefile
diff --git a/third_party/gtest/src/gtest-all.cc b/tools/gtest/src/gtest-all.cc
similarity index 100%
rename from third_party/gtest/src/gtest-all.cc
rename to tools/gtest/src/gtest-all.cc
diff --git a/third_party/gtest/src/gtest-death-test.cc b/tools/gtest/src/gtest-death-test.cc
similarity index 100%
rename from third_party/gtest/src/gtest-death-test.cc
rename to tools/gtest/src/gtest-death-test.cc
diff --git a/third_party/gtest/src/gtest-filepath.cc b/tools/gtest/src/gtest-filepath.cc
similarity index 100%
rename from third_party/gtest/src/gtest-filepath.cc
rename to tools/gtest/src/gtest-filepath.cc
diff --git a/third_party/gtest/src/gtest-internal-inl.h b/tools/gtest/src/gtest-internal-inl.h
similarity index 100%
rename from third_party/gtest/src/gtest-internal-inl.h
rename to tools/gtest/src/gtest-internal-inl.h
diff --git a/third_party/gtest/src/gtest-port.cc b/tools/gtest/src/gtest-port.cc
similarity index 100%
rename from third_party/gtest/src/gtest-port.cc
rename to tools/gtest/src/gtest-port.cc
diff --git a/third_party/gtest/src/gtest-test-part.cc b/tools/gtest/src/gtest-test-part.cc
similarity index 100%
rename from third_party/gtest/src/gtest-test-part.cc
rename to tools/gtest/src/gtest-test-part.cc
diff --git a/third_party/gtest/src/gtest-typed-test.cc b/tools/gtest/src/gtest-typed-test.cc
similarity index 100%
rename from third_party/gtest/src/gtest-typed-test.cc
rename to tools/gtest/src/gtest-typed-test.cc
diff --git a/third_party/gtest/src/gtest.cc b/tools/gtest/src/gtest.cc
similarity index 100%
rename from third_party/gtest/src/gtest.cc
rename to tools/gtest/src/gtest.cc
diff --git a/third_party/gtest/src/gtest_main.cc b/tools/gtest/src/gtest_main.cc
similarity index 100%
rename from third_party/gtest/src/gtest_main.cc
rename to tools/gtest/src/gtest_main.cc
diff --git a/third_party/gtest/test/gtest-death-test_test.cc b/tools/gtest/test/gtest-death-test_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-death-test_test.cc
rename to tools/gtest/test/gtest-death-test_test.cc
diff --git a/third_party/gtest/test/gtest-filepath_test.cc b/tools/gtest/test/gtest-filepath_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-filepath_test.cc
rename to tools/gtest/test/gtest-filepath_test.cc
diff --git a/third_party/gtest/test/gtest-linked_ptr_test.cc b/tools/gtest/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-linked_ptr_test.cc
rename to tools/gtest/test/gtest-linked_ptr_test.cc
diff --git a/third_party/gtest/test/gtest-listener_test.cc b/tools/gtest/test/gtest-listener_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-listener_test.cc
rename to tools/gtest/test/gtest-listener_test.cc
diff --git a/third_party/gtest/test/gtest-message_test.cc b/tools/gtest/test/gtest-message_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-message_test.cc
rename to tools/gtest/test/gtest-message_test.cc
diff --git a/third_party/gtest/test/gtest-options_test.cc b/tools/gtest/test/gtest-options_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-options_test.cc
rename to tools/gtest/test/gtest-options_test.cc
diff --git a/third_party/gtest/test/gtest-param-test2_test.cc b/tools/gtest/test/gtest-param-test2_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-param-test2_test.cc
rename to tools/gtest/test/gtest-param-test2_test.cc
diff --git a/third_party/gtest/test/gtest-param-test_test.cc b/tools/gtest/test/gtest-param-test_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-param-test_test.cc
rename to tools/gtest/test/gtest-param-test_test.cc
diff --git a/third_party/gtest/test/gtest-param-test_test.h b/tools/gtest/test/gtest-param-test_test.h
similarity index 100%
rename from third_party/gtest/test/gtest-param-test_test.h
rename to tools/gtest/test/gtest-param-test_test.h
diff --git a/third_party/gtest/test/gtest-port_test.cc b/tools/gtest/test/gtest-port_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-port_test.cc
rename to tools/gtest/test/gtest-port_test.cc
diff --git a/third_party/gtest/test/gtest-test-part_test.cc b/tools/gtest/test/gtest-test-part_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-test-part_test.cc
rename to tools/gtest/test/gtest-test-part_test.cc
diff --git a/third_party/gtest/test/gtest-tuple_test.cc b/tools/gtest/test/gtest-tuple_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-tuple_test.cc
rename to tools/gtest/test/gtest-tuple_test.cc
diff --git a/third_party/gtest/test/gtest-typed-test2_test.cc b/tools/gtest/test/gtest-typed-test2_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-typed-test2_test.cc
rename to tools/gtest/test/gtest-typed-test2_test.cc
diff --git a/third_party/gtest/test/gtest-typed-test_test.cc b/tools/gtest/test/gtest-typed-test_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-typed-test_test.cc
rename to tools/gtest/test/gtest-typed-test_test.cc
diff --git a/third_party/gtest/test/gtest-typed-test_test.h b/tools/gtest/test/gtest-typed-test_test.h
similarity index 100%
rename from third_party/gtest/test/gtest-typed-test_test.h
rename to tools/gtest/test/gtest-typed-test_test.h
diff --git a/third_party/gtest/test/gtest-unittest-api_test.cc b/tools/gtest/test/gtest-unittest-api_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest-unittest-api_test.cc
rename to tools/gtest/test/gtest-unittest-api_test.cc
diff --git a/third_party/gtest/test/gtest_all_test.cc b/tools/gtest/test/gtest_all_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_all_test.cc
rename to tools/gtest/test/gtest_all_test.cc
diff --git a/third_party/gtest/test/gtest_break_on_failure_unittest.py b/tools/gtest/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from third_party/gtest/test/gtest_break_on_failure_unittest.py
rename to tools/gtest/test/gtest_break_on_failure_unittest.py
diff --git a/third_party/gtest/test/gtest_break_on_failure_unittest_.cc b/tools/gtest/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_break_on_failure_unittest_.cc
rename to tools/gtest/test/gtest_break_on_failure_unittest_.cc
diff --git a/third_party/gtest/test/gtest_color_test.py b/tools/gtest/test/gtest_color_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_color_test.py
rename to tools/gtest/test/gtest_color_test.py
diff --git a/third_party/gtest/test/gtest_color_test_.cc b/tools/gtest/test/gtest_color_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_color_test_.cc
rename to tools/gtest/test/gtest_color_test_.cc
diff --git a/third_party/gtest/test/gtest_env_var_test.py b/tools/gtest/test/gtest_env_var_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_env_var_test.py
rename to tools/gtest/test/gtest_env_var_test.py
diff --git a/third_party/gtest/test/gtest_env_var_test_.cc b/tools/gtest/test/gtest_env_var_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_env_var_test_.cc
rename to tools/gtest/test/gtest_env_var_test_.cc
diff --git a/third_party/gtest/test/gtest_environment_test.cc b/tools/gtest/test/gtest_environment_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_environment_test.cc
rename to tools/gtest/test/gtest_environment_test.cc
diff --git a/third_party/gtest/test/gtest_filter_unittest.py b/tools/gtest/test/gtest_filter_unittest.py
similarity index 100%
rename from third_party/gtest/test/gtest_filter_unittest.py
rename to tools/gtest/test/gtest_filter_unittest.py
diff --git a/third_party/gtest/test/gtest_filter_unittest_.cc b/tools/gtest/test/gtest_filter_unittest_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_filter_unittest_.cc
rename to tools/gtest/test/gtest_filter_unittest_.cc
diff --git a/third_party/gtest/test/gtest_help_test.py b/tools/gtest/test/gtest_help_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_help_test.py
rename to tools/gtest/test/gtest_help_test.py
diff --git a/third_party/gtest/test/gtest_help_test_.cc b/tools/gtest/test/gtest_help_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_help_test_.cc
rename to tools/gtest/test/gtest_help_test_.cc
diff --git a/third_party/gtest/test/gtest_list_tests_unittest.py b/tools/gtest/test/gtest_list_tests_unittest.py
similarity index 100%
rename from third_party/gtest/test/gtest_list_tests_unittest.py
rename to tools/gtest/test/gtest_list_tests_unittest.py
diff --git a/third_party/gtest/test/gtest_list_tests_unittest_.cc b/tools/gtest/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_list_tests_unittest_.cc
rename to tools/gtest/test/gtest_list_tests_unittest_.cc
diff --git a/third_party/gtest/test/gtest_main_unittest.cc b/tools/gtest/test/gtest_main_unittest.cc
similarity index 100%
rename from third_party/gtest/test/gtest_main_unittest.cc
rename to tools/gtest/test/gtest_main_unittest.cc
diff --git a/third_party/gtest/test/gtest_no_test_unittest.cc b/tools/gtest/test/gtest_no_test_unittest.cc
similarity index 100%
rename from third_party/gtest/test/gtest_no_test_unittest.cc
rename to tools/gtest/test/gtest_no_test_unittest.cc
diff --git a/third_party/gtest/test/gtest_output_test.py b/tools/gtest/test/gtest_output_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_output_test.py
rename to tools/gtest/test/gtest_output_test.py
diff --git a/third_party/gtest/test/gtest_output_test_.cc b/tools/gtest/test/gtest_output_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_output_test_.cc
rename to tools/gtest/test/gtest_output_test_.cc
diff --git a/third_party/gtest/test/gtest_output_test_golden_lin.txt b/tools/gtest/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from third_party/gtest/test/gtest_output_test_golden_lin.txt
rename to tools/gtest/test/gtest_output_test_golden_lin.txt
diff --git a/third_party/gtest/test/gtest_output_test_golden_win.txt b/tools/gtest/test/gtest_output_test_golden_win.txt
similarity index 100%
rename from third_party/gtest/test/gtest_output_test_golden_win.txt
rename to tools/gtest/test/gtest_output_test_golden_win.txt
diff --git a/third_party/gtest/test/gtest_pred_impl_unittest.cc b/tools/gtest/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from third_party/gtest/test/gtest_pred_impl_unittest.cc
rename to tools/gtest/test/gtest_pred_impl_unittest.cc
diff --git a/third_party/gtest/test/gtest_prod_test.cc b/tools/gtest/test/gtest_prod_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_prod_test.cc
rename to tools/gtest/test/gtest_prod_test.cc
diff --git a/third_party/gtest/test/gtest_repeat_test.cc b/tools/gtest/test/gtest_repeat_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_repeat_test.cc
rename to tools/gtest/test/gtest_repeat_test.cc
diff --git a/third_party/gtest/test/gtest_shuffle_test.py b/tools/gtest/test/gtest_shuffle_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_shuffle_test.py
rename to tools/gtest/test/gtest_shuffle_test.py
diff --git a/third_party/gtest/test/gtest_shuffle_test_.cc b/tools/gtest/test/gtest_shuffle_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_shuffle_test_.cc
rename to tools/gtest/test/gtest_shuffle_test_.cc
diff --git a/third_party/gtest/test/gtest_sole_header_test.cc b/tools/gtest/test/gtest_sole_header_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_sole_header_test.cc
rename to tools/gtest/test/gtest_sole_header_test.cc
diff --git a/third_party/gtest/test/gtest_stress_test.cc b/tools/gtest/test/gtest_stress_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_stress_test.cc
rename to tools/gtest/test/gtest_stress_test.cc
diff --git a/third_party/gtest/test/gtest_test_utils.py b/tools/gtest/test/gtest_test_utils.py
similarity index 100%
rename from third_party/gtest/test/gtest_test_utils.py
rename to tools/gtest/test/gtest_test_utils.py
diff --git a/third_party/gtest/test/gtest_throw_on_failure_ex_test.cc b/tools/gtest/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from third_party/gtest/test/gtest_throw_on_failure_ex_test.cc
rename to tools/gtest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/third_party/gtest/test/gtest_throw_on_failure_test.py b/tools/gtest/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_throw_on_failure_test.py
rename to tools/gtest/test/gtest_throw_on_failure_test.py
diff --git a/third_party/gtest/test/gtest_throw_on_failure_test_.cc b/tools/gtest/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_throw_on_failure_test_.cc
rename to tools/gtest/test/gtest_throw_on_failure_test_.cc
diff --git a/third_party/gtest/test/gtest_uninitialized_test.py b/tools/gtest/test/gtest_uninitialized_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_uninitialized_test.py
rename to tools/gtest/test/gtest_uninitialized_test.py
diff --git a/third_party/gtest/test/gtest_uninitialized_test_.cc b/tools/gtest/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_uninitialized_test_.cc
rename to tools/gtest/test/gtest_uninitialized_test_.cc
diff --git a/third_party/gtest/test/gtest_unittest.cc b/tools/gtest/test/gtest_unittest.cc
similarity index 100%
rename from third_party/gtest/test/gtest_unittest.cc
rename to tools/gtest/test/gtest_unittest.cc
diff --git a/third_party/gtest/test/gtest_xml_outfile1_test_.cc b/tools/gtest/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_xml_outfile1_test_.cc
rename to tools/gtest/test/gtest_xml_outfile1_test_.cc
diff --git a/third_party/gtest/test/gtest_xml_outfile2_test_.cc b/tools/gtest/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_xml_outfile2_test_.cc
rename to tools/gtest/test/gtest_xml_outfile2_test_.cc
diff --git a/third_party/gtest/test/gtest_xml_outfiles_test.py b/tools/gtest/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from third_party/gtest/test/gtest_xml_outfiles_test.py
rename to tools/gtest/test/gtest_xml_outfiles_test.py
diff --git a/third_party/gtest/test/gtest_xml_output_unittest.py b/tools/gtest/test/gtest_xml_output_unittest.py
similarity index 100%
rename from third_party/gtest/test/gtest_xml_output_unittest.py
rename to tools/gtest/test/gtest_xml_output_unittest.py
diff --git a/third_party/gtest/test/gtest_xml_output_unittest_.cc b/tools/gtest/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from third_party/gtest/test/gtest_xml_output_unittest_.cc
rename to tools/gtest/test/gtest_xml_output_unittest_.cc
diff --git a/third_party/gtest/test/gtest_xml_test_utils.py b/tools/gtest/test/gtest_xml_test_utils.py
similarity index 100%
rename from third_party/gtest/test/gtest_xml_test_utils.py
rename to tools/gtest/test/gtest_xml_test_utils.py
diff --git a/third_party/gtest/test/production.cc b/tools/gtest/test/production.cc
similarity index 100%
rename from third_party/gtest/test/production.cc
rename to tools/gtest/test/production.cc
diff --git a/third_party/gtest/test/production.h b/tools/gtest/test/production.h
similarity index 100%
rename from third_party/gtest/test/production.h
rename to tools/gtest/test/production.h
diff --git a/third_party/gtest/test/run_tests_util.py b/tools/gtest/test/run_tests_util.py
similarity index 100%
rename from third_party/gtest/test/run_tests_util.py
rename to tools/gtest/test/run_tests_util.py
diff --git a/third_party/gtest/test/run_tests_util_test.py b/tools/gtest/test/run_tests_util_test.py
similarity index 100%
rename from third_party/gtest/test/run_tests_util_test.py
rename to tools/gtest/test/run_tests_util_test.py
diff --git a/third_party/gtest/xcode/Config/DebugProject.xcconfig b/tools/gtest/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/DebugProject.xcconfig
rename to tools/gtest/xcode/Config/DebugProject.xcconfig
diff --git a/third_party/gtest/xcode/Config/FrameworkTarget.xcconfig b/tools/gtest/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/FrameworkTarget.xcconfig
rename to tools/gtest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/third_party/gtest/xcode/Config/General.xcconfig b/tools/gtest/xcode/Config/General.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/General.xcconfig
rename to tools/gtest/xcode/Config/General.xcconfig
diff --git a/third_party/gtest/xcode/Config/ReleaseProject.xcconfig b/tools/gtest/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/ReleaseProject.xcconfig
rename to tools/gtest/xcode/Config/ReleaseProject.xcconfig
diff --git a/third_party/gtest/xcode/Config/StaticLibraryTarget.xcconfig b/tools/gtest/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/StaticLibraryTarget.xcconfig
rename to tools/gtest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/third_party/gtest/xcode/Config/TestTarget.xcconfig b/tools/gtest/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from third_party/gtest/xcode/Config/TestTarget.xcconfig
rename to tools/gtest/xcode/Config/TestTarget.xcconfig
diff --git a/third_party/gtest/xcode/Resources/Info.plist b/tools/gtest/xcode/Resources/Info.plist
similarity index 100%
rename from third_party/gtest/xcode/Resources/Info.plist
rename to tools/gtest/xcode/Resources/Info.plist
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/Info.plist b/tools/gtest/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/Info.plist
rename to tools/gtest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/tools/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to tools/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/runtests.sh b/tools/gtest/xcode/Samples/FrameworkSample/runtests.sh
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/runtests.sh
rename to tools/gtest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/widget.cc b/tools/gtest/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/widget.cc
rename to tools/gtest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/widget.h b/tools/gtest/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/widget.h
rename to tools/gtest/xcode/Samples/FrameworkSample/widget.h
diff --git a/third_party/gtest/xcode/Samples/FrameworkSample/widget_test.cc b/tools/gtest/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from third_party/gtest/xcode/Samples/FrameworkSample/widget_test.cc
rename to tools/gtest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/third_party/gtest/xcode/Scripts/runtests.sh b/tools/gtest/xcode/Scripts/runtests.sh
similarity index 100%
rename from third_party/gtest/xcode/Scripts/runtests.sh
rename to tools/gtest/xcode/Scripts/runtests.sh
diff --git a/third_party/gtest/xcode/Scripts/versiongenerate.py b/tools/gtest/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from third_party/gtest/xcode/Scripts/versiongenerate.py
rename to tools/gtest/xcode/Scripts/versiongenerate.py
diff --git a/third_party/gtest/xcode/gtest.xcodeproj/project.pbxproj b/tools/gtest/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from third_party/gtest/xcode/gtest.xcodeproj/project.pbxproj
rename to tools/gtest/xcode/gtest.xcodeproj/project.pbxproj