diff --git a/ext/gmock-1.6.0/CHANGES b/ext/gmock/CHANGES
similarity index 100%
rename from ext/gmock-1.6.0/CHANGES
rename to ext/gmock/CHANGES
diff --git a/ext/gmock-1.6.0/CMakeLists.txt b/ext/gmock/CMakeLists.txt
similarity index 100%
rename from ext/gmock-1.6.0/CMakeLists.txt
rename to ext/gmock/CMakeLists.txt
diff --git a/ext/gmock-1.6.0/CONTRIBUTORS b/ext/gmock/CONTRIBUTORS
similarity index 100%
rename from ext/gmock-1.6.0/CONTRIBUTORS
rename to ext/gmock/CONTRIBUTORS
diff --git a/ext/gmock-1.6.0/COPYING b/ext/gmock/COPYING
similarity index 100%
rename from ext/gmock-1.6.0/COPYING
rename to ext/gmock/COPYING
diff --git a/ext/gmock-1.6.0/Makefile.am b/ext/gmock/Makefile.am
similarity index 100%
rename from ext/gmock-1.6.0/Makefile.am
rename to ext/gmock/Makefile.am
diff --git a/ext/gmock-1.6.0/Makefile.in b/ext/gmock/Makefile.in
similarity index 100%
rename from ext/gmock-1.6.0/Makefile.in
rename to ext/gmock/Makefile.in
diff --git a/ext/gmock-1.6.0/README b/ext/gmock/README
similarity index 100%
rename from ext/gmock-1.6.0/README
rename to ext/gmock/README
diff --git a/ext/gmock-1.6.0/aclocal.m4 b/ext/gmock/aclocal.m4
similarity index 100%
rename from ext/gmock-1.6.0/aclocal.m4
rename to ext/gmock/aclocal.m4
diff --git a/ext/gmock-1.6.0/build-aux/config.guess b/ext/gmock/build-aux/config.guess
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/config.guess
rename to ext/gmock/build-aux/config.guess
diff --git a/ext/gmock-1.6.0/build-aux/config.h.in b/ext/gmock/build-aux/config.h.in
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/config.h.in
rename to ext/gmock/build-aux/config.h.in
diff --git a/ext/gmock-1.6.0/build-aux/config.sub b/ext/gmock/build-aux/config.sub
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/config.sub
rename to ext/gmock/build-aux/config.sub
diff --git a/ext/gmock-1.6.0/build-aux/depcomp b/ext/gmock/build-aux/depcomp
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/depcomp
rename to ext/gmock/build-aux/depcomp
diff --git a/ext/gmock-1.6.0/build-aux/install-sh b/ext/gmock/build-aux/install-sh
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/install-sh
rename to ext/gmock/build-aux/install-sh
diff --git a/ext/gmock-1.6.0/build-aux/ltmain.sh b/ext/gmock/build-aux/ltmain.sh
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/ltmain.sh
rename to ext/gmock/build-aux/ltmain.sh
diff --git a/ext/gmock-1.6.0/build-aux/missing b/ext/gmock/build-aux/missing
similarity index 100%
rename from ext/gmock-1.6.0/build-aux/missing
rename to ext/gmock/build-aux/missing
diff --git a/ext/gmock-1.6.0/configure b/ext/gmock/configure
similarity index 100%
rename from ext/gmock-1.6.0/configure
rename to ext/gmock/configure
diff --git a/ext/gmock-1.6.0/configure.ac b/ext/gmock/configure.ac
similarity index 100%
rename from ext/gmock-1.6.0/configure.ac
rename to ext/gmock/configure.ac
diff --git a/ext/gmock-1.6.0/fused-src/gmock-gtest-all.cc b/ext/gmock/fused-src/gmock-gtest-all.cc
similarity index 100%
rename from ext/gmock-1.6.0/fused-src/gmock-gtest-all.cc
rename to ext/gmock/fused-src/gmock-gtest-all.cc
diff --git a/ext/gmock-1.6.0/fused-src/gmock/gmock.h b/ext/gmock/fused-src/gmock/gmock.h
similarity index 100%
rename from ext/gmock-1.6.0/fused-src/gmock/gmock.h
rename to ext/gmock/fused-src/gmock/gmock.h
diff --git a/ext/gmock-1.6.0/fused-src/gmock_main.cc b/ext/gmock/fused-src/gmock_main.cc
similarity index 100%
rename from ext/gmock-1.6.0/fused-src/gmock_main.cc
rename to ext/gmock/fused-src/gmock_main.cc
diff --git a/ext/gmock-1.6.0/fused-src/gtest/gtest.h b/ext/gmock/fused-src/gtest/gtest.h
similarity index 100%
rename from ext/gmock-1.6.0/fused-src/gtest/gtest.h
rename to ext/gmock/fused-src/gtest/gtest.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-actions.h b/ext/gmock/include/gmock/gmock-actions.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-actions.h
rename to ext/gmock/include/gmock/gmock-actions.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-cardinalities.h b/ext/gmock/include/gmock/gmock-cardinalities.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-cardinalities.h
rename to ext/gmock/include/gmock/gmock-cardinalities.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-actions.h b/ext/gmock/include/gmock/gmock-generated-actions.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-actions.h
rename to ext/gmock/include/gmock/gmock-generated-actions.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-actions.h.pump b/ext/gmock/include/gmock/gmock-generated-actions.h.pump
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-actions.h.pump
rename to ext/gmock/include/gmock/gmock-generated-actions.h.pump
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-function-mockers.h b/ext/gmock/include/gmock/gmock-generated-function-mockers.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-function-mockers.h
rename to ext/gmock/include/gmock/gmock-generated-function-mockers.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-function-mockers.h.pump b/ext/gmock/include/gmock/gmock-generated-function-mockers.h.pump
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-function-mockers.h.pump
rename to ext/gmock/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-matchers.h b/ext/gmock/include/gmock/gmock-generated-matchers.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-matchers.h
rename to ext/gmock/include/gmock/gmock-generated-matchers.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-matchers.h.pump b/ext/gmock/include/gmock/gmock-generated-matchers.h.pump
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-matchers.h.pump
rename to ext/gmock/include/gmock/gmock-generated-matchers.h.pump
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-nice-strict.h b/ext/gmock/include/gmock/gmock-generated-nice-strict.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-nice-strict.h
rename to ext/gmock/include/gmock/gmock-generated-nice-strict.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-generated-nice-strict.h.pump b/ext/gmock/include/gmock/gmock-generated-nice-strict.h.pump
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-generated-nice-strict.h.pump
rename to ext/gmock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-matchers.h b/ext/gmock/include/gmock/gmock-matchers.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-matchers.h
rename to ext/gmock/include/gmock/gmock-matchers.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-more-actions.h b/ext/gmock/include/gmock/gmock-more-actions.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-more-actions.h
rename to ext/gmock/include/gmock/gmock-more-actions.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock-spec-builders.h b/ext/gmock/include/gmock/gmock-spec-builders.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock-spec-builders.h
rename to ext/gmock/include/gmock/gmock-spec-builders.h
diff --git a/ext/gmock-1.6.0/include/gmock/gmock.h b/ext/gmock/include/gmock/gmock.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/gmock.h
rename to ext/gmock/include/gmock/gmock.h
diff --git a/ext/gmock-1.6.0/include/gmock/internal/gmock-generated-internal-utils.h b/ext/gmock/include/gmock/internal/gmock-generated-internal-utils.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/internal/gmock-generated-internal-utils.h
rename to ext/gmock/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/ext/gmock-1.6.0/include/gmock/internal/gmock-generated-internal-utils.h.pump b/ext/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/internal/gmock-generated-internal-utils.h.pump
rename to ext/gmock/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/ext/gmock-1.6.0/include/gmock/internal/gmock-internal-utils.h b/ext/gmock/include/gmock/internal/gmock-internal-utils.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/internal/gmock-internal-utils.h
rename to ext/gmock/include/gmock/internal/gmock-internal-utils.h
diff --git a/ext/gmock-1.6.0/include/gmock/internal/gmock-port.h b/ext/gmock/include/gmock/internal/gmock-port.h
similarity index 100%
rename from ext/gmock-1.6.0/include/gmock/internal/gmock-port.h
rename to ext/gmock/include/gmock/internal/gmock-port.h
diff --git a/ext/gmock-1.6.0/make/Makefile b/ext/gmock/make/Makefile
similarity index 100%
rename from ext/gmock-1.6.0/make/Makefile
rename to ext/gmock/make/Makefile
diff --git a/ext/gmock-1.6.0/msvc/2005/gmock.sln b/ext/gmock/msvc/2005/gmock.sln
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2005/gmock.sln
rename to ext/gmock/msvc/2005/gmock.sln
diff --git a/ext/gmock-1.6.0/msvc/2005/gmock.vcproj b/ext/gmock/msvc/2005/gmock.vcproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2005/gmock.vcproj
rename to ext/gmock/msvc/2005/gmock.vcproj
diff --git a/ext/gmock-1.6.0/msvc/2005/gmock_config.vsprops b/ext/gmock/msvc/2005/gmock_config.vsprops
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2005/gmock_config.vsprops
rename to ext/gmock/msvc/2005/gmock_config.vsprops
diff --git a/ext/gmock-1.6.0/msvc/2005/gmock_main.vcproj b/ext/gmock/msvc/2005/gmock_main.vcproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2005/gmock_main.vcproj
rename to ext/gmock/msvc/2005/gmock_main.vcproj
diff --git a/ext/gmock-1.6.0/msvc/2005/gmock_test.vcproj b/ext/gmock/msvc/2005/gmock_test.vcproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2005/gmock_test.vcproj
rename to ext/gmock/msvc/2005/gmock_test.vcproj
diff --git a/ext/gmock-1.6.0/msvc/2010/gmock.sln b/ext/gmock/msvc/2010/gmock.sln
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2010/gmock.sln
rename to ext/gmock/msvc/2010/gmock.sln
diff --git a/ext/gmock-1.6.0/msvc/2010/gmock.vcxproj b/ext/gmock/msvc/2010/gmock.vcxproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2010/gmock.vcxproj
rename to ext/gmock/msvc/2010/gmock.vcxproj
diff --git a/ext/gmock-1.6.0/msvc/2010/gmock_config.props b/ext/gmock/msvc/2010/gmock_config.props
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2010/gmock_config.props
rename to ext/gmock/msvc/2010/gmock_config.props
diff --git a/ext/gmock-1.6.0/msvc/2010/gmock_main.vcxproj b/ext/gmock/msvc/2010/gmock_main.vcxproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2010/gmock_main.vcxproj
rename to ext/gmock/msvc/2010/gmock_main.vcxproj
diff --git a/ext/gmock-1.6.0/msvc/2010/gmock_test.vcxproj b/ext/gmock/msvc/2010/gmock_test.vcxproj
similarity index 100%
rename from ext/gmock-1.6.0/msvc/2010/gmock_test.vcxproj
rename to ext/gmock/msvc/2010/gmock_test.vcxproj
diff --git a/ext/gmock-1.6.0/scripts/fuse_gmock_files.py b/ext/gmock/scripts/fuse_gmock_files.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/fuse_gmock_files.py
rename to ext/gmock/scripts/fuse_gmock_files.py
diff --git a/ext/gmock-1.6.0/scripts/generator/COPYING b/ext/gmock/scripts/generator/COPYING
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/COPYING
rename to ext/gmock/scripts/generator/COPYING
diff --git a/ext/gmock-1.6.0/scripts/generator/README b/ext/gmock/scripts/generator/README
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/README
rename to ext/gmock/scripts/generator/README
diff --git a/ext/gmock-1.6.0/scripts/generator/README.cppclean b/ext/gmock/scripts/generator/README.cppclean
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/README.cppclean
rename to ext/gmock/scripts/generator/README.cppclean
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/__init__.py b/ext/gmock/scripts/generator/cpp/__init__.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/__init__.py
rename to ext/gmock/scripts/generator/cpp/__init__.py
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/ast.py b/ext/gmock/scripts/generator/cpp/ast.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/ast.py
rename to ext/gmock/scripts/generator/cpp/ast.py
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/gmock_class.py b/ext/gmock/scripts/generator/cpp/gmock_class.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/gmock_class.py
rename to ext/gmock/scripts/generator/cpp/gmock_class.py
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/keywords.py b/ext/gmock/scripts/generator/cpp/keywords.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/keywords.py
rename to ext/gmock/scripts/generator/cpp/keywords.py
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/tokenize.py b/ext/gmock/scripts/generator/cpp/tokenize.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/tokenize.py
rename to ext/gmock/scripts/generator/cpp/tokenize.py
diff --git a/ext/gmock-1.6.0/scripts/generator/cpp/utils.py b/ext/gmock/scripts/generator/cpp/utils.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/cpp/utils.py
rename to ext/gmock/scripts/generator/cpp/utils.py
diff --git a/ext/gmock-1.6.0/scripts/generator/gmock_gen.py b/ext/gmock/scripts/generator/gmock_gen.py
similarity index 100%
rename from ext/gmock-1.6.0/scripts/generator/gmock_gen.py
rename to ext/gmock/scripts/generator/gmock_gen.py
diff --git a/ext/gmock-1.6.0/scripts/gmock-config.in b/ext/gmock/scripts/gmock-config.in
similarity index 100%
rename from ext/gmock-1.6.0/scripts/gmock-config.in
rename to ext/gmock/scripts/gmock-config.in
diff --git a/ext/gmock-1.6.0/src/gmock-all.cc b/ext/gmock/src/gmock-all.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock-all.cc
rename to ext/gmock/src/gmock-all.cc
diff --git a/ext/gmock-1.6.0/src/gmock-cardinalities.cc b/ext/gmock/src/gmock-cardinalities.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock-cardinalities.cc
rename to ext/gmock/src/gmock-cardinalities.cc
diff --git a/ext/gmock-1.6.0/src/gmock-internal-utils.cc b/ext/gmock/src/gmock-internal-utils.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock-internal-utils.cc
rename to ext/gmock/src/gmock-internal-utils.cc
diff --git a/ext/gmock-1.6.0/src/gmock-matchers.cc b/ext/gmock/src/gmock-matchers.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock-matchers.cc
rename to ext/gmock/src/gmock-matchers.cc
diff --git a/ext/gmock-1.6.0/src/gmock-spec-builders.cc b/ext/gmock/src/gmock-spec-builders.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock-spec-builders.cc
rename to ext/gmock/src/gmock-spec-builders.cc
diff --git a/ext/gmock-1.6.0/src/gmock.cc b/ext/gmock/src/gmock.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock.cc
rename to ext/gmock/src/gmock.cc
diff --git a/ext/gmock-1.6.0/src/gmock_main.cc b/ext/gmock/src/gmock_main.cc
similarity index 100%
rename from ext/gmock-1.6.0/src/gmock_main.cc
rename to ext/gmock/src/gmock_main.cc
diff --git a/ext/gmock-1.6.0/test/gmock-actions_test.cc b/ext/gmock/test/gmock-actions_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-actions_test.cc
rename to ext/gmock/test/gmock-actions_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-cardinalities_test.cc b/ext/gmock/test/gmock-cardinalities_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-cardinalities_test.cc
rename to ext/gmock/test/gmock-cardinalities_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-generated-actions_test.cc b/ext/gmock/test/gmock-generated-actions_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-generated-actions_test.cc
rename to ext/gmock/test/gmock-generated-actions_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-generated-function-mockers_test.cc b/ext/gmock/test/gmock-generated-function-mockers_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-generated-function-mockers_test.cc
rename to ext/gmock/test/gmock-generated-function-mockers_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-generated-internal-utils_test.cc b/ext/gmock/test/gmock-generated-internal-utils_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-generated-internal-utils_test.cc
rename to ext/gmock/test/gmock-generated-internal-utils_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-generated-matchers_test.cc b/ext/gmock/test/gmock-generated-matchers_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-generated-matchers_test.cc
rename to ext/gmock/test/gmock-generated-matchers_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-internal-utils_test.cc b/ext/gmock/test/gmock-internal-utils_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-internal-utils_test.cc
rename to ext/gmock/test/gmock-internal-utils_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-matchers_test.cc b/ext/gmock/test/gmock-matchers_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-matchers_test.cc
rename to ext/gmock/test/gmock-matchers_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-more-actions_test.cc b/ext/gmock/test/gmock-more-actions_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-more-actions_test.cc
rename to ext/gmock/test/gmock-more-actions_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-nice-strict_test.cc b/ext/gmock/test/gmock-nice-strict_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-nice-strict_test.cc
rename to ext/gmock/test/gmock-nice-strict_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-port_test.cc b/ext/gmock/test/gmock-port_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-port_test.cc
rename to ext/gmock/test/gmock-port_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock-spec-builders_test.cc b/ext/gmock/test/gmock-spec-builders_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock-spec-builders_test.cc
rename to ext/gmock/test/gmock-spec-builders_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock_all_test.cc b/ext/gmock/test/gmock_all_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_all_test.cc
rename to ext/gmock/test/gmock_all_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock_leak_test.py b/ext/gmock/test/gmock_leak_test.py
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_leak_test.py
rename to ext/gmock/test/gmock_leak_test.py
diff --git a/ext/gmock-1.6.0/test/gmock_leak_test_.cc b/ext/gmock/test/gmock_leak_test_.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_leak_test_.cc
rename to ext/gmock/test/gmock_leak_test_.cc
diff --git a/ext/gmock-1.6.0/test/gmock_link2_test.cc b/ext/gmock/test/gmock_link2_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_link2_test.cc
rename to ext/gmock/test/gmock_link2_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock_link_test.cc b/ext/gmock/test/gmock_link_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_link_test.cc
rename to ext/gmock/test/gmock_link_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock_link_test.h b/ext/gmock/test/gmock_link_test.h
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_link_test.h
rename to ext/gmock/test/gmock_link_test.h
diff --git a/ext/gmock-1.6.0/test/gmock_output_test.py b/ext/gmock/test/gmock_output_test.py
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_output_test.py
rename to ext/gmock/test/gmock_output_test.py
diff --git a/ext/gmock-1.6.0/test/gmock_output_test_.cc b/ext/gmock/test/gmock_output_test_.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_output_test_.cc
rename to ext/gmock/test/gmock_output_test_.cc
diff --git a/ext/gmock-1.6.0/test/gmock_output_test_golden.txt b/ext/gmock/test/gmock_output_test_golden.txt
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_output_test_golden.txt
rename to ext/gmock/test/gmock_output_test_golden.txt
diff --git a/ext/gmock-1.6.0/test/gmock_test.cc b/ext/gmock/test/gmock_test.cc
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_test.cc
rename to ext/gmock/test/gmock_test.cc
diff --git a/ext/gmock-1.6.0/test/gmock_test_utils.py b/ext/gmock/test/gmock_test_utils.py
similarity index 100%
rename from ext/gmock-1.6.0/test/gmock_test_utils.py
rename to ext/gmock/test/gmock_test_utils.py
diff --git a/ext/gtest-1.6.0/CHANGES b/ext/gtest/CHANGES
similarity index 100%
rename from ext/gtest-1.6.0/CHANGES
rename to ext/gtest/CHANGES
diff --git a/ext/gtest-1.6.0/CMakeLists.txt b/ext/gtest/CMakeLists.txt
similarity index 100%
rename from ext/gtest-1.6.0/CMakeLists.txt
rename to ext/gtest/CMakeLists.txt
diff --git a/ext/gtest-1.6.0/CONTRIBUTORS b/ext/gtest/CONTRIBUTORS
similarity index 100%
rename from ext/gtest-1.6.0/CONTRIBUTORS
rename to ext/gtest/CONTRIBUTORS
diff --git a/ext/gtest-1.6.0/COPYING b/ext/gtest/COPYING
similarity index 100%
rename from ext/gtest-1.6.0/COPYING
rename to ext/gtest/COPYING
diff --git a/ext/gtest-1.6.0/Makefile.am b/ext/gtest/Makefile.am
similarity index 100%
rename from ext/gtest-1.6.0/Makefile.am
rename to ext/gtest/Makefile.am
diff --git a/ext/gtest-1.6.0/Makefile.in b/ext/gtest/Makefile.in
similarity index 100%
rename from ext/gtest-1.6.0/Makefile.in
rename to ext/gtest/Makefile.in
diff --git a/ext/gtest-1.6.0/README b/ext/gtest/README
similarity index 100%
rename from ext/gtest-1.6.0/README
rename to ext/gtest/README
diff --git a/ext/gtest-1.6.0/aclocal.m4 b/ext/gtest/aclocal.m4
similarity index 100%
rename from ext/gtest-1.6.0/aclocal.m4
rename to ext/gtest/aclocal.m4
diff --git a/ext/gtest-1.6.0/build-aux/config.guess b/ext/gtest/build-aux/config.guess
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/config.guess
rename to ext/gtest/build-aux/config.guess
diff --git a/ext/gtest-1.6.0/build-aux/config.h.in b/ext/gtest/build-aux/config.h.in
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/config.h.in
rename to ext/gtest/build-aux/config.h.in
diff --git a/ext/gtest-1.6.0/build-aux/config.sub b/ext/gtest/build-aux/config.sub
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/config.sub
rename to ext/gtest/build-aux/config.sub
diff --git a/ext/gtest-1.6.0/build-aux/depcomp b/ext/gtest/build-aux/depcomp
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/depcomp
rename to ext/gtest/build-aux/depcomp
diff --git a/ext/gtest-1.6.0/build-aux/install-sh b/ext/gtest/build-aux/install-sh
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/install-sh
rename to ext/gtest/build-aux/install-sh
diff --git a/ext/gtest-1.6.0/build-aux/ltmain.sh b/ext/gtest/build-aux/ltmain.sh
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/ltmain.sh
rename to ext/gtest/build-aux/ltmain.sh
diff --git a/ext/gtest-1.6.0/build-aux/missing b/ext/gtest/build-aux/missing
similarity index 100%
rename from ext/gtest-1.6.0/build-aux/missing
rename to ext/gtest/build-aux/missing
diff --git a/ext/gtest-1.6.0/cmake/internal_utils.cmake b/ext/gtest/cmake/internal_utils.cmake
similarity index 100%
rename from ext/gtest-1.6.0/cmake/internal_utils.cmake
rename to ext/gtest/cmake/internal_utils.cmake
diff --git a/ext/gtest-1.6.0/codegear/gtest.cbproj b/ext/gtest/codegear/gtest.cbproj
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest.cbproj
rename to ext/gtest/codegear/gtest.cbproj
diff --git a/ext/gtest-1.6.0/codegear/gtest.groupproj b/ext/gtest/codegear/gtest.groupproj
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest.groupproj
rename to ext/gtest/codegear/gtest.groupproj
diff --git a/ext/gtest-1.6.0/codegear/gtest_all.cc b/ext/gtest/codegear/gtest_all.cc
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest_all.cc
rename to ext/gtest/codegear/gtest_all.cc
diff --git a/ext/gtest-1.6.0/codegear/gtest_link.cc b/ext/gtest/codegear/gtest_link.cc
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest_link.cc
rename to ext/gtest/codegear/gtest_link.cc
diff --git a/ext/gtest-1.6.0/codegear/gtest_main.cbproj b/ext/gtest/codegear/gtest_main.cbproj
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest_main.cbproj
rename to ext/gtest/codegear/gtest_main.cbproj
diff --git a/ext/gtest-1.6.0/codegear/gtest_unittest.cbproj b/ext/gtest/codegear/gtest_unittest.cbproj
similarity index 100%
rename from ext/gtest-1.6.0/codegear/gtest_unittest.cbproj
rename to ext/gtest/codegear/gtest_unittest.cbproj
diff --git a/ext/gtest-1.6.0/configure b/ext/gtest/configure
similarity index 100%
rename from ext/gtest-1.6.0/configure
rename to ext/gtest/configure
diff --git a/ext/gtest-1.6.0/configure.ac b/ext/gtest/configure.ac
similarity index 100%
rename from ext/gtest-1.6.0/configure.ac
rename to ext/gtest/configure.ac
diff --git a/ext/gtest-1.6.0/fused-src/gtest/gtest-all.cc b/ext/gtest/fused-src/gtest/gtest-all.cc
similarity index 100%
rename from ext/gtest-1.6.0/fused-src/gtest/gtest-all.cc
rename to ext/gtest/fused-src/gtest/gtest-all.cc
diff --git a/ext/gtest-1.6.0/fused-src/gtest/gtest.h b/ext/gtest/fused-src/gtest/gtest.h
similarity index 100%
rename from ext/gtest-1.6.0/fused-src/gtest/gtest.h
rename to ext/gtest/fused-src/gtest/gtest.h
diff --git a/ext/gtest-1.6.0/fused-src/gtest/gtest_main.cc b/ext/gtest/fused-src/gtest/gtest_main.cc
similarity index 100%
rename from ext/gtest-1.6.0/fused-src/gtest/gtest_main.cc
rename to ext/gtest/fused-src/gtest/gtest_main.cc
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-death-test.h b/ext/gtest/include/gtest/gtest-death-test.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-death-test.h
rename to ext/gtest/include/gtest/gtest-death-test.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-message.h b/ext/gtest/include/gtest/gtest-message.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-message.h
rename to ext/gtest/include/gtest/gtest-message.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-param-test.h b/ext/gtest/include/gtest/gtest-param-test.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-param-test.h
rename to ext/gtest/include/gtest/gtest-param-test.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-param-test.h.pump b/ext/gtest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-param-test.h.pump
rename to ext/gtest/include/gtest/gtest-param-test.h.pump
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-printers.h b/ext/gtest/include/gtest/gtest-printers.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-printers.h
rename to ext/gtest/include/gtest/gtest-printers.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-spi.h b/ext/gtest/include/gtest/gtest-spi.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-spi.h
rename to ext/gtest/include/gtest/gtest-spi.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-test-part.h b/ext/gtest/include/gtest/gtest-test-part.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-test-part.h
rename to ext/gtest/include/gtest/gtest-test-part.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest-typed-test.h b/ext/gtest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest-typed-test.h
rename to ext/gtest/include/gtest/gtest-typed-test.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest.h b/ext/gtest/include/gtest/gtest.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest.h
rename to ext/gtest/include/gtest/gtest.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest_pred_impl.h b/ext/gtest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest_pred_impl.h
rename to ext/gtest/include/gtest/gtest_pred_impl.h
diff --git a/ext/gtest-1.6.0/include/gtest/gtest_prod.h b/ext/gtest/include/gtest/gtest_prod.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/gtest_prod.h
rename to ext/gtest/include/gtest/gtest_prod.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-death-test-internal.h b/ext/gtest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-death-test-internal.h
rename to ext/gtest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-filepath.h b/ext/gtest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-filepath.h
rename to ext/gtest/include/gtest/internal/gtest-filepath.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-internal.h b/ext/gtest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-internal.h
rename to ext/gtest/include/gtest/internal/gtest-internal.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-linked_ptr.h b/ext/gtest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-linked_ptr.h
rename to ext/gtest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h b/ext/gtest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h
rename to ext/gtest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h.pump b/ext/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-param-util-generated.h.pump
rename to ext/gtest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-param-util.h b/ext/gtest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-param-util.h
rename to ext/gtest/include/gtest/internal/gtest-param-util.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-port.h b/ext/gtest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-port.h
rename to ext/gtest/include/gtest/internal/gtest-port.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-string.h b/ext/gtest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-string.h
rename to ext/gtest/include/gtest/internal/gtest-string.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-tuple.h b/ext/gtest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-tuple.h
rename to ext/gtest/include/gtest/internal/gtest-tuple.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-tuple.h.pump b/ext/gtest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-tuple.h.pump
rename to ext/gtest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-type-util.h b/ext/gtest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-type-util.h
rename to ext/gtest/include/gtest/internal/gtest-type-util.h
diff --git a/ext/gtest-1.6.0/include/gtest/internal/gtest-type-util.h.pump b/ext/gtest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from ext/gtest-1.6.0/include/gtest/internal/gtest-type-util.h.pump
rename to ext/gtest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/ext/gtest-1.6.0/m4/acx_pthread.m4 b/ext/gtest/m4/acx_pthread.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/acx_pthread.m4
rename to ext/gtest/m4/acx_pthread.m4
diff --git a/ext/gtest-1.6.0/m4/gtest.m4 b/ext/gtest/m4/gtest.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/gtest.m4
rename to ext/gtest/m4/gtest.m4
diff --git a/ext/gtest-1.6.0/m4/libtool.m4 b/ext/gtest/m4/libtool.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/libtool.m4
rename to ext/gtest/m4/libtool.m4
diff --git a/ext/gtest-1.6.0/m4/ltoptions.m4 b/ext/gtest/m4/ltoptions.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/ltoptions.m4
rename to ext/gtest/m4/ltoptions.m4
diff --git a/ext/gtest-1.6.0/m4/ltsugar.m4 b/ext/gtest/m4/ltsugar.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/ltsugar.m4
rename to ext/gtest/m4/ltsugar.m4
diff --git a/ext/gtest-1.6.0/m4/ltversion.m4 b/ext/gtest/m4/ltversion.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/ltversion.m4
rename to ext/gtest/m4/ltversion.m4
diff --git a/ext/gtest-1.6.0/m4/lt~obsolete.m4 b/ext/gtest/m4/lt~obsolete.m4
similarity index 100%
rename from ext/gtest-1.6.0/m4/lt~obsolete.m4
rename to ext/gtest/m4/lt~obsolete.m4
diff --git a/ext/gtest-1.6.0/make/Makefile b/ext/gtest/make/Makefile
similarity index 100%
rename from ext/gtest-1.6.0/make/Makefile
rename to ext/gtest/make/Makefile
diff --git a/ext/gtest-1.6.0/msvc/gtest-md.sln b/ext/gtest/msvc/gtest-md.sln
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest-md.sln
rename to ext/gtest/msvc/gtest-md.sln
diff --git a/ext/gtest-1.6.0/msvc/gtest-md.vcproj b/ext/gtest/msvc/gtest-md.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest-md.vcproj
rename to ext/gtest/msvc/gtest-md.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest.sln b/ext/gtest/msvc/gtest.sln
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest.sln
rename to ext/gtest/msvc/gtest.sln
diff --git a/ext/gtest-1.6.0/msvc/gtest.vcproj b/ext/gtest/msvc/gtest.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest.vcproj
rename to ext/gtest/msvc/gtest.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_main-md.vcproj b/ext/gtest/msvc/gtest_main-md.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_main-md.vcproj
rename to ext/gtest/msvc/gtest_main-md.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_main.vcproj b/ext/gtest/msvc/gtest_main.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_main.vcproj
rename to ext/gtest/msvc/gtest_main.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_prod_test-md.vcproj b/ext/gtest/msvc/gtest_prod_test-md.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_prod_test-md.vcproj
rename to ext/gtest/msvc/gtest_prod_test-md.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_prod_test.vcproj b/ext/gtest/msvc/gtest_prod_test.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_prod_test.vcproj
rename to ext/gtest/msvc/gtest_prod_test.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_unittest-md.vcproj b/ext/gtest/msvc/gtest_unittest-md.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_unittest-md.vcproj
rename to ext/gtest/msvc/gtest_unittest-md.vcproj
diff --git a/ext/gtest-1.6.0/msvc/gtest_unittest.vcproj b/ext/gtest/msvc/gtest_unittest.vcproj
similarity index 100%
rename from ext/gtest-1.6.0/msvc/gtest_unittest.vcproj
rename to ext/gtest/msvc/gtest_unittest.vcproj
diff --git a/ext/gtest-1.6.0/samples/prime_tables.h b/ext/gtest/samples/prime_tables.h
similarity index 100%
rename from ext/gtest-1.6.0/samples/prime_tables.h
rename to ext/gtest/samples/prime_tables.h
diff --git a/ext/gtest-1.6.0/samples/sample1.cc b/ext/gtest/samples/sample1.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample1.cc
rename to ext/gtest/samples/sample1.cc
diff --git a/ext/gtest-1.6.0/samples/sample1.h b/ext/gtest/samples/sample1.h
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample1.h
rename to ext/gtest/samples/sample1.h
diff --git a/ext/gtest-1.6.0/samples/sample10_unittest.cc b/ext/gtest/samples/sample10_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample10_unittest.cc
rename to ext/gtest/samples/sample10_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample1_unittest.cc b/ext/gtest/samples/sample1_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample1_unittest.cc
rename to ext/gtest/samples/sample1_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample2.cc b/ext/gtest/samples/sample2.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample2.cc
rename to ext/gtest/samples/sample2.cc
diff --git a/ext/gtest-1.6.0/samples/sample2.h b/ext/gtest/samples/sample2.h
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample2.h
rename to ext/gtest/samples/sample2.h
diff --git a/ext/gtest-1.6.0/samples/sample2_unittest.cc b/ext/gtest/samples/sample2_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample2_unittest.cc
rename to ext/gtest/samples/sample2_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample3-inl.h b/ext/gtest/samples/sample3-inl.h
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample3-inl.h
rename to ext/gtest/samples/sample3-inl.h
diff --git a/ext/gtest-1.6.0/samples/sample3_unittest.cc b/ext/gtest/samples/sample3_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample3_unittest.cc
rename to ext/gtest/samples/sample3_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample4.cc b/ext/gtest/samples/sample4.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample4.cc
rename to ext/gtest/samples/sample4.cc
diff --git a/ext/gtest-1.6.0/samples/sample4.h b/ext/gtest/samples/sample4.h
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample4.h
rename to ext/gtest/samples/sample4.h
diff --git a/ext/gtest-1.6.0/samples/sample4_unittest.cc b/ext/gtest/samples/sample4_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample4_unittest.cc
rename to ext/gtest/samples/sample4_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample5_unittest.cc b/ext/gtest/samples/sample5_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample5_unittest.cc
rename to ext/gtest/samples/sample5_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample6_unittest.cc b/ext/gtest/samples/sample6_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample6_unittest.cc
rename to ext/gtest/samples/sample6_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample7_unittest.cc b/ext/gtest/samples/sample7_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample7_unittest.cc
rename to ext/gtest/samples/sample7_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample8_unittest.cc b/ext/gtest/samples/sample8_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample8_unittest.cc
rename to ext/gtest/samples/sample8_unittest.cc
diff --git a/ext/gtest-1.6.0/samples/sample9_unittest.cc b/ext/gtest/samples/sample9_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/samples/sample9_unittest.cc
rename to ext/gtest/samples/sample9_unittest.cc
diff --git a/ext/gtest-1.6.0/scripts/fuse_gtest_files.py b/ext/gtest/scripts/fuse_gtest_files.py
similarity index 100%
rename from ext/gtest-1.6.0/scripts/fuse_gtest_files.py
rename to ext/gtest/scripts/fuse_gtest_files.py
diff --git a/ext/gtest-1.6.0/scripts/gen_gtest_pred_impl.py b/ext/gtest/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from ext/gtest-1.6.0/scripts/gen_gtest_pred_impl.py
rename to ext/gtest/scripts/gen_gtest_pred_impl.py
diff --git a/ext/gtest-1.6.0/scripts/gtest-config.in b/ext/gtest/scripts/gtest-config.in
similarity index 100%
rename from ext/gtest-1.6.0/scripts/gtest-config.in
rename to ext/gtest/scripts/gtest-config.in
diff --git a/ext/gtest-1.6.0/scripts/pump.py b/ext/gtest/scripts/pump.py
similarity index 100%
rename from ext/gtest-1.6.0/scripts/pump.py
rename to ext/gtest/scripts/pump.py
diff --git a/ext/gtest-1.6.0/scripts/test/Makefile b/ext/gtest/scripts/test/Makefile
similarity index 100%
rename from ext/gtest-1.6.0/scripts/test/Makefile
rename to ext/gtest/scripts/test/Makefile
diff --git a/ext/gtest-1.6.0/src/gtest-all.cc b/ext/gtest/src/gtest-all.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-all.cc
rename to ext/gtest/src/gtest-all.cc
diff --git a/ext/gtest-1.6.0/src/gtest-death-test.cc b/ext/gtest/src/gtest-death-test.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-death-test.cc
rename to ext/gtest/src/gtest-death-test.cc
diff --git a/ext/gtest-1.6.0/src/gtest-filepath.cc b/ext/gtest/src/gtest-filepath.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-filepath.cc
rename to ext/gtest/src/gtest-filepath.cc
diff --git a/ext/gtest-1.6.0/src/gtest-internal-inl.h b/ext/gtest/src/gtest-internal-inl.h
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-internal-inl.h
rename to ext/gtest/src/gtest-internal-inl.h
diff --git a/ext/gtest-1.6.0/src/gtest-port.cc b/ext/gtest/src/gtest-port.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-port.cc
rename to ext/gtest/src/gtest-port.cc
diff --git a/ext/gtest-1.6.0/src/gtest-printers.cc b/ext/gtest/src/gtest-printers.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-printers.cc
rename to ext/gtest/src/gtest-printers.cc
diff --git a/ext/gtest-1.6.0/src/gtest-test-part.cc b/ext/gtest/src/gtest-test-part.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-test-part.cc
rename to ext/gtest/src/gtest-test-part.cc
diff --git a/ext/gtest-1.6.0/src/gtest-typed-test.cc b/ext/gtest/src/gtest-typed-test.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest-typed-test.cc
rename to ext/gtest/src/gtest-typed-test.cc
diff --git a/ext/gtest-1.6.0/src/gtest.cc b/ext/gtest/src/gtest.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest.cc
rename to ext/gtest/src/gtest.cc
diff --git a/ext/gtest-1.6.0/src/gtest_main.cc b/ext/gtest/src/gtest_main.cc
similarity index 100%
rename from ext/gtest-1.6.0/src/gtest_main.cc
rename to ext/gtest/src/gtest_main.cc
diff --git a/ext/gtest-1.6.0/test/gtest-death-test_ex_test.cc b/ext/gtest/test/gtest-death-test_ex_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-death-test_ex_test.cc
rename to ext/gtest/test/gtest-death-test_ex_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-death-test_test.cc b/ext/gtest/test/gtest-death-test_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-death-test_test.cc
rename to ext/gtest/test/gtest-death-test_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-filepath_test.cc b/ext/gtest/test/gtest-filepath_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-filepath_test.cc
rename to ext/gtest/test/gtest-filepath_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-linked_ptr_test.cc b/ext/gtest/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-linked_ptr_test.cc
rename to ext/gtest/test/gtest-linked_ptr_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-listener_test.cc b/ext/gtest/test/gtest-listener_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-listener_test.cc
rename to ext/gtest/test/gtest-listener_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-message_test.cc b/ext/gtest/test/gtest-message_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-message_test.cc
rename to ext/gtest/test/gtest-message_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-options_test.cc b/ext/gtest/test/gtest-options_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-options_test.cc
rename to ext/gtest/test/gtest-options_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-param-test2_test.cc b/ext/gtest/test/gtest-param-test2_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-param-test2_test.cc
rename to ext/gtest/test/gtest-param-test2_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-param-test_test.cc b/ext/gtest/test/gtest-param-test_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-param-test_test.cc
rename to ext/gtest/test/gtest-param-test_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-param-test_test.h b/ext/gtest/test/gtest-param-test_test.h
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-param-test_test.h
rename to ext/gtest/test/gtest-param-test_test.h
diff --git a/ext/gtest-1.6.0/test/gtest-port_test.cc b/ext/gtest/test/gtest-port_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-port_test.cc
rename to ext/gtest/test/gtest-port_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-printers_test.cc b/ext/gtest/test/gtest-printers_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-printers_test.cc
rename to ext/gtest/test/gtest-printers_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-test-part_test.cc b/ext/gtest/test/gtest-test-part_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-test-part_test.cc
rename to ext/gtest/test/gtest-test-part_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-tuple_test.cc b/ext/gtest/test/gtest-tuple_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-tuple_test.cc
rename to ext/gtest/test/gtest-tuple_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-typed-test2_test.cc b/ext/gtest/test/gtest-typed-test2_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-typed-test2_test.cc
rename to ext/gtest/test/gtest-typed-test2_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-typed-test_test.cc b/ext/gtest/test/gtest-typed-test_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-typed-test_test.cc
rename to ext/gtest/test/gtest-typed-test_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest-typed-test_test.h b/ext/gtest/test/gtest-typed-test_test.h
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-typed-test_test.h
rename to ext/gtest/test/gtest-typed-test_test.h
diff --git a/ext/gtest-1.6.0/test/gtest-unittest-api_test.cc b/ext/gtest/test/gtest-unittest-api_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest-unittest-api_test.cc
rename to ext/gtest/test/gtest-unittest-api_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_all_test.cc b/ext/gtest/test/gtest_all_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_all_test.cc
rename to ext/gtest/test/gtest_all_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_break_on_failure_unittest.py b/ext/gtest/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_break_on_failure_unittest.py
rename to ext/gtest/test/gtest_break_on_failure_unittest.py
diff --git a/ext/gtest-1.6.0/test/gtest_break_on_failure_unittest_.cc b/ext/gtest/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_break_on_failure_unittest_.cc
rename to ext/gtest/test/gtest_break_on_failure_unittest_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_catch_exceptions_test.py b/ext/gtest/test/gtest_catch_exceptions_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_catch_exceptions_test.py
rename to ext/gtest/test/gtest_catch_exceptions_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_catch_exceptions_test_.cc b/ext/gtest/test/gtest_catch_exceptions_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_catch_exceptions_test_.cc
rename to ext/gtest/test/gtest_catch_exceptions_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_color_test.py b/ext/gtest/test/gtest_color_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_color_test.py
rename to ext/gtest/test/gtest_color_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_color_test_.cc b/ext/gtest/test/gtest_color_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_color_test_.cc
rename to ext/gtest/test/gtest_color_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_env_var_test.py b/ext/gtest/test/gtest_env_var_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_env_var_test.py
rename to ext/gtest/test/gtest_env_var_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_env_var_test_.cc b/ext/gtest/test/gtest_env_var_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_env_var_test_.cc
rename to ext/gtest/test/gtest_env_var_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_environment_test.cc b/ext/gtest/test/gtest_environment_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_environment_test.cc
rename to ext/gtest/test/gtest_environment_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_filter_unittest.py b/ext/gtest/test/gtest_filter_unittest.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_filter_unittest.py
rename to ext/gtest/test/gtest_filter_unittest.py
diff --git a/ext/gtest-1.6.0/test/gtest_filter_unittest_.cc b/ext/gtest/test/gtest_filter_unittest_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_filter_unittest_.cc
rename to ext/gtest/test/gtest_filter_unittest_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_help_test.py b/ext/gtest/test/gtest_help_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_help_test.py
rename to ext/gtest/test/gtest_help_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_help_test_.cc b/ext/gtest/test/gtest_help_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_help_test_.cc
rename to ext/gtest/test/gtest_help_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_list_tests_unittest.py b/ext/gtest/test/gtest_list_tests_unittest.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_list_tests_unittest.py
rename to ext/gtest/test/gtest_list_tests_unittest.py
diff --git a/ext/gtest-1.6.0/test/gtest_list_tests_unittest_.cc b/ext/gtest/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_list_tests_unittest_.cc
rename to ext/gtest/test/gtest_list_tests_unittest_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_main_unittest.cc b/ext/gtest/test/gtest_main_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_main_unittest.cc
rename to ext/gtest/test/gtest_main_unittest.cc
diff --git a/ext/gtest-1.6.0/test/gtest_no_test_unittest.cc b/ext/gtest/test/gtest_no_test_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_no_test_unittest.cc
rename to ext/gtest/test/gtest_no_test_unittest.cc
diff --git a/ext/gtest-1.6.0/test/gtest_output_test.py b/ext/gtest/test/gtest_output_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_output_test.py
rename to ext/gtest/test/gtest_output_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_output_test_.cc b/ext/gtest/test/gtest_output_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_output_test_.cc
rename to ext/gtest/test/gtest_output_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_output_test_golden_lin.txt b/ext/gtest/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_output_test_golden_lin.txt
rename to ext/gtest/test/gtest_output_test_golden_lin.txt
diff --git a/ext/gtest-1.6.0/test/gtest_pred_impl_unittest.cc b/ext/gtest/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_pred_impl_unittest.cc
rename to ext/gtest/test/gtest_pred_impl_unittest.cc
diff --git a/ext/gtest-1.6.0/test/gtest_prod_test.cc b/ext/gtest/test/gtest_prod_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_prod_test.cc
rename to ext/gtest/test/gtest_prod_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_repeat_test.cc b/ext/gtest/test/gtest_repeat_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_repeat_test.cc
rename to ext/gtest/test/gtest_repeat_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_shuffle_test.py b/ext/gtest/test/gtest_shuffle_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_shuffle_test.py
rename to ext/gtest/test/gtest_shuffle_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_shuffle_test_.cc b/ext/gtest/test/gtest_shuffle_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_shuffle_test_.cc
rename to ext/gtest/test/gtest_shuffle_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_sole_header_test.cc b/ext/gtest/test/gtest_sole_header_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_sole_header_test.cc
rename to ext/gtest/test/gtest_sole_header_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_stress_test.cc b/ext/gtest/test/gtest_stress_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_stress_test.cc
rename to ext/gtest/test/gtest_stress_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_test_utils.py b/ext/gtest/test/gtest_test_utils.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_test_utils.py
rename to ext/gtest/test/gtest_test_utils.py
diff --git a/ext/gtest-1.6.0/test/gtest_throw_on_failure_ex_test.cc b/ext/gtest/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_throw_on_failure_ex_test.cc
rename to ext/gtest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/ext/gtest-1.6.0/test/gtest_throw_on_failure_test.py b/ext/gtest/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_throw_on_failure_test.py
rename to ext/gtest/test/gtest_throw_on_failure_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_throw_on_failure_test_.cc b/ext/gtest/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_throw_on_failure_test_.cc
rename to ext/gtest/test/gtest_throw_on_failure_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_uninitialized_test.py b/ext/gtest/test/gtest_uninitialized_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_uninitialized_test.py
rename to ext/gtest/test/gtest_uninitialized_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_uninitialized_test_.cc b/ext/gtest/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_uninitialized_test_.cc
rename to ext/gtest/test/gtest_uninitialized_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_unittest.cc b/ext/gtest/test/gtest_unittest.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_unittest.cc
rename to ext/gtest/test/gtest_unittest.cc
diff --git a/ext/gtest-1.6.0/test/gtest_xml_outfile1_test_.cc b/ext/gtest/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_outfile1_test_.cc
rename to ext/gtest/test/gtest_xml_outfile1_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_xml_outfile2_test_.cc b/ext/gtest/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_outfile2_test_.cc
rename to ext/gtest/test/gtest_xml_outfile2_test_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_xml_outfiles_test.py b/ext/gtest/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_outfiles_test.py
rename to ext/gtest/test/gtest_xml_outfiles_test.py
diff --git a/ext/gtest-1.6.0/test/gtest_xml_output_unittest.py b/ext/gtest/test/gtest_xml_output_unittest.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_output_unittest.py
rename to ext/gtest/test/gtest_xml_output_unittest.py
diff --git a/ext/gtest-1.6.0/test/gtest_xml_output_unittest_.cc b/ext/gtest/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_output_unittest_.cc
rename to ext/gtest/test/gtest_xml_output_unittest_.cc
diff --git a/ext/gtest-1.6.0/test/gtest_xml_test_utils.py b/ext/gtest/test/gtest_xml_test_utils.py
similarity index 100%
rename from ext/gtest-1.6.0/test/gtest_xml_test_utils.py
rename to ext/gtest/test/gtest_xml_test_utils.py
diff --git a/ext/gtest-1.6.0/test/production.cc b/ext/gtest/test/production.cc
similarity index 100%
rename from ext/gtest-1.6.0/test/production.cc
rename to ext/gtest/test/production.cc
diff --git a/ext/gtest-1.6.0/test/production.h b/ext/gtest/test/production.h
similarity index 100%
rename from ext/gtest-1.6.0/test/production.h
rename to ext/gtest/test/production.h
diff --git a/ext/gtest-1.6.0/xcode/Config/DebugProject.xcconfig b/ext/gtest/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/DebugProject.xcconfig
rename to ext/gtest/xcode/Config/DebugProject.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Config/FrameworkTarget.xcconfig b/ext/gtest/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/FrameworkTarget.xcconfig
rename to ext/gtest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Config/General.xcconfig b/ext/gtest/xcode/Config/General.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/General.xcconfig
rename to ext/gtest/xcode/Config/General.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Config/ReleaseProject.xcconfig b/ext/gtest/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/ReleaseProject.xcconfig
rename to ext/gtest/xcode/Config/ReleaseProject.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Config/StaticLibraryTarget.xcconfig b/ext/gtest/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/StaticLibraryTarget.xcconfig
rename to ext/gtest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Config/TestTarget.xcconfig b/ext/gtest/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Config/TestTarget.xcconfig
rename to ext/gtest/xcode/Config/TestTarget.xcconfig
diff --git a/ext/gtest-1.6.0/xcode/Resources/Info.plist b/ext/gtest/xcode/Resources/Info.plist
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Resources/Info.plist
rename to ext/gtest/xcode/Resources/Info.plist
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/Info.plist b/ext/gtest/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/Info.plist
rename to ext/gtest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/ext/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to ext/gtest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/runtests.sh b/ext/gtest/xcode/Samples/FrameworkSample/runtests.sh
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/runtests.sh
rename to ext/gtest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget.cc b/ext/gtest/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget.cc
rename to ext/gtest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget.h b/ext/gtest/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget.h
rename to ext/gtest/xcode/Samples/FrameworkSample/widget.h
diff --git a/ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget_test.cc b/ext/gtest/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Samples/FrameworkSample/widget_test.cc
rename to ext/gtest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/ext/gtest-1.6.0/xcode/Scripts/runtests.sh b/ext/gtest/xcode/Scripts/runtests.sh
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Scripts/runtests.sh
rename to ext/gtest/xcode/Scripts/runtests.sh
diff --git a/ext/gtest-1.6.0/xcode/Scripts/versiongenerate.py b/ext/gtest/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from ext/gtest-1.6.0/xcode/Scripts/versiongenerate.py
rename to ext/gtest/xcode/Scripts/versiongenerate.py
diff --git a/ext/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj b/ext/gtest/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from ext/gtest-1.6.0/xcode/gtest.xcodeproj/project.pbxproj
rename to ext/gtest/xcode/gtest.xcodeproj/project.pbxproj
diff --git a/src/lib/platform/CMakeLists.txt b/src/lib/platform/CMakeLists.txt
index 1c004970..864a27d6 100644
--- a/src/lib/platform/CMakeLists.txt
+++ b/src/lib/platform/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 include_directories(
     ../
-    ../../../ext/gtest-1.6.0/include
+    ../../../ext/gtest/include
 )
 
 if (UNIX)
