diff --git a/CHANGES b/googlemock/CHANGES similarity index 100% rename from CHANGES rename to googlemock/CHANGES diff --git a/CMakeLists.txt b/googlemock/CMakeLists.txt similarity index 100% rename from CMakeLists.txt rename to googlemock/CMakeLists.txt diff --git a/CONTRIBUTORS b/googlemock/CONTRIBUTORS similarity index 100% rename from CONTRIBUTORS rename to googlemock/CONTRIBUTORS diff --git a/LICENSE b/googlemock/LICENSE similarity index 100% rename from LICENSE rename to googlemock/LICENSE diff --git a/Makefile.am b/googlemock/Makefile.am similarity index 100% rename from Makefile.am rename to googlemock/Makefile.am diff --git a/README.md b/googlemock/README.md similarity index 100% rename from README.md rename to googlemock/README.md diff --git a/build-aux/.keep b/googlemock/build-aux/.keep similarity index 100% rename from build-aux/.keep rename to googlemock/build-aux/.keep diff --git a/configure.ac b/googlemock/configure.ac similarity index 100% rename from configure.ac rename to googlemock/configure.ac diff --git a/docs/CheatSheet.md b/googlemock/docs/CheatSheet.md similarity index 100% rename from docs/CheatSheet.md rename to googlemock/docs/CheatSheet.md diff --git a/docs/CookBook.md b/googlemock/docs/CookBook.md similarity index 100% rename from docs/CookBook.md rename to googlemock/docs/CookBook.md diff --git a/docs/DesignDoc.md b/googlemock/docs/DesignDoc.md similarity index 100% rename from docs/DesignDoc.md rename to googlemock/docs/DesignDoc.md diff --git a/docs/DevGuide.md b/googlemock/docs/DevGuide.md similarity index 100% rename from docs/DevGuide.md rename to googlemock/docs/DevGuide.md diff --git a/docs/Documentation.md b/googlemock/docs/Documentation.md similarity index 100% rename from docs/Documentation.md rename to googlemock/docs/Documentation.md diff --git a/docs/ForDummies.md b/googlemock/docs/ForDummies.md similarity index 100% rename from docs/ForDummies.md rename to googlemock/docs/ForDummies.md diff --git a/docs/FrequentlyAskedQuestions.md b/googlemock/docs/FrequentlyAskedQuestions.md similarity index 100% rename from docs/FrequentlyAskedQuestions.md rename to googlemock/docs/FrequentlyAskedQuestions.md diff --git a/docs/KnownIssues.md b/googlemock/docs/KnownIssues.md similarity index 100% rename from docs/KnownIssues.md rename to googlemock/docs/KnownIssues.md diff --git a/docs/ProjectHome.md b/googlemock/docs/ProjectHome.md similarity index 100% rename from docs/ProjectHome.md rename to googlemock/docs/ProjectHome.md diff --git a/docs/v1_5/CheatSheet.md b/googlemock/docs/v1_5/CheatSheet.md similarity index 100% rename from docs/v1_5/CheatSheet.md rename to googlemock/docs/v1_5/CheatSheet.md diff --git a/docs/v1_5/CookBook.md b/googlemock/docs/v1_5/CookBook.md similarity index 100% rename from docs/v1_5/CookBook.md rename to googlemock/docs/v1_5/CookBook.md diff --git a/docs/v1_5/Documentation.md b/googlemock/docs/v1_5/Documentation.md similarity index 100% rename from docs/v1_5/Documentation.md rename to googlemock/docs/v1_5/Documentation.md diff --git a/docs/v1_5/ForDummies.md b/googlemock/docs/v1_5/ForDummies.md similarity index 100% rename from docs/v1_5/ForDummies.md rename to googlemock/docs/v1_5/ForDummies.md diff --git a/docs/v1_5/FrequentlyAskedQuestions.md b/googlemock/docs/v1_5/FrequentlyAskedQuestions.md similarity index 100% rename from docs/v1_5/FrequentlyAskedQuestions.md rename to googlemock/docs/v1_5/FrequentlyAskedQuestions.md diff --git a/docs/v1_6/CheatSheet.md b/googlemock/docs/v1_6/CheatSheet.md similarity index 100% rename from docs/v1_6/CheatSheet.md rename to googlemock/docs/v1_6/CheatSheet.md diff --git a/docs/v1_6/CookBook.md b/googlemock/docs/v1_6/CookBook.md similarity index 100% rename from docs/v1_6/CookBook.md rename to googlemock/docs/v1_6/CookBook.md diff --git a/docs/v1_6/Documentation.md b/googlemock/docs/v1_6/Documentation.md similarity index 100% rename from docs/v1_6/Documentation.md rename to googlemock/docs/v1_6/Documentation.md diff --git a/docs/v1_6/ForDummies.md b/googlemock/docs/v1_6/ForDummies.md similarity index 100% rename from docs/v1_6/ForDummies.md rename to googlemock/docs/v1_6/ForDummies.md diff --git a/docs/v1_6/FrequentlyAskedQuestions.md b/googlemock/docs/v1_6/FrequentlyAskedQuestions.md similarity index 100% rename from docs/v1_6/FrequentlyAskedQuestions.md rename to googlemock/docs/v1_6/FrequentlyAskedQuestions.md diff --git a/docs/v1_7/CheatSheet.md b/googlemock/docs/v1_7/CheatSheet.md similarity index 100% rename from docs/v1_7/CheatSheet.md rename to googlemock/docs/v1_7/CheatSheet.md diff --git a/docs/v1_7/CookBook.md b/googlemock/docs/v1_7/CookBook.md similarity index 100% rename from docs/v1_7/CookBook.md rename to googlemock/docs/v1_7/CookBook.md diff --git a/docs/v1_7/Documentation.md b/googlemock/docs/v1_7/Documentation.md similarity index 100% rename from docs/v1_7/Documentation.md rename to googlemock/docs/v1_7/Documentation.md diff --git a/docs/v1_7/ForDummies.md b/googlemock/docs/v1_7/ForDummies.md similarity index 100% rename from docs/v1_7/ForDummies.md rename to googlemock/docs/v1_7/ForDummies.md diff --git a/docs/v1_7/FrequentlyAskedQuestions.md b/googlemock/docs/v1_7/FrequentlyAskedQuestions.md similarity index 100% rename from docs/v1_7/FrequentlyAskedQuestions.md rename to googlemock/docs/v1_7/FrequentlyAskedQuestions.md diff --git a/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h similarity index 100% rename from include/gmock/gmock-actions.h rename to googlemock/include/gmock/gmock-actions.h diff --git a/include/gmock/gmock-cardinalities.h b/googlemock/include/gmock/gmock-cardinalities.h similarity index 100% rename from include/gmock/gmock-cardinalities.h rename to googlemock/include/gmock/gmock-cardinalities.h diff --git a/include/gmock/gmock-generated-actions.h b/googlemock/include/gmock/gmock-generated-actions.h similarity index 100% rename from include/gmock/gmock-generated-actions.h rename to googlemock/include/gmock/gmock-generated-actions.h diff --git a/include/gmock/gmock-generated-actions.h.pump b/googlemock/include/gmock/gmock-generated-actions.h.pump similarity index 100% rename from include/gmock/gmock-generated-actions.h.pump rename to googlemock/include/gmock/gmock-generated-actions.h.pump diff --git a/include/gmock/gmock-generated-function-mockers.h b/googlemock/include/gmock/gmock-generated-function-mockers.h similarity index 100% rename from include/gmock/gmock-generated-function-mockers.h rename to googlemock/include/gmock/gmock-generated-function-mockers.h diff --git a/include/gmock/gmock-generated-function-mockers.h.pump b/googlemock/include/gmock/gmock-generated-function-mockers.h.pump similarity index 100% rename from include/gmock/gmock-generated-function-mockers.h.pump rename to googlemock/include/gmock/gmock-generated-function-mockers.h.pump diff --git a/include/gmock/gmock-generated-matchers.h b/googlemock/include/gmock/gmock-generated-matchers.h similarity index 100% rename from include/gmock/gmock-generated-matchers.h rename to googlemock/include/gmock/gmock-generated-matchers.h diff --git a/include/gmock/gmock-generated-matchers.h.pump b/googlemock/include/gmock/gmock-generated-matchers.h.pump similarity index 100% rename from include/gmock/gmock-generated-matchers.h.pump rename to googlemock/include/gmock/gmock-generated-matchers.h.pump diff --git a/include/gmock/gmock-generated-nice-strict.h b/googlemock/include/gmock/gmock-generated-nice-strict.h similarity index 100% rename from include/gmock/gmock-generated-nice-strict.h rename to googlemock/include/gmock/gmock-generated-nice-strict.h diff --git a/include/gmock/gmock-generated-nice-strict.h.pump b/googlemock/include/gmock/gmock-generated-nice-strict.h.pump similarity index 100% rename from include/gmock/gmock-generated-nice-strict.h.pump rename to googlemock/include/gmock/gmock-generated-nice-strict.h.pump diff --git a/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h similarity index 100% rename from include/gmock/gmock-matchers.h rename to googlemock/include/gmock/gmock-matchers.h diff --git a/include/gmock/gmock-more-actions.h b/googlemock/include/gmock/gmock-more-actions.h similarity index 100% rename from include/gmock/gmock-more-actions.h rename to googlemock/include/gmock/gmock-more-actions.h diff --git a/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h similarity index 100% rename from include/gmock/gmock-more-matchers.h rename to googlemock/include/gmock/gmock-more-matchers.h diff --git a/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h similarity index 100% rename from include/gmock/gmock-spec-builders.h rename to googlemock/include/gmock/gmock-spec-builders.h diff --git a/include/gmock/gmock.h b/googlemock/include/gmock/gmock.h similarity index 100% rename from include/gmock/gmock.h rename to googlemock/include/gmock/gmock.h diff --git a/include/gmock/internal/custom/gmock-generated-actions.h b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h similarity index 100% rename from include/gmock/internal/custom/gmock-generated-actions.h rename to googlemock/include/gmock/internal/custom/gmock-generated-actions.h diff --git a/include/gmock/internal/custom/gmock-generated-actions.h.pump b/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump similarity index 100% rename from include/gmock/internal/custom/gmock-generated-actions.h.pump rename to googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump diff --git a/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h similarity index 100% rename from include/gmock/internal/custom/gmock-matchers.h rename to googlemock/include/gmock/internal/custom/gmock-matchers.h diff --git a/include/gmock/internal/custom/gmock-port.h b/googlemock/include/gmock/internal/custom/gmock-port.h similarity index 100% rename from include/gmock/internal/custom/gmock-port.h rename to googlemock/include/gmock/internal/custom/gmock-port.h diff --git a/include/gmock/internal/gmock-generated-internal-utils.h b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h similarity index 100% rename from include/gmock/internal/gmock-generated-internal-utils.h rename to googlemock/include/gmock/internal/gmock-generated-internal-utils.h diff --git a/include/gmock/internal/gmock-generated-internal-utils.h.pump b/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump similarity index 100% rename from include/gmock/internal/gmock-generated-internal-utils.h.pump rename to googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump diff --git a/include/gmock/internal/gmock-internal-utils.h b/googlemock/include/gmock/internal/gmock-internal-utils.h similarity index 100% rename from include/gmock/internal/gmock-internal-utils.h rename to googlemock/include/gmock/internal/gmock-internal-utils.h diff --git a/include/gmock/internal/gmock-port.h b/googlemock/include/gmock/internal/gmock-port.h similarity index 100% rename from include/gmock/internal/gmock-port.h rename to googlemock/include/gmock/internal/gmock-port.h diff --git a/make/Makefile b/googlemock/make/Makefile similarity index 100% rename from make/Makefile rename to googlemock/make/Makefile diff --git a/msvc/2005/gmock.sln b/googlemock/msvc/2005/gmock.sln similarity index 100% rename from msvc/2005/gmock.sln rename to googlemock/msvc/2005/gmock.sln diff --git a/msvc/2005/gmock.vcproj b/googlemock/msvc/2005/gmock.vcproj similarity index 100% rename from msvc/2005/gmock.vcproj rename to googlemock/msvc/2005/gmock.vcproj diff --git a/msvc/2005/gmock_config.vsprops b/googlemock/msvc/2005/gmock_config.vsprops similarity index 100% rename from msvc/2005/gmock_config.vsprops rename to googlemock/msvc/2005/gmock_config.vsprops diff --git a/msvc/2005/gmock_main.vcproj b/googlemock/msvc/2005/gmock_main.vcproj similarity index 100% rename from msvc/2005/gmock_main.vcproj rename to googlemock/msvc/2005/gmock_main.vcproj diff --git a/msvc/2005/gmock_test.vcproj b/googlemock/msvc/2005/gmock_test.vcproj similarity index 100% rename from msvc/2005/gmock_test.vcproj rename to googlemock/msvc/2005/gmock_test.vcproj diff --git a/msvc/2010/gmock.sln b/googlemock/msvc/2010/gmock.sln similarity index 100% rename from msvc/2010/gmock.sln rename to googlemock/msvc/2010/gmock.sln diff --git a/msvc/2010/gmock.vcxproj b/googlemock/msvc/2010/gmock.vcxproj similarity index 100% rename from msvc/2010/gmock.vcxproj rename to googlemock/msvc/2010/gmock.vcxproj diff --git a/msvc/2010/gmock_config.props b/googlemock/msvc/2010/gmock_config.props similarity index 100% rename from msvc/2010/gmock_config.props rename to googlemock/msvc/2010/gmock_config.props diff --git a/msvc/2010/gmock_main.vcxproj b/googlemock/msvc/2010/gmock_main.vcxproj similarity index 100% rename from msvc/2010/gmock_main.vcxproj rename to googlemock/msvc/2010/gmock_main.vcxproj diff --git a/msvc/2010/gmock_test.vcxproj b/googlemock/msvc/2010/gmock_test.vcxproj similarity index 100% rename from msvc/2010/gmock_test.vcxproj rename to googlemock/msvc/2010/gmock_test.vcxproj diff --git a/scripts/fuse_gmock_files.py b/googlemock/scripts/fuse_gmock_files.py similarity index 100% rename from scripts/fuse_gmock_files.py rename to googlemock/scripts/fuse_gmock_files.py diff --git a/scripts/generator/LICENSE b/googlemock/scripts/generator/LICENSE similarity index 100% rename from scripts/generator/LICENSE rename to googlemock/scripts/generator/LICENSE diff --git a/scripts/generator/README b/googlemock/scripts/generator/README similarity index 100% rename from scripts/generator/README rename to googlemock/scripts/generator/README diff --git a/scripts/generator/README.cppclean b/googlemock/scripts/generator/README.cppclean similarity index 100% rename from scripts/generator/README.cppclean rename to googlemock/scripts/generator/README.cppclean diff --git a/scripts/generator/cpp/__init__.py b/googlemock/scripts/generator/cpp/__init__.py similarity index 100% rename from scripts/generator/cpp/__init__.py rename to googlemock/scripts/generator/cpp/__init__.py diff --git a/scripts/generator/cpp/ast.py b/googlemock/scripts/generator/cpp/ast.py similarity index 100% rename from scripts/generator/cpp/ast.py rename to googlemock/scripts/generator/cpp/ast.py diff --git a/scripts/generator/cpp/gmock_class.py b/googlemock/scripts/generator/cpp/gmock_class.py similarity index 100% rename from scripts/generator/cpp/gmock_class.py rename to googlemock/scripts/generator/cpp/gmock_class.py diff --git a/scripts/generator/cpp/gmock_class_test.py b/googlemock/scripts/generator/cpp/gmock_class_test.py similarity index 100% rename from scripts/generator/cpp/gmock_class_test.py rename to googlemock/scripts/generator/cpp/gmock_class_test.py diff --git a/scripts/generator/cpp/keywords.py b/googlemock/scripts/generator/cpp/keywords.py similarity index 100% rename from scripts/generator/cpp/keywords.py rename to googlemock/scripts/generator/cpp/keywords.py diff --git a/scripts/generator/cpp/tokenize.py b/googlemock/scripts/generator/cpp/tokenize.py similarity index 100% rename from scripts/generator/cpp/tokenize.py rename to googlemock/scripts/generator/cpp/tokenize.py diff --git a/scripts/generator/cpp/utils.py b/googlemock/scripts/generator/cpp/utils.py similarity index 100% rename from scripts/generator/cpp/utils.py rename to googlemock/scripts/generator/cpp/utils.py diff --git a/scripts/generator/gmock_gen.py b/googlemock/scripts/generator/gmock_gen.py similarity index 100% rename from scripts/generator/gmock_gen.py rename to googlemock/scripts/generator/gmock_gen.py diff --git a/scripts/gmock-config.in b/googlemock/scripts/gmock-config.in similarity index 100% rename from scripts/gmock-config.in rename to googlemock/scripts/gmock-config.in diff --git a/scripts/gmock_doctor.py b/googlemock/scripts/gmock_doctor.py similarity index 100% rename from scripts/gmock_doctor.py rename to googlemock/scripts/gmock_doctor.py diff --git a/scripts/upload.py b/googlemock/scripts/upload.py similarity index 100% rename from scripts/upload.py rename to googlemock/scripts/upload.py diff --git a/scripts/upload_gmock.py b/googlemock/scripts/upload_gmock.py similarity index 100% rename from scripts/upload_gmock.py rename to googlemock/scripts/upload_gmock.py diff --git a/src/gmock-all.cc b/googlemock/src/gmock-all.cc similarity index 100% rename from src/gmock-all.cc rename to googlemock/src/gmock-all.cc diff --git a/src/gmock-cardinalities.cc b/googlemock/src/gmock-cardinalities.cc similarity index 100% rename from src/gmock-cardinalities.cc rename to googlemock/src/gmock-cardinalities.cc diff --git a/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc similarity index 100% rename from src/gmock-internal-utils.cc rename to googlemock/src/gmock-internal-utils.cc diff --git a/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc similarity index 100% rename from src/gmock-matchers.cc rename to googlemock/src/gmock-matchers.cc diff --git a/src/gmock-spec-builders.cc b/googlemock/src/gmock-spec-builders.cc similarity index 100% rename from src/gmock-spec-builders.cc rename to googlemock/src/gmock-spec-builders.cc diff --git a/src/gmock.cc b/googlemock/src/gmock.cc similarity index 100% rename from src/gmock.cc rename to googlemock/src/gmock.cc diff --git a/src/gmock_main.cc b/googlemock/src/gmock_main.cc similarity index 100% rename from src/gmock_main.cc rename to googlemock/src/gmock_main.cc diff --git a/test/gmock-actions_test.cc b/googlemock/test/gmock-actions_test.cc similarity index 100% rename from test/gmock-actions_test.cc rename to googlemock/test/gmock-actions_test.cc diff --git a/test/gmock-cardinalities_test.cc b/googlemock/test/gmock-cardinalities_test.cc similarity index 100% rename from test/gmock-cardinalities_test.cc rename to googlemock/test/gmock-cardinalities_test.cc diff --git a/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc similarity index 100% rename from test/gmock-generated-actions_test.cc rename to googlemock/test/gmock-generated-actions_test.cc diff --git a/test/gmock-generated-function-mockers_test.cc b/googlemock/test/gmock-generated-function-mockers_test.cc similarity index 100% rename from test/gmock-generated-function-mockers_test.cc rename to googlemock/test/gmock-generated-function-mockers_test.cc diff --git a/test/gmock-generated-internal-utils_test.cc b/googlemock/test/gmock-generated-internal-utils_test.cc similarity index 100% rename from test/gmock-generated-internal-utils_test.cc rename to googlemock/test/gmock-generated-internal-utils_test.cc diff --git a/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc similarity index 100% rename from test/gmock-generated-matchers_test.cc rename to googlemock/test/gmock-generated-matchers_test.cc diff --git a/test/gmock-internal-utils_test.cc b/googlemock/test/gmock-internal-utils_test.cc similarity index 100% rename from test/gmock-internal-utils_test.cc rename to googlemock/test/gmock-internal-utils_test.cc diff --git a/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc similarity index 100% rename from test/gmock-matchers_test.cc rename to googlemock/test/gmock-matchers_test.cc diff --git a/test/gmock-more-actions_test.cc b/googlemock/test/gmock-more-actions_test.cc similarity index 100% rename from test/gmock-more-actions_test.cc rename to googlemock/test/gmock-more-actions_test.cc diff --git a/test/gmock-nice-strict_test.cc b/googlemock/test/gmock-nice-strict_test.cc similarity index 100% rename from test/gmock-nice-strict_test.cc rename to googlemock/test/gmock-nice-strict_test.cc diff --git a/test/gmock-port_test.cc b/googlemock/test/gmock-port_test.cc similarity index 100% rename from test/gmock-port_test.cc rename to googlemock/test/gmock-port_test.cc diff --git a/test/gmock-spec-builders_test.cc b/googlemock/test/gmock-spec-builders_test.cc similarity index 100% rename from test/gmock-spec-builders_test.cc rename to googlemock/test/gmock-spec-builders_test.cc diff --git a/test/gmock_all_test.cc b/googlemock/test/gmock_all_test.cc similarity index 100% rename from test/gmock_all_test.cc rename to googlemock/test/gmock_all_test.cc diff --git a/test/gmock_ex_test.cc b/googlemock/test/gmock_ex_test.cc similarity index 100% rename from test/gmock_ex_test.cc rename to googlemock/test/gmock_ex_test.cc diff --git a/test/gmock_leak_test.py b/googlemock/test/gmock_leak_test.py similarity index 100% rename from test/gmock_leak_test.py rename to googlemock/test/gmock_leak_test.py diff --git a/test/gmock_leak_test_.cc b/googlemock/test/gmock_leak_test_.cc similarity index 100% rename from test/gmock_leak_test_.cc rename to googlemock/test/gmock_leak_test_.cc diff --git a/test/gmock_link2_test.cc b/googlemock/test/gmock_link2_test.cc similarity index 100% rename from test/gmock_link2_test.cc rename to googlemock/test/gmock_link2_test.cc diff --git a/test/gmock_link_test.cc b/googlemock/test/gmock_link_test.cc similarity index 100% rename from test/gmock_link_test.cc rename to googlemock/test/gmock_link_test.cc diff --git a/test/gmock_link_test.h b/googlemock/test/gmock_link_test.h similarity index 100% rename from test/gmock_link_test.h rename to googlemock/test/gmock_link_test.h diff --git a/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py similarity index 100% rename from test/gmock_output_test.py rename to googlemock/test/gmock_output_test.py diff --git a/test/gmock_output_test_.cc b/googlemock/test/gmock_output_test_.cc similarity index 100% rename from test/gmock_output_test_.cc rename to googlemock/test/gmock_output_test_.cc diff --git a/test/gmock_output_test_golden.txt b/googlemock/test/gmock_output_test_golden.txt similarity index 100% rename from test/gmock_output_test_golden.txt rename to googlemock/test/gmock_output_test_golden.txt diff --git a/test/gmock_stress_test.cc b/googlemock/test/gmock_stress_test.cc similarity index 100% rename from test/gmock_stress_test.cc rename to googlemock/test/gmock_stress_test.cc diff --git a/test/gmock_test.cc b/googlemock/test/gmock_test.cc similarity index 100% rename from test/gmock_test.cc rename to googlemock/test/gmock_test.cc diff --git a/test/gmock_test_utils.py b/googlemock/test/gmock_test_utils.py similarity index 100% rename from test/gmock_test_utils.py rename to googlemock/test/gmock_test_utils.py