diff --git a/CHANGES b/googletest/CHANGES
similarity index 100%
rename from CHANGES
rename to googletest/CHANGES
diff --git a/CMakeLists.txt b/googletest/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to googletest/CMakeLists.txt
diff --git a/CONTRIBUTORS b/googletest/CONTRIBUTORS
similarity index 100%
rename from CONTRIBUTORS
rename to googletest/CONTRIBUTORS
diff --git a/LICENSE b/googletest/LICENSE
similarity index 100%
rename from LICENSE
rename to googletest/LICENSE
diff --git a/Makefile.am b/googletest/Makefile.am
similarity index 100%
rename from Makefile.am
rename to googletest/Makefile.am
diff --git a/README.md b/googletest/README.md
similarity index 100%
rename from README.md
rename to googletest/README.md
diff --git a/build-aux/.keep b/googletest/build-aux/.keep
similarity index 100%
rename from build-aux/.keep
rename to googletest/build-aux/.keep
diff --git a/cmake/internal_utils.cmake b/googletest/cmake/internal_utils.cmake
similarity index 100%
rename from cmake/internal_utils.cmake
rename to googletest/cmake/internal_utils.cmake
diff --git a/codegear/gtest.cbproj b/googletest/codegear/gtest.cbproj
similarity index 100%
rename from codegear/gtest.cbproj
rename to googletest/codegear/gtest.cbproj
diff --git a/codegear/gtest.groupproj b/googletest/codegear/gtest.groupproj
similarity index 100%
rename from codegear/gtest.groupproj
rename to googletest/codegear/gtest.groupproj
diff --git a/codegear/gtest_all.cc b/googletest/codegear/gtest_all.cc
similarity index 100%
rename from codegear/gtest_all.cc
rename to googletest/codegear/gtest_all.cc
diff --git a/codegear/gtest_link.cc b/googletest/codegear/gtest_link.cc
similarity index 100%
rename from codegear/gtest_link.cc
rename to googletest/codegear/gtest_link.cc
diff --git a/codegear/gtest_main.cbproj b/googletest/codegear/gtest_main.cbproj
similarity index 100%
rename from codegear/gtest_main.cbproj
rename to googletest/codegear/gtest_main.cbproj
diff --git a/codegear/gtest_unittest.cbproj b/googletest/codegear/gtest_unittest.cbproj
similarity index 100%
rename from codegear/gtest_unittest.cbproj
rename to googletest/codegear/gtest_unittest.cbproj
diff --git a/configure.ac b/googletest/configure.ac
similarity index 100%
rename from configure.ac
rename to googletest/configure.ac
diff --git a/docs/AdvancedGuide.md b/googletest/docs/AdvancedGuide.md
similarity index 100%
rename from docs/AdvancedGuide.md
rename to googletest/docs/AdvancedGuide.md
diff --git a/docs/DevGuide.md b/googletest/docs/DevGuide.md
similarity index 100%
rename from docs/DevGuide.md
rename to googletest/docs/DevGuide.md
diff --git a/docs/Documentation.md b/googletest/docs/Documentation.md
similarity index 100%
rename from docs/Documentation.md
rename to googletest/docs/Documentation.md
diff --git a/docs/FAQ.md b/googletest/docs/FAQ.md
similarity index 100%
rename from docs/FAQ.md
rename to googletest/docs/FAQ.md
diff --git a/docs/Primer.md b/googletest/docs/Primer.md
similarity index 100%
rename from docs/Primer.md
rename to googletest/docs/Primer.md
diff --git a/docs/ProjectHome.md b/googletest/docs/ProjectHome.md
similarity index 100%
rename from docs/ProjectHome.md
rename to googletest/docs/ProjectHome.md
diff --git a/docs/PumpManual.md b/googletest/docs/PumpManual.md
similarity index 100%
rename from docs/PumpManual.md
rename to googletest/docs/PumpManual.md
diff --git a/docs/Samples.md b/googletest/docs/Samples.md
similarity index 100%
rename from docs/Samples.md
rename to googletest/docs/Samples.md
diff --git a/docs/V1_5_AdvancedGuide.md b/googletest/docs/V1_5_AdvancedGuide.md
similarity index 100%
rename from docs/V1_5_AdvancedGuide.md
rename to googletest/docs/V1_5_AdvancedGuide.md
diff --git a/docs/V1_5_Documentation.md b/googletest/docs/V1_5_Documentation.md
similarity index 100%
rename from docs/V1_5_Documentation.md
rename to googletest/docs/V1_5_Documentation.md
diff --git a/docs/V1_5_FAQ.md b/googletest/docs/V1_5_FAQ.md
similarity index 100%
rename from docs/V1_5_FAQ.md
rename to googletest/docs/V1_5_FAQ.md
diff --git a/docs/V1_5_Primer.md b/googletest/docs/V1_5_Primer.md
similarity index 100%
rename from docs/V1_5_Primer.md
rename to googletest/docs/V1_5_Primer.md
diff --git a/docs/V1_5_PumpManual.md b/googletest/docs/V1_5_PumpManual.md
similarity index 100%
rename from docs/V1_5_PumpManual.md
rename to googletest/docs/V1_5_PumpManual.md
diff --git a/docs/V1_5_XcodeGuide.md b/googletest/docs/V1_5_XcodeGuide.md
similarity index 100%
rename from docs/V1_5_XcodeGuide.md
rename to googletest/docs/V1_5_XcodeGuide.md
diff --git a/docs/V1_6_AdvancedGuide.md b/googletest/docs/V1_6_AdvancedGuide.md
similarity index 100%
rename from docs/V1_6_AdvancedGuide.md
rename to googletest/docs/V1_6_AdvancedGuide.md
diff --git a/docs/V1_6_Documentation.md b/googletest/docs/V1_6_Documentation.md
similarity index 100%
rename from docs/V1_6_Documentation.md
rename to googletest/docs/V1_6_Documentation.md
diff --git a/docs/V1_6_FAQ.md b/googletest/docs/V1_6_FAQ.md
similarity index 100%
rename from docs/V1_6_FAQ.md
rename to googletest/docs/V1_6_FAQ.md
diff --git a/docs/V1_6_Primer.md b/googletest/docs/V1_6_Primer.md
similarity index 100%
rename from docs/V1_6_Primer.md
rename to googletest/docs/V1_6_Primer.md
diff --git a/docs/V1_6_PumpManual.md b/googletest/docs/V1_6_PumpManual.md
similarity index 100%
rename from docs/V1_6_PumpManual.md
rename to googletest/docs/V1_6_PumpManual.md
diff --git a/docs/V1_6_Samples.md b/googletest/docs/V1_6_Samples.md
similarity index 100%
rename from docs/V1_6_Samples.md
rename to googletest/docs/V1_6_Samples.md
diff --git a/docs/V1_6_XcodeGuide.md b/googletest/docs/V1_6_XcodeGuide.md
similarity index 100%
rename from docs/V1_6_XcodeGuide.md
rename to googletest/docs/V1_6_XcodeGuide.md
diff --git a/docs/V1_7_AdvancedGuide.md b/googletest/docs/V1_7_AdvancedGuide.md
similarity index 100%
rename from docs/V1_7_AdvancedGuide.md
rename to googletest/docs/V1_7_AdvancedGuide.md
diff --git a/docs/V1_7_Documentation.md b/googletest/docs/V1_7_Documentation.md
similarity index 100%
rename from docs/V1_7_Documentation.md
rename to googletest/docs/V1_7_Documentation.md
diff --git a/docs/V1_7_FAQ.md b/googletest/docs/V1_7_FAQ.md
similarity index 100%
rename from docs/V1_7_FAQ.md
rename to googletest/docs/V1_7_FAQ.md
diff --git a/docs/V1_7_Primer.md b/googletest/docs/V1_7_Primer.md
similarity index 100%
rename from docs/V1_7_Primer.md
rename to googletest/docs/V1_7_Primer.md
diff --git a/docs/V1_7_PumpManual.md b/googletest/docs/V1_7_PumpManual.md
similarity index 100%
rename from docs/V1_7_PumpManual.md
rename to googletest/docs/V1_7_PumpManual.md
diff --git a/docs/V1_7_Samples.md b/googletest/docs/V1_7_Samples.md
similarity index 100%
rename from docs/V1_7_Samples.md
rename to googletest/docs/V1_7_Samples.md
diff --git a/docs/V1_7_XcodeGuide.md b/googletest/docs/V1_7_XcodeGuide.md
similarity index 100%
rename from docs/V1_7_XcodeGuide.md
rename to googletest/docs/V1_7_XcodeGuide.md
diff --git a/docs/XcodeGuide.md b/googletest/docs/XcodeGuide.md
similarity index 100%
rename from docs/XcodeGuide.md
rename to googletest/docs/XcodeGuide.md
diff --git a/include/gtest/gtest-death-test.h b/googletest/include/gtest/gtest-death-test.h
similarity index 100%
rename from include/gtest/gtest-death-test.h
rename to googletest/include/gtest/gtest-death-test.h
diff --git a/include/gtest/gtest-message.h b/googletest/include/gtest/gtest-message.h
similarity index 100%
rename from include/gtest/gtest-message.h
rename to googletest/include/gtest/gtest-message.h
diff --git a/include/gtest/gtest-param-test.h b/googletest/include/gtest/gtest-param-test.h
similarity index 100%
rename from include/gtest/gtest-param-test.h
rename to googletest/include/gtest/gtest-param-test.h
diff --git a/include/gtest/gtest-param-test.h.pump b/googletest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from include/gtest/gtest-param-test.h.pump
rename to googletest/include/gtest/gtest-param-test.h.pump
diff --git a/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h
similarity index 100%
rename from include/gtest/gtest-printers.h
rename to googletest/include/gtest/gtest-printers.h
diff --git a/include/gtest/gtest-spi.h b/googletest/include/gtest/gtest-spi.h
similarity index 100%
rename from include/gtest/gtest-spi.h
rename to googletest/include/gtest/gtest-spi.h
diff --git a/include/gtest/gtest-test-part.h b/googletest/include/gtest/gtest-test-part.h
similarity index 100%
rename from include/gtest/gtest-test-part.h
rename to googletest/include/gtest/gtest-test-part.h
diff --git a/include/gtest/gtest-typed-test.h b/googletest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from include/gtest/gtest-typed-test.h
rename to googletest/include/gtest/gtest-typed-test.h
diff --git a/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
similarity index 100%
rename from include/gtest/gtest.h
rename to googletest/include/gtest/gtest.h
diff --git a/include/gtest/gtest_pred_impl.h b/googletest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from include/gtest/gtest_pred_impl.h
rename to googletest/include/gtest/gtest_pred_impl.h
diff --git a/include/gtest/gtest_prod.h b/googletest/include/gtest/gtest_prod.h
similarity index 100%
rename from include/gtest/gtest_prod.h
rename to googletest/include/gtest/gtest_prod.h
diff --git a/include/gtest/internal/custom/gtest-port.h b/googletest/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from include/gtest/internal/custom/gtest-port.h
rename to googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/include/gtest/internal/custom/gtest-printers.h b/googletest/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from include/gtest/internal/custom/gtest-printers.h
rename to googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/include/gtest/internal/custom/gtest.h b/googletest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from include/gtest/internal/custom/gtest.h
rename to googletest/include/gtest/internal/custom/gtest.h
diff --git a/include/gtest/internal/gtest-death-test-internal.h b/googletest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from include/gtest/internal/gtest-death-test-internal.h
rename to googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/include/gtest/internal/gtest-filepath.h b/googletest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from include/gtest/internal/gtest-filepath.h
rename to googletest/include/gtest/internal/gtest-filepath.h
diff --git a/include/gtest/internal/gtest-internal.h b/googletest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from include/gtest/internal/gtest-internal.h
rename to googletest/include/gtest/internal/gtest-internal.h
diff --git a/include/gtest/internal/gtest-linked_ptr.h b/googletest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from include/gtest/internal/gtest-linked_ptr.h
rename to googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/include/gtest/internal/gtest-param-util-generated.h b/googletest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from include/gtest/internal/gtest-param-util-generated.h
rename to googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/include/gtest/internal/gtest-param-util-generated.h.pump b/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from include/gtest/internal/gtest-param-util-generated.h.pump
rename to googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from include/gtest/internal/gtest-param-util.h
rename to googletest/include/gtest/internal/gtest-param-util.h
diff --git a/include/gtest/internal/gtest-port-arch.h b/googletest/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from include/gtest/internal/gtest-port-arch.h
rename to googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/include/gtest/internal/gtest-port.h b/googletest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from include/gtest/internal/gtest-port.h
rename to googletest/include/gtest/internal/gtest-port.h
diff --git a/include/gtest/internal/gtest-string.h b/googletest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from include/gtest/internal/gtest-string.h
rename to googletest/include/gtest/internal/gtest-string.h
diff --git a/include/gtest/internal/gtest-tuple.h b/googletest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from include/gtest/internal/gtest-tuple.h
rename to googletest/include/gtest/internal/gtest-tuple.h
diff --git a/include/gtest/internal/gtest-tuple.h.pump b/googletest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from include/gtest/internal/gtest-tuple.h.pump
rename to googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/include/gtest/internal/gtest-type-util.h b/googletest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from include/gtest/internal/gtest-type-util.h
rename to googletest/include/gtest/internal/gtest-type-util.h
diff --git a/include/gtest/internal/gtest-type-util.h.pump b/googletest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from include/gtest/internal/gtest-type-util.h.pump
rename to googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/m4/acx_pthread.m4 b/googletest/m4/acx_pthread.m4
similarity index 100%
rename from m4/acx_pthread.m4
rename to googletest/m4/acx_pthread.m4
diff --git a/m4/gtest.m4 b/googletest/m4/gtest.m4
similarity index 100%
rename from m4/gtest.m4
rename to googletest/m4/gtest.m4
diff --git a/make/Makefile b/googletest/make/Makefile
similarity index 100%
rename from make/Makefile
rename to googletest/make/Makefile
diff --git a/msvc/gtest-md.sln b/googletest/msvc/gtest-md.sln
similarity index 100%
rename from msvc/gtest-md.sln
rename to googletest/msvc/gtest-md.sln
diff --git a/msvc/gtest-md.vcproj b/googletest/msvc/gtest-md.vcproj
similarity index 100%
rename from msvc/gtest-md.vcproj
rename to googletest/msvc/gtest-md.vcproj
diff --git a/msvc/gtest.sln b/googletest/msvc/gtest.sln
similarity index 100%
rename from msvc/gtest.sln
rename to googletest/msvc/gtest.sln
diff --git a/msvc/gtest.vcproj b/googletest/msvc/gtest.vcproj
similarity index 100%
rename from msvc/gtest.vcproj
rename to googletest/msvc/gtest.vcproj
diff --git a/msvc/gtest_main-md.vcproj b/googletest/msvc/gtest_main-md.vcproj
similarity index 100%
rename from msvc/gtest_main-md.vcproj
rename to googletest/msvc/gtest_main-md.vcproj
diff --git a/msvc/gtest_main.vcproj b/googletest/msvc/gtest_main.vcproj
similarity index 100%
rename from msvc/gtest_main.vcproj
rename to googletest/msvc/gtest_main.vcproj
diff --git a/msvc/gtest_prod_test-md.vcproj b/googletest/msvc/gtest_prod_test-md.vcproj
similarity index 100%
rename from msvc/gtest_prod_test-md.vcproj
rename to googletest/msvc/gtest_prod_test-md.vcproj
diff --git a/msvc/gtest_prod_test.vcproj b/googletest/msvc/gtest_prod_test.vcproj
similarity index 100%
rename from msvc/gtest_prod_test.vcproj
rename to googletest/msvc/gtest_prod_test.vcproj
diff --git a/msvc/gtest_unittest-md.vcproj b/googletest/msvc/gtest_unittest-md.vcproj
similarity index 100%
rename from msvc/gtest_unittest-md.vcproj
rename to googletest/msvc/gtest_unittest-md.vcproj
diff --git a/msvc/gtest_unittest.vcproj b/googletest/msvc/gtest_unittest.vcproj
similarity index 100%
rename from msvc/gtest_unittest.vcproj
rename to googletest/msvc/gtest_unittest.vcproj
diff --git a/samples/prime_tables.h b/googletest/samples/prime_tables.h
similarity index 100%
rename from samples/prime_tables.h
rename to googletest/samples/prime_tables.h
diff --git a/samples/sample1.cc b/googletest/samples/sample1.cc
similarity index 100%
rename from samples/sample1.cc
rename to googletest/samples/sample1.cc
diff --git a/samples/sample1.h b/googletest/samples/sample1.h
similarity index 100%
rename from samples/sample1.h
rename to googletest/samples/sample1.h
diff --git a/samples/sample10_unittest.cc b/googletest/samples/sample10_unittest.cc
similarity index 100%
rename from samples/sample10_unittest.cc
rename to googletest/samples/sample10_unittest.cc
diff --git a/samples/sample1_unittest.cc b/googletest/samples/sample1_unittest.cc
similarity index 100%
rename from samples/sample1_unittest.cc
rename to googletest/samples/sample1_unittest.cc
diff --git a/samples/sample2.cc b/googletest/samples/sample2.cc
similarity index 100%
rename from samples/sample2.cc
rename to googletest/samples/sample2.cc
diff --git a/samples/sample2.h b/googletest/samples/sample2.h
similarity index 100%
rename from samples/sample2.h
rename to googletest/samples/sample2.h
diff --git a/samples/sample2_unittest.cc b/googletest/samples/sample2_unittest.cc
similarity index 100%
rename from samples/sample2_unittest.cc
rename to googletest/samples/sample2_unittest.cc
diff --git a/samples/sample3-inl.h b/googletest/samples/sample3-inl.h
similarity index 100%
rename from samples/sample3-inl.h
rename to googletest/samples/sample3-inl.h
diff --git a/samples/sample3_unittest.cc b/googletest/samples/sample3_unittest.cc
similarity index 100%
rename from samples/sample3_unittest.cc
rename to googletest/samples/sample3_unittest.cc
diff --git a/samples/sample4.cc b/googletest/samples/sample4.cc
similarity index 100%
rename from samples/sample4.cc
rename to googletest/samples/sample4.cc
diff --git a/samples/sample4.h b/googletest/samples/sample4.h
similarity index 100%
rename from samples/sample4.h
rename to googletest/samples/sample4.h
diff --git a/samples/sample4_unittest.cc b/googletest/samples/sample4_unittest.cc
similarity index 100%
rename from samples/sample4_unittest.cc
rename to googletest/samples/sample4_unittest.cc
diff --git a/samples/sample5_unittest.cc b/googletest/samples/sample5_unittest.cc
similarity index 100%
rename from samples/sample5_unittest.cc
rename to googletest/samples/sample5_unittest.cc
diff --git a/samples/sample6_unittest.cc b/googletest/samples/sample6_unittest.cc
similarity index 100%
rename from samples/sample6_unittest.cc
rename to googletest/samples/sample6_unittest.cc
diff --git a/samples/sample7_unittest.cc b/googletest/samples/sample7_unittest.cc
similarity index 100%
rename from samples/sample7_unittest.cc
rename to googletest/samples/sample7_unittest.cc
diff --git a/samples/sample8_unittest.cc b/googletest/samples/sample8_unittest.cc
similarity index 100%
rename from samples/sample8_unittest.cc
rename to googletest/samples/sample8_unittest.cc
diff --git a/samples/sample9_unittest.cc b/googletest/samples/sample9_unittest.cc
similarity index 100%
rename from samples/sample9_unittest.cc
rename to googletest/samples/sample9_unittest.cc
diff --git a/scripts/common.py b/googletest/scripts/common.py
similarity index 100%
rename from scripts/common.py
rename to googletest/scripts/common.py
diff --git a/scripts/fuse_gtest_files.py b/googletest/scripts/fuse_gtest_files.py
similarity index 100%
rename from scripts/fuse_gtest_files.py
rename to googletest/scripts/fuse_gtest_files.py
diff --git a/scripts/gen_gtest_pred_impl.py b/googletest/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from scripts/gen_gtest_pred_impl.py
rename to googletest/scripts/gen_gtest_pred_impl.py
diff --git a/scripts/gtest-config.in b/googletest/scripts/gtest-config.in
similarity index 100%
rename from scripts/gtest-config.in
rename to googletest/scripts/gtest-config.in
diff --git a/scripts/pump.py b/googletest/scripts/pump.py
similarity index 100%
rename from scripts/pump.py
rename to googletest/scripts/pump.py
diff --git a/scripts/release_docs.py b/googletest/scripts/release_docs.py
similarity index 100%
rename from scripts/release_docs.py
rename to googletest/scripts/release_docs.py
diff --git a/scripts/test/Makefile b/googletest/scripts/test/Makefile
similarity index 100%
rename from scripts/test/Makefile
rename to googletest/scripts/test/Makefile
diff --git a/scripts/upload.py b/googletest/scripts/upload.py
similarity index 100%
rename from scripts/upload.py
rename to googletest/scripts/upload.py
diff --git a/scripts/upload_gtest.py b/googletest/scripts/upload_gtest.py
similarity index 100%
rename from scripts/upload_gtest.py
rename to googletest/scripts/upload_gtest.py
diff --git a/src/gtest-all.cc b/googletest/src/gtest-all.cc
similarity index 100%
rename from src/gtest-all.cc
rename to googletest/src/gtest-all.cc
diff --git a/src/gtest-death-test.cc b/googletest/src/gtest-death-test.cc
similarity index 100%
rename from src/gtest-death-test.cc
rename to googletest/src/gtest-death-test.cc
diff --git a/src/gtest-filepath.cc b/googletest/src/gtest-filepath.cc
similarity index 100%
rename from src/gtest-filepath.cc
rename to googletest/src/gtest-filepath.cc
diff --git a/src/gtest-internal-inl.h b/googletest/src/gtest-internal-inl.h
similarity index 100%
rename from src/gtest-internal-inl.h
rename to googletest/src/gtest-internal-inl.h
diff --git a/src/gtest-port.cc b/googletest/src/gtest-port.cc
similarity index 100%
rename from src/gtest-port.cc
rename to googletest/src/gtest-port.cc
diff --git a/src/gtest-printers.cc b/googletest/src/gtest-printers.cc
similarity index 100%
rename from src/gtest-printers.cc
rename to googletest/src/gtest-printers.cc
diff --git a/src/gtest-test-part.cc b/googletest/src/gtest-test-part.cc
similarity index 100%
rename from src/gtest-test-part.cc
rename to googletest/src/gtest-test-part.cc
diff --git a/src/gtest-typed-test.cc b/googletest/src/gtest-typed-test.cc
similarity index 100%
rename from src/gtest-typed-test.cc
rename to googletest/src/gtest-typed-test.cc
diff --git a/src/gtest.cc b/googletest/src/gtest.cc
similarity index 100%
rename from src/gtest.cc
rename to googletest/src/gtest.cc
diff --git a/src/gtest_main.cc b/googletest/src/gtest_main.cc
similarity index 100%
rename from src/gtest_main.cc
rename to googletest/src/gtest_main.cc
diff --git a/test/gtest-death-test_ex_test.cc b/googletest/test/gtest-death-test_ex_test.cc
similarity index 100%
rename from test/gtest-death-test_ex_test.cc
rename to googletest/test/gtest-death-test_ex_test.cc
diff --git a/test/gtest-death-test_test.cc b/googletest/test/gtest-death-test_test.cc
similarity index 100%
rename from test/gtest-death-test_test.cc
rename to googletest/test/gtest-death-test_test.cc
diff --git a/test/gtest-filepath_test.cc b/googletest/test/gtest-filepath_test.cc
similarity index 100%
rename from test/gtest-filepath_test.cc
rename to googletest/test/gtest-filepath_test.cc
diff --git a/test/gtest-linked_ptr_test.cc b/googletest/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from test/gtest-linked_ptr_test.cc
rename to googletest/test/gtest-linked_ptr_test.cc
diff --git a/test/gtest-listener_test.cc b/googletest/test/gtest-listener_test.cc
similarity index 100%
rename from test/gtest-listener_test.cc
rename to googletest/test/gtest-listener_test.cc
diff --git a/test/gtest-message_test.cc b/googletest/test/gtest-message_test.cc
similarity index 100%
rename from test/gtest-message_test.cc
rename to googletest/test/gtest-message_test.cc
diff --git a/test/gtest-options_test.cc b/googletest/test/gtest-options_test.cc
similarity index 100%
rename from test/gtest-options_test.cc
rename to googletest/test/gtest-options_test.cc
diff --git a/test/gtest-param-test2_test.cc b/googletest/test/gtest-param-test2_test.cc
similarity index 100%
rename from test/gtest-param-test2_test.cc
rename to googletest/test/gtest-param-test2_test.cc
diff --git a/test/gtest-param-test_test.cc b/googletest/test/gtest-param-test_test.cc
similarity index 100%
rename from test/gtest-param-test_test.cc
rename to googletest/test/gtest-param-test_test.cc
diff --git a/test/gtest-param-test_test.h b/googletest/test/gtest-param-test_test.h
similarity index 100%
rename from test/gtest-param-test_test.h
rename to googletest/test/gtest-param-test_test.h
diff --git a/test/gtest-port_test.cc b/googletest/test/gtest-port_test.cc
similarity index 100%
rename from test/gtest-port_test.cc
rename to googletest/test/gtest-port_test.cc
diff --git a/test/gtest-printers_test.cc b/googletest/test/gtest-printers_test.cc
similarity index 100%
rename from test/gtest-printers_test.cc
rename to googletest/test/gtest-printers_test.cc
diff --git a/test/gtest-test-part_test.cc b/googletest/test/gtest-test-part_test.cc
similarity index 100%
rename from test/gtest-test-part_test.cc
rename to googletest/test/gtest-test-part_test.cc
diff --git a/test/gtest-tuple_test.cc b/googletest/test/gtest-tuple_test.cc
similarity index 100%
rename from test/gtest-tuple_test.cc
rename to googletest/test/gtest-tuple_test.cc
diff --git a/test/gtest-typed-test2_test.cc b/googletest/test/gtest-typed-test2_test.cc
similarity index 100%
rename from test/gtest-typed-test2_test.cc
rename to googletest/test/gtest-typed-test2_test.cc
diff --git a/test/gtest-typed-test_test.cc b/googletest/test/gtest-typed-test_test.cc
similarity index 100%
rename from test/gtest-typed-test_test.cc
rename to googletest/test/gtest-typed-test_test.cc
diff --git a/test/gtest-typed-test_test.h b/googletest/test/gtest-typed-test_test.h
similarity index 100%
rename from test/gtest-typed-test_test.h
rename to googletest/test/gtest-typed-test_test.h
diff --git a/test/gtest-unittest-api_test.cc b/googletest/test/gtest-unittest-api_test.cc
similarity index 100%
rename from test/gtest-unittest-api_test.cc
rename to googletest/test/gtest-unittest-api_test.cc
diff --git a/test/gtest_all_test.cc b/googletest/test/gtest_all_test.cc
similarity index 100%
rename from test/gtest_all_test.cc
rename to googletest/test/gtest_all_test.cc
diff --git a/test/gtest_break_on_failure_unittest.py b/googletest/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from test/gtest_break_on_failure_unittest.py
rename to googletest/test/gtest_break_on_failure_unittest.py
diff --git a/test/gtest_break_on_failure_unittest_.cc b/googletest/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from test/gtest_break_on_failure_unittest_.cc
rename to googletest/test/gtest_break_on_failure_unittest_.cc
diff --git a/test/gtest_catch_exceptions_test.py b/googletest/test/gtest_catch_exceptions_test.py
similarity index 100%
rename from test/gtest_catch_exceptions_test.py
rename to googletest/test/gtest_catch_exceptions_test.py
diff --git a/test/gtest_catch_exceptions_test_.cc b/googletest/test/gtest_catch_exceptions_test_.cc
similarity index 100%
rename from test/gtest_catch_exceptions_test_.cc
rename to googletest/test/gtest_catch_exceptions_test_.cc
diff --git a/test/gtest_color_test.py b/googletest/test/gtest_color_test.py
similarity index 100%
rename from test/gtest_color_test.py
rename to googletest/test/gtest_color_test.py
diff --git a/test/gtest_color_test_.cc b/googletest/test/gtest_color_test_.cc
similarity index 100%
rename from test/gtest_color_test_.cc
rename to googletest/test/gtest_color_test_.cc
diff --git a/test/gtest_env_var_test.py b/googletest/test/gtest_env_var_test.py
similarity index 100%
rename from test/gtest_env_var_test.py
rename to googletest/test/gtest_env_var_test.py
diff --git a/test/gtest_env_var_test_.cc b/googletest/test/gtest_env_var_test_.cc
similarity index 100%
rename from test/gtest_env_var_test_.cc
rename to googletest/test/gtest_env_var_test_.cc
diff --git a/test/gtest_environment_test.cc b/googletest/test/gtest_environment_test.cc
similarity index 100%
rename from test/gtest_environment_test.cc
rename to googletest/test/gtest_environment_test.cc
diff --git a/test/gtest_filter_unittest.py b/googletest/test/gtest_filter_unittest.py
similarity index 100%
rename from test/gtest_filter_unittest.py
rename to googletest/test/gtest_filter_unittest.py
diff --git a/test/gtest_filter_unittest_.cc b/googletest/test/gtest_filter_unittest_.cc
similarity index 100%
rename from test/gtest_filter_unittest_.cc
rename to googletest/test/gtest_filter_unittest_.cc
diff --git a/test/gtest_help_test.py b/googletest/test/gtest_help_test.py
similarity index 100%
rename from test/gtest_help_test.py
rename to googletest/test/gtest_help_test.py
diff --git a/test/gtest_help_test_.cc b/googletest/test/gtest_help_test_.cc
similarity index 100%
rename from test/gtest_help_test_.cc
rename to googletest/test/gtest_help_test_.cc
diff --git a/test/gtest_list_tests_unittest.py b/googletest/test/gtest_list_tests_unittest.py
similarity index 100%
rename from test/gtest_list_tests_unittest.py
rename to googletest/test/gtest_list_tests_unittest.py
diff --git a/test/gtest_list_tests_unittest_.cc b/googletest/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from test/gtest_list_tests_unittest_.cc
rename to googletest/test/gtest_list_tests_unittest_.cc
diff --git a/test/gtest_main_unittest.cc b/googletest/test/gtest_main_unittest.cc
similarity index 100%
rename from test/gtest_main_unittest.cc
rename to googletest/test/gtest_main_unittest.cc
diff --git a/test/gtest_no_test_unittest.cc b/googletest/test/gtest_no_test_unittest.cc
similarity index 100%
rename from test/gtest_no_test_unittest.cc
rename to googletest/test/gtest_no_test_unittest.cc
diff --git a/test/gtest_output_test.py b/googletest/test/gtest_output_test.py
similarity index 100%
rename from test/gtest_output_test.py
rename to googletest/test/gtest_output_test.py
diff --git a/test/gtest_output_test_.cc b/googletest/test/gtest_output_test_.cc
similarity index 100%
rename from test/gtest_output_test_.cc
rename to googletest/test/gtest_output_test_.cc
diff --git a/test/gtest_output_test_golden_lin.txt b/googletest/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from test/gtest_output_test_golden_lin.txt
rename to googletest/test/gtest_output_test_golden_lin.txt
diff --git a/test/gtest_pred_impl_unittest.cc b/googletest/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from test/gtest_pred_impl_unittest.cc
rename to googletest/test/gtest_pred_impl_unittest.cc
diff --git a/test/gtest_premature_exit_test.cc b/googletest/test/gtest_premature_exit_test.cc
similarity index 100%
rename from test/gtest_premature_exit_test.cc
rename to googletest/test/gtest_premature_exit_test.cc
diff --git a/test/gtest_prod_test.cc b/googletest/test/gtest_prod_test.cc
similarity index 100%
rename from test/gtest_prod_test.cc
rename to googletest/test/gtest_prod_test.cc
diff --git a/test/gtest_repeat_test.cc b/googletest/test/gtest_repeat_test.cc
similarity index 100%
rename from test/gtest_repeat_test.cc
rename to googletest/test/gtest_repeat_test.cc
diff --git a/test/gtest_shuffle_test.py b/googletest/test/gtest_shuffle_test.py
similarity index 100%
rename from test/gtest_shuffle_test.py
rename to googletest/test/gtest_shuffle_test.py
diff --git a/test/gtest_shuffle_test_.cc b/googletest/test/gtest_shuffle_test_.cc
similarity index 100%
rename from test/gtest_shuffle_test_.cc
rename to googletest/test/gtest_shuffle_test_.cc
diff --git a/test/gtest_sole_header_test.cc b/googletest/test/gtest_sole_header_test.cc
similarity index 100%
rename from test/gtest_sole_header_test.cc
rename to googletest/test/gtest_sole_header_test.cc
diff --git a/test/gtest_stress_test.cc b/googletest/test/gtest_stress_test.cc
similarity index 100%
rename from test/gtest_stress_test.cc
rename to googletest/test/gtest_stress_test.cc
diff --git a/test/gtest_test_utils.py b/googletest/test/gtest_test_utils.py
similarity index 100%
rename from test/gtest_test_utils.py
rename to googletest/test/gtest_test_utils.py
diff --git a/test/gtest_throw_on_failure_ex_test.cc b/googletest/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from test/gtest_throw_on_failure_ex_test.cc
rename to googletest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/test/gtest_throw_on_failure_test.py b/googletest/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from test/gtest_throw_on_failure_test.py
rename to googletest/test/gtest_throw_on_failure_test.py
diff --git a/test/gtest_throw_on_failure_test_.cc b/googletest/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from test/gtest_throw_on_failure_test_.cc
rename to googletest/test/gtest_throw_on_failure_test_.cc
diff --git a/test/gtest_uninitialized_test.py b/googletest/test/gtest_uninitialized_test.py
similarity index 100%
rename from test/gtest_uninitialized_test.py
rename to googletest/test/gtest_uninitialized_test.py
diff --git a/test/gtest_uninitialized_test_.cc b/googletest/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from test/gtest_uninitialized_test_.cc
rename to googletest/test/gtest_uninitialized_test_.cc
diff --git a/test/gtest_unittest.cc b/googletest/test/gtest_unittest.cc
similarity index 100%
rename from test/gtest_unittest.cc
rename to googletest/test/gtest_unittest.cc
diff --git a/test/gtest_xml_outfile1_test_.cc b/googletest/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from test/gtest_xml_outfile1_test_.cc
rename to googletest/test/gtest_xml_outfile1_test_.cc
diff --git a/test/gtest_xml_outfile2_test_.cc b/googletest/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from test/gtest_xml_outfile2_test_.cc
rename to googletest/test/gtest_xml_outfile2_test_.cc
diff --git a/test/gtest_xml_outfiles_test.py b/googletest/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from test/gtest_xml_outfiles_test.py
rename to googletest/test/gtest_xml_outfiles_test.py
diff --git a/test/gtest_xml_output_unittest.py b/googletest/test/gtest_xml_output_unittest.py
similarity index 100%
rename from test/gtest_xml_output_unittest.py
rename to googletest/test/gtest_xml_output_unittest.py
diff --git a/test/gtest_xml_output_unittest_.cc b/googletest/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from test/gtest_xml_output_unittest_.cc
rename to googletest/test/gtest_xml_output_unittest_.cc
diff --git a/test/gtest_xml_test_utils.py b/googletest/test/gtest_xml_test_utils.py
similarity index 100%
rename from test/gtest_xml_test_utils.py
rename to googletest/test/gtest_xml_test_utils.py
diff --git a/test/production.cc b/googletest/test/production.cc
similarity index 100%
rename from test/production.cc
rename to googletest/test/production.cc
diff --git a/test/production.h b/googletest/test/production.h
similarity index 100%
rename from test/production.h
rename to googletest/test/production.h
diff --git a/xcode/Config/DebugProject.xcconfig b/googletest/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from xcode/Config/DebugProject.xcconfig
rename to googletest/xcode/Config/DebugProject.xcconfig
diff --git a/xcode/Config/FrameworkTarget.xcconfig b/googletest/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from xcode/Config/FrameworkTarget.xcconfig
rename to googletest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/xcode/Config/General.xcconfig b/googletest/xcode/Config/General.xcconfig
similarity index 100%
rename from xcode/Config/General.xcconfig
rename to googletest/xcode/Config/General.xcconfig
diff --git a/xcode/Config/ReleaseProject.xcconfig b/googletest/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from xcode/Config/ReleaseProject.xcconfig
rename to googletest/xcode/Config/ReleaseProject.xcconfig
diff --git a/xcode/Config/StaticLibraryTarget.xcconfig b/googletest/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from xcode/Config/StaticLibraryTarget.xcconfig
rename to googletest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/xcode/Config/TestTarget.xcconfig b/googletest/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from xcode/Config/TestTarget.xcconfig
rename to googletest/xcode/Config/TestTarget.xcconfig
diff --git a/xcode/Resources/Info.plist b/googletest/xcode/Resources/Info.plist
similarity index 100%
rename from xcode/Resources/Info.plist
rename to googletest/xcode/Resources/Info.plist
diff --git a/xcode/Samples/FrameworkSample/Info.plist b/googletest/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from xcode/Samples/FrameworkSample/Info.plist
rename to googletest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/xcode/Samples/FrameworkSample/runtests.sh b/googletest/xcode/Samples/FrameworkSample/runtests.sh
similarity index 100%
rename from xcode/Samples/FrameworkSample/runtests.sh
rename to googletest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/xcode/Samples/FrameworkSample/widget.cc b/googletest/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from xcode/Samples/FrameworkSample/widget.cc
rename to googletest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/xcode/Samples/FrameworkSample/widget.h b/googletest/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from xcode/Samples/FrameworkSample/widget.h
rename to googletest/xcode/Samples/FrameworkSample/widget.h
diff --git a/xcode/Samples/FrameworkSample/widget_test.cc b/googletest/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from xcode/Samples/FrameworkSample/widget_test.cc
rename to googletest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/xcode/Scripts/runtests.sh b/googletest/xcode/Scripts/runtests.sh
similarity index 100%
rename from xcode/Scripts/runtests.sh
rename to googletest/xcode/Scripts/runtests.sh
diff --git a/xcode/Scripts/versiongenerate.py b/googletest/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from xcode/Scripts/versiongenerate.py
rename to googletest/xcode/Scripts/versiongenerate.py
diff --git a/xcode/gtest.xcodeproj/project.pbxproj b/googletest/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from xcode/gtest.xcodeproj/project.pbxproj
rename to googletest/xcode/gtest.xcodeproj/project.pbxproj