diff --git a/src/lib/server/CMakeLists.txt b/src/lib/server/CMakeLists.txt
index 71dc30f6..3e71d8ac 100644
--- a/src/lib/server/CMakeLists.txt
+++ b/src/lib/server/CMakeLists.txt
@@ -24,7 +24,7 @@ endif()
 include_directories(
     ../
     ../../../ext
-    ../../../ext/gtest-1.6.0/include
+    ../../../ext/gtest/include
 )
 
 if (UNIX)
diff --git a/src/lib/shared/CMakeLists.txt b/src/lib/shared/CMakeLists.txt
index ce2301b6..58faaf3e 100644
--- a/src/lib/shared/CMakeLists.txt
+++ b/src/lib/shared/CMakeLists.txt
@@ -25,7 +25,7 @@ add_library(shared STATIC ${sources})
 include_directories(
     ../
     ../../../ext
-    ../../../ext/gtest-1.6.0/include
+    ../../../ext/gtest/include
 )
 
 target_link_libraries(shared arch base)
diff --git a/src/lib/synergy/CMakeLists.txt b/src/lib/synergy/CMakeLists.txt
index e2114f6a..90a2c0c2 100644
--- a/src/lib/synergy/CMakeLists.txt
+++ b/src/lib/synergy/CMakeLists.txt
@@ -36,7 +36,7 @@ endif()
 include_directories(
     ../
     ../../../ext
-    ../../../ext/gtest-1.6.0/include
+    ../../../ext/gtest/include
 )
 
 if (UNIX)
diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 06f97dc6..1f78ae06 100644
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -15,13 +15,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 include_directories(
-    ../../ext/gtest-1.6.0
-    ../../ext/gtest-1.6.0/include
-    ../../ext/gmock-1.6.0
-    ../../ext/gmock-1.6.0/include)
+    ../../ext/gtest
+    ../../ext/gtest/include
+    ../../ext/gmock
+    ../../ext/gmock/include)
     
-add_library(gtest STATIC ../../ext/gtest-1.6.0/src/gtest-all.cc)
-add_library(gmock STATIC ../../ext/gmock-1.6.0/src/gmock-all.cc)
+add_library(gtest STATIC ../../ext/gtest/src/gtest-all.cc)
+add_library(gmock STATIC ../../ext/gmock/src/gmock-all.cc)
 
 if (UNIX)
     # ignore warnings in gtest and gmock
diff --git a/src/test/integtests/CMakeLists.txt b/src/test/integtests/CMakeLists.txt
index 08a33bf0..f39968a3 100644
--- a/src/test/integtests/CMakeLists.txt
+++ b/src/test/integtests/CMakeLists.txt
@@ -56,8 +56,8 @@ endif()
 include_directories(
     ../../
     ../../lib/
-    ../../../ext/gtest-1.6.0/include
-    ../../../ext/gmock-1.6.0/include
+    ../../../ext/gtest/include
+    ../../../ext/gmock/include
 )
 
 if (UNIX)
diff --git a/src/test/unittests/CMakeLists.txt b/src/test/unittests/CMakeLists.txt
index 9d422f7f..54131eb2 100644
--- a/src/test/unittests/CMakeLists.txt
+++ b/src/test/unittests/CMakeLists.txt
@@ -51,8 +51,8 @@ list(APPEND headers ${platform_sources})
 include_directories(
     ../../
     ../../lib/
-    ../../../ext/gtest-1.6.0/include
-    ../../../ext/gmock-1.6.0/include
+    ../../../ext/gtest/include
+    ../../../ext/gmock/include
     ../../../ext
 )