Merge commit 'fa9c8eaf4fe936f35dd95a1eecfbbb228494522d' as 'third_party/googletest'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ebdfcc..939e534 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,160 +1,28 @@
-# How to become a contributor and submit your own code
+# How to Contribute
 
-## Contributor License Agreements
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
 
-We'd love to accept your patches! Before we can take them, we
-have to jump a couple of legal hurdles.
+## Contributor License Agreement
 
-Please fill out either the individual or corporate Contributor License Agreement
-(CLA).
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
 
-  * If you are an individual writing original source code and you're sure you
-    own the intellectual property, then you'll need to sign an
-    [individual CLA](https://developers.google.com/open-source/cla/individual).
-  * If you work for a company that wants to allow you to contribute your work,
-    then you'll need to sign a
-    [corporate CLA](https://developers.google.com/open-source/cla/corporate).
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
 
-Follow either of the two links above to access the appropriate CLA and
-instructions for how to sign and return it. Once we receive it, we'll be able to
-accept your pull requests.
+## Code reviews
 
-## Contributing A Patch
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
 
-1. Submit an issue describing your proposed change to the
-   [issue tracker](https://github.com/google/googletest).
-1. Please don't mix more than one logical change per submittal,
-   because it makes the history hard to follow. If you want to make a
-   change that doesn't have a corresponding issue in the issue
-   tracker, please create one.
-1. Also, coordinate with team members that are listed on the issue in
-   question. This ensures that work isn't being duplicated and
-   communicating your plan early also generally leads to better
-   patches.
-1. If your proposed change is accepted, and you haven't already done so, sign a
-   Contributor License Agreement (see details above).
-1. Fork the desired repo, develop and test your code changes.
-1. Ensure that your code adheres to the existing style in the sample to which
-   you are contributing.
-1. Ensure that your code has an appropriate set of unit tests which all pass.
-1. Submit a pull request.
+## Community Guidelines
 
-If you are a Googler, it is preferable to first create an internal change and
-have it reviewed and submitted, and then create an upstreaming pull
-request here. 
-
-## The Google Test and Google Mock Communities ##
-
-The Google Test community exists primarily through the
-[discussion group](http://groups.google.com/group/googletestframework)
-and the GitHub repository.
-Likewise, the Google Mock community exists primarily through their own
-[discussion group](http://groups.google.com/group/googlemock).
-You are definitely encouraged to contribute to the
-discussion and you can also help us to keep the effectiveness of the
-group high by following and promoting the guidelines listed here.
-
-### Please Be Friendly ###
-
-Showing courtesy and respect to others is a vital part of the Google
-culture, and we strongly encourage everyone participating in Google
-Test development to join us in accepting nothing less. Of course,
-being courteous is not the same as failing to constructively disagree
-with each other, but it does mean that we should be respectful of each
-other when enumerating the 42 technical reasons that a particular
-proposal may not be the best choice. There's never a reason to be
-antagonistic or dismissive toward anyone who is sincerely trying to
-contribute to a discussion.
-
-Sure, C++ testing is serious business and all that, but it's also
-a lot of fun. Let's keep it that way. Let's strive to be one of the
-friendliest communities in all of open source.
-
-As always, discuss Google Test in the official GoogleTest discussion group.
-You don't have to actually submit code in order to sign up. Your participation
-itself is a valuable contribution.
-
-## Style
-
-To keep the source consistent, readable, diffable and easy to merge,
-we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project.  All patches will be expected
-to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html).
-
-## Requirements for Contributors ###
-
-If you plan to contribute a patch, you need to build Google Test,
-Google Mock, and their own tests from a git checkout, which has
-further requirements:
-
-  * [Python](https://www.python.org/) v2.3 or newer (for running some of
-    the tests and re-generating certain source files from templates)
-  * [CMake](https://cmake.org/) v2.6.4 or newer
-  * [GNU Build System](https://en.wikipedia.org/wiki/GNU_Build_System)
-    including automake (>= 1.9), autoconf (>= 2.59), and
-    libtool / libtoolize.
-
-## Developing Google Test ##
-
-This section discusses how to make your own changes to Google Test.
-
-### Testing Google Test Itself ###
-
-To make sure your changes work as intended and don't break existing
-functionality, you'll want to compile and run Google Test's own tests.
-For that you can use CMake:
-
-    mkdir mybuild
-    cd mybuild
-    cmake -Dgtest_build_tests=ON ${GTEST_DIR}
-
-Make sure you have Python installed, as some of Google Test's tests
-are written in Python.  If the cmake command complains about not being
-able to find Python (`Could NOT find PythonInterp (missing:
-PYTHON_EXECUTABLE)`), try telling it explicitly where your Python
-executable can be found:
-
-    cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR}
-
-Next, you can build Google Test and all of its own tests.  On \*nix,
-this is usually done by 'make'.  To run the tests, do
-
-    make test
-
-All tests should pass.
-
-### Regenerating Source Files ##
-
-Some of Google Test's source files are generated from templates (not
-in the C++ sense) using a script.
-For example, the
-file include/gtest/internal/gtest-type-util.h.pump is used to generate
-gtest-type-util.h in the same directory.
-
-You don't need to worry about regenerating the source files
-unless you need to modify them.  You would then modify the
-corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)'
-generator script.  See the [Pump Manual](googletest/docs/PumpManual.md).
-
-## Developing Google Mock ###
-
-This section discusses how to make your own changes to Google Mock.
-
-#### Testing Google Mock Itself ####
-
-To make sure your changes work as intended and don't break existing
-functionality, you'll want to compile and run Google Test's own tests.
-For that you'll need Autotools.  First, make sure you have followed
-the instructions above to configure Google Mock.
-Then, create a build output directory and enter it.  Next,
-
-    ${GMOCK_DIR}/configure  # try --help for more info
-
-Once you have successfully configured Google Mock, the build steps are
-standard for GNU-style OSS packages.
-
-    make        # Standard makefile following GNU conventions
-    make check  # Builds and runs all tests - all should pass.
-
-Note that when building your project against Google Mock, you are building
-against Google Test as well.  There is no need to configure Google Test
-separately.
+This project follows [Google's Open Source Community
+Guidelines](https://opensource.google.com/conduct/).
diff --git a/LICENSE b/LICENSE
index 1941a11..d645695 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,28 +1,202 @@
-Copyright 2008, Google Inc.
-All rights reserved.
 
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
 
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/README.md b/README.md
index d87abce..41daba0 100644
--- a/README.md
+++ b/README.md
@@ -1,122 +1,15 @@
+# astc-codec
 
-# Google Test #
+astc-codec is a software ASTC decoder implementation, which supports the ASTC
+LDR profile.
 
-[![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest)
-[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master)
+## Contributing
 
-Welcome to **Google Test**, Google's C++ test framework!
+See [CONTRIBUTING.md](CONTRIBUTING.md) for important contributing requirements.
 
-This repository is a merger of the formerly separate GoogleTest and
-GoogleMock projects. These were so closely related that it makes sense to
-maintain and release them together.
+## License
 
-Please see the project page above for more information as well as the
-mailing list for questions, discussions, and development.  There is
-also an IRC channel on [OFTC](https://webchat.oftc.net/) (irc.oftc.net) #gtest available.  Please
-join us!
+astc-codec project is licensed under the Apache License Version 2.0. You can
+find a copy of it in [LICENSE](LICENSE).
 
-Getting started information for **Google Test** is available in the
-[Google Test Primer](googletest/docs/primer.md) documentation.
-
-**Google Mock** is an extension to Google Test for writing and using C++ mock
-classes.  See the separate [Google Mock documentation](googlemock/README.md).
-
-More detailed documentation for googletest (including build instructions) are
-in its interior [googletest/README.md](googletest/README.md) file.
-
-## Features ##
-
-  * An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
-  * Test discovery.
-  * A rich set of assertions.
-  * User-defined assertions.
-  * Death tests.
-  * Fatal and non-fatal failures.
-  * Value-parameterized tests.
-  * Type-parameterized tests.
-  * Various options for running the tests.
-  * XML test report generation.
-
-## Platforms ##
-
-Google test has been used on a variety of platforms:
-
-  * Linux
-  * Mac OS X
-  * Windows
-  * Cygwin
-  * MinGW
-  * Windows Mobile
-  * Symbian
-
-## Who Is Using Google Test? ##
-
-In addition to many internal projects at Google, Google Test is also used by
-the following notable projects:
-
-  * The [Chromium projects](http://www.chromium.org/) (behind the Chrome
-    browser and Chrome OS).
-  * The [LLVM](http://llvm.org/) compiler.
-  * [Protocol Buffers](https://github.com/google/protobuf), Google's data
-    interchange format.
-  * The [OpenCV](http://opencv.org/) computer vision library.
-  * [tiny-dnn](https://github.com/tiny-dnn/tiny-dnn): header only, dependency-free deep learning framework in C++11.
-
-## Related Open Source Projects ##
-
-[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based automated test-runner and Graphical User Interface with powerful features for Windows and Linux platforms.
-
-[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs
-your test binary, allows you to track its progress via a progress bar, and
-displays a list of test failures. Clicking on one shows failure text. Google
-Test UI is written in C#.
-
-[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
-listener for Google Test that implements the
-[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
-result output. If your test runner understands TAP, you may find it useful.
-
-[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that
-runs tests from your binary in parallel to provide significant speed-up.
-
-## Requirements ##
-
-Google Test is designed to have fairly minimal requirements to build
-and use with your projects, but there are some.  Currently, we support
-Linux, Windows, Mac OS X, and Cygwin.  We will also make our best
-effort to support other platforms (e.g. Solaris, AIX, and z/OS).
-However, since core members of the Google Test project have no access
-to these platforms, Google Test may have outstanding issues there.  If
-you notice any problems on your platform, please notify
-[googletestframework@googlegroups.com](https://groups.google.com/forum/#!forum/googletestframework). Patches for fixing them are
-even more welcome!
-
-### Linux Requirements ###
-
-These are the base requirements to build and use Google Test from a source
-package (as described below):
-
-  * GNU-compatible Make or gmake
-  * POSIX-standard shell
-  * POSIX(-2) Regular Expressions (regex.h)
-  * A C++98-standard-compliant compiler
-
-### Windows Requirements ###
-
-  * Microsoft Visual C++ 2015 or newer
-
-### Cygwin Requirements ###
-
-  * Cygwin v1.5.25-14 or newer
-
-### Mac OS X Requirements ###
-
-  * Mac OS X v10.4 Tiger or newer
-  * Xcode Developer Tools
-
-## Contributing change
-
-Please read the [`CONTRIBUTING.md`](CONTRIBUTING.md) for details on
-how to contribute to this project.
-
-Happy testing!
+This is not an official Google product.
diff --git a/.gitignore b/third_party/googletest/.gitignore
similarity index 100%
rename from .gitignore
rename to third_party/googletest/.gitignore
diff --git a/.travis.yml b/third_party/googletest/.travis.yml
similarity index 100%
rename from .travis.yml
rename to third_party/googletest/.travis.yml
diff --git a/BUILD.bazel b/third_party/googletest/BUILD.bazel
similarity index 100%
rename from BUILD.bazel
rename to third_party/googletest/BUILD.bazel
diff --git a/CMakeLists.txt b/third_party/googletest/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to third_party/googletest/CMakeLists.txt
diff --git a/third_party/googletest/CONTRIBUTING.md b/third_party/googletest/CONTRIBUTING.md
new file mode 100644
index 0000000..0ebdfcc
--- /dev/null
+++ b/third_party/googletest/CONTRIBUTING.md
@@ -0,0 +1,160 @@
+# How to become a contributor and submit your own code
+
+## Contributor License Agreements
+
+We'd love to accept your patches! Before we can take them, we
+have to jump a couple of legal hurdles.
+
+Please fill out either the individual or corporate Contributor License Agreement
+(CLA).
+
+  * If you are an individual writing original source code and you're sure you
+    own the intellectual property, then you'll need to sign an
+    [individual CLA](https://developers.google.com/open-source/cla/individual).
+  * If you work for a company that wants to allow you to contribute your work,
+    then you'll need to sign a
+    [corporate CLA](https://developers.google.com/open-source/cla/corporate).
+
+Follow either of the two links above to access the appropriate CLA and
+instructions for how to sign and return it. Once we receive it, we'll be able to
+accept your pull requests.
+
+## Contributing A Patch
+
+1. Submit an issue describing your proposed change to the
+   [issue tracker](https://github.com/google/googletest).
+1. Please don't mix more than one logical change per submittal,
+   because it makes the history hard to follow. If you want to make a
+   change that doesn't have a corresponding issue in the issue
+   tracker, please create one.
+1. Also, coordinate with team members that are listed on the issue in
+   question. This ensures that work isn't being duplicated and
+   communicating your plan early also generally leads to better
+   patches.
+1. If your proposed change is accepted, and you haven't already done so, sign a
+   Contributor License Agreement (see details above).
+1. Fork the desired repo, develop and test your code changes.
+1. Ensure that your code adheres to the existing style in the sample to which
+   you are contributing.
+1. Ensure that your code has an appropriate set of unit tests which all pass.
+1. Submit a pull request.
+
+If you are a Googler, it is preferable to first create an internal change and
+have it reviewed and submitted, and then create an upstreaming pull
+request here. 
+
+## The Google Test and Google Mock Communities ##
+
+The Google Test community exists primarily through the
+[discussion group](http://groups.google.com/group/googletestframework)
+and the GitHub repository.
+Likewise, the Google Mock community exists primarily through their own
+[discussion group](http://groups.google.com/group/googlemock).
+You are definitely encouraged to contribute to the
+discussion and you can also help us to keep the effectiveness of the
+group high by following and promoting the guidelines listed here.
+
+### Please Be Friendly ###
+
+Showing courtesy and respect to others is a vital part of the Google
+culture, and we strongly encourage everyone participating in Google
+Test development to join us in accepting nothing less. Of course,
+being courteous is not the same as failing to constructively disagree
+with each other, but it does mean that we should be respectful of each
+other when enumerating the 42 technical reasons that a particular
+proposal may not be the best choice. There's never a reason to be
+antagonistic or dismissive toward anyone who is sincerely trying to
+contribute to a discussion.
+
+Sure, C++ testing is serious business and all that, but it's also
+a lot of fun. Let's keep it that way. Let's strive to be one of the
+friendliest communities in all of open source.
+
+As always, discuss Google Test in the official GoogleTest discussion group.
+You don't have to actually submit code in order to sign up. Your participation
+itself is a valuable contribution.
+
+## Style
+
+To keep the source consistent, readable, diffable and easy to merge,
+we use a fairly rigid coding style, as defined by the [google-styleguide](https://github.com/google/styleguide) project.  All patches will be expected
+to conform to the style outlined [here](https://google.github.io/styleguide/cppguide.html).
+
+## Requirements for Contributors ###
+
+If you plan to contribute a patch, you need to build Google Test,
+Google Mock, and their own tests from a git checkout, which has
+further requirements:
+
+  * [Python](https://www.python.org/) v2.3 or newer (for running some of
+    the tests and re-generating certain source files from templates)
+  * [CMake](https://cmake.org/) v2.6.4 or newer
+  * [GNU Build System](https://en.wikipedia.org/wiki/GNU_Build_System)
+    including automake (>= 1.9), autoconf (>= 2.59), and
+    libtool / libtoolize.
+
+## Developing Google Test ##
+
+This section discusses how to make your own changes to Google Test.
+
+### Testing Google Test Itself ###
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test's own tests.
+For that you can use CMake:
+
+    mkdir mybuild
+    cd mybuild
+    cmake -Dgtest_build_tests=ON ${GTEST_DIR}
+
+Make sure you have Python installed, as some of Google Test's tests
+are written in Python.  If the cmake command complains about not being
+able to find Python (`Could NOT find PythonInterp (missing:
+PYTHON_EXECUTABLE)`), try telling it explicitly where your Python
+executable can be found:
+
+    cmake -DPYTHON_EXECUTABLE=path/to/python -Dgtest_build_tests=ON ${GTEST_DIR}
+
+Next, you can build Google Test and all of its own tests.  On \*nix,
+this is usually done by 'make'.  To run the tests, do
+
+    make test
+
+All tests should pass.
+
+### Regenerating Source Files ##
+
+Some of Google Test's source files are generated from templates (not
+in the C++ sense) using a script.
+For example, the
+file include/gtest/internal/gtest-type-util.h.pump is used to generate
+gtest-type-util.h in the same directory.
+
+You don't need to worry about regenerating the source files
+unless you need to modify them.  You would then modify the
+corresponding `.pump` files and run the '[pump.py](googletest/scripts/pump.py)'
+generator script.  See the [Pump Manual](googletest/docs/PumpManual.md).
+
+## Developing Google Mock ###
+
+This section discusses how to make your own changes to Google Mock.
+
+#### Testing Google Mock Itself ####
+
+To make sure your changes work as intended and don't break existing
+functionality, you'll want to compile and run Google Test's own tests.
+For that you'll need Autotools.  First, make sure you have followed
+the instructions above to configure Google Mock.
+Then, create a build output directory and enter it.  Next,
+
+    ${GMOCK_DIR}/configure  # try --help for more info
+
+Once you have successfully configured Google Mock, the build steps are
+standard for GNU-style OSS packages.
+
+    make        # Standard makefile following GNU conventions
+    make check  # Builds and runs all tests - all should pass.
+
+Note that when building your project against Google Mock, you are building
+against Google Test as well.  There is no need to configure Google Test
+separately.
diff --git a/googletest/LICENSE b/third_party/googletest/LICENSE
similarity index 100%
rename from googletest/LICENSE
rename to third_party/googletest/LICENSE
diff --git a/Makefile.am b/third_party/googletest/Makefile.am
similarity index 100%
rename from Makefile.am
rename to third_party/googletest/Makefile.am
diff --git a/third_party/googletest/README.md b/third_party/googletest/README.md
new file mode 100644
index 0000000..d87abce
--- /dev/null
+++ b/third_party/googletest/README.md
@@ -0,0 +1,122 @@
+
+# Google Test #
+
+[![Build Status](https://travis-ci.org/google/googletest.svg?branch=master)](https://travis-ci.org/google/googletest)
+[![Build status](https://ci.appveyor.com/api/projects/status/4o38plt0xbo1ubc8/branch/master?svg=true)](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master)
+
+Welcome to **Google Test**, Google's C++ test framework!
+
+This repository is a merger of the formerly separate GoogleTest and
+GoogleMock projects. These were so closely related that it makes sense to
+maintain and release them together.
+
+Please see the project page above for more information as well as the
+mailing list for questions, discussions, and development.  There is
+also an IRC channel on [OFTC](https://webchat.oftc.net/) (irc.oftc.net) #gtest available.  Please
+join us!
+
+Getting started information for **Google Test** is available in the
+[Google Test Primer](googletest/docs/primer.md) documentation.
+
+**Google Mock** is an extension to Google Test for writing and using C++ mock
+classes.  See the separate [Google Mock documentation](googlemock/README.md).
+
+More detailed documentation for googletest (including build instructions) are
+in its interior [googletest/README.md](googletest/README.md) file.
+
+## Features ##
+
+  * An [xUnit](https://en.wikipedia.org/wiki/XUnit) test framework.
+  * Test discovery.
+  * A rich set of assertions.
+  * User-defined assertions.
+  * Death tests.
+  * Fatal and non-fatal failures.
+  * Value-parameterized tests.
+  * Type-parameterized tests.
+  * Various options for running the tests.
+  * XML test report generation.
+
+## Platforms ##
+
+Google test has been used on a variety of platforms:
+
+  * Linux
+  * Mac OS X
+  * Windows
+  * Cygwin
+  * MinGW
+  * Windows Mobile
+  * Symbian
+
+## Who Is Using Google Test? ##
+
+In addition to many internal projects at Google, Google Test is also used by
+the following notable projects:
+
+  * The [Chromium projects](http://www.chromium.org/) (behind the Chrome
+    browser and Chrome OS).
+  * The [LLVM](http://llvm.org/) compiler.
+  * [Protocol Buffers](https://github.com/google/protobuf), Google's data
+    interchange format.
+  * The [OpenCV](http://opencv.org/) computer vision library.
+  * [tiny-dnn](https://github.com/tiny-dnn/tiny-dnn): header only, dependency-free deep learning framework in C++11.
+
+## Related Open Source Projects ##
+
+[GTest Runner](https://github.com/nholthaus/gtest-runner) is a Qt5 based automated test-runner and Graphical User Interface with powerful features for Windows and Linux platforms.
+
+[Google Test UI](https://github.com/ospector/gtest-gbar) is test runner that runs
+your test binary, allows you to track its progress via a progress bar, and
+displays a list of test failures. Clicking on one shows failure text. Google
+Test UI is written in C#.
+
+[GTest TAP Listener](https://github.com/kinow/gtest-tap-listener) is an event
+listener for Google Test that implements the
+[TAP protocol](https://en.wikipedia.org/wiki/Test_Anything_Protocol) for test
+result output. If your test runner understands TAP, you may find it useful.
+
+[gtest-parallel](https://github.com/google/gtest-parallel) is a test runner that
+runs tests from your binary in parallel to provide significant speed-up.
+
+## Requirements ##
+
+Google Test is designed to have fairly minimal requirements to build
+and use with your projects, but there are some.  Currently, we support
+Linux, Windows, Mac OS X, and Cygwin.  We will also make our best
+effort to support other platforms (e.g. Solaris, AIX, and z/OS).
+However, since core members of the Google Test project have no access
+to these platforms, Google Test may have outstanding issues there.  If
+you notice any problems on your platform, please notify
+[googletestframework@googlegroups.com](https://groups.google.com/forum/#!forum/googletestframework). Patches for fixing them are
+even more welcome!
+
+### Linux Requirements ###
+
+These are the base requirements to build and use Google Test from a source
+package (as described below):
+
+  * GNU-compatible Make or gmake
+  * POSIX-standard shell
+  * POSIX(-2) Regular Expressions (regex.h)
+  * A C++98-standard-compliant compiler
+
+### Windows Requirements ###
+
+  * Microsoft Visual C++ 2015 or newer
+
+### Cygwin Requirements ###
+
+  * Cygwin v1.5.25-14 or newer
+
+### Mac OS X Requirements ###
+
+  * Mac OS X v10.4 Tiger or newer
+  * Xcode Developer Tools
+
+## Contributing change
+
+Please read the [`CONTRIBUTING.md`](CONTRIBUTING.md) for details on
+how to contribute to this project.
+
+Happy testing!
diff --git a/WORKSPACE b/third_party/googletest/WORKSPACE
similarity index 100%
rename from WORKSPACE
rename to third_party/googletest/WORKSPACE
diff --git a/appveyor.yml b/third_party/googletest/appveyor.yml
similarity index 100%
rename from appveyor.yml
rename to third_party/googletest/appveyor.yml
diff --git a/ci/build-linux-autotools.sh b/third_party/googletest/ci/build-linux-autotools.sh
similarity index 100%
rename from ci/build-linux-autotools.sh
rename to third_party/googletest/ci/build-linux-autotools.sh
diff --git a/ci/build-linux-bazel.sh b/third_party/googletest/ci/build-linux-bazel.sh
similarity index 100%
rename from ci/build-linux-bazel.sh
rename to third_party/googletest/ci/build-linux-bazel.sh
diff --git a/ci/env-linux.sh b/third_party/googletest/ci/env-linux.sh
similarity index 100%
rename from ci/env-linux.sh
rename to third_party/googletest/ci/env-linux.sh
diff --git a/ci/env-osx.sh b/third_party/googletest/ci/env-osx.sh
similarity index 100%
rename from ci/env-osx.sh
rename to third_party/googletest/ci/env-osx.sh
diff --git a/ci/get-nprocessors.sh b/third_party/googletest/ci/get-nprocessors.sh
similarity index 100%
rename from ci/get-nprocessors.sh
rename to third_party/googletest/ci/get-nprocessors.sh
diff --git a/ci/install-linux.sh b/third_party/googletest/ci/install-linux.sh
similarity index 100%
rename from ci/install-linux.sh
rename to third_party/googletest/ci/install-linux.sh
diff --git a/ci/install-osx.sh b/third_party/googletest/ci/install-osx.sh
similarity index 100%
rename from ci/install-osx.sh
rename to third_party/googletest/ci/install-osx.sh
diff --git a/ci/log-config.sh b/third_party/googletest/ci/log-config.sh
similarity index 100%
rename from ci/log-config.sh
rename to third_party/googletest/ci/log-config.sh
diff --git a/ci/travis.sh b/third_party/googletest/ci/travis.sh
similarity index 100%
rename from ci/travis.sh
rename to third_party/googletest/ci/travis.sh
diff --git a/configure.ac b/third_party/googletest/configure.ac
similarity index 100%
rename from configure.ac
rename to third_party/googletest/configure.ac
diff --git a/googlemock/CHANGES b/third_party/googletest/googlemock/CHANGES
similarity index 100%
rename from googlemock/CHANGES
rename to third_party/googletest/googlemock/CHANGES
diff --git a/googlemock/CMakeLists.txt b/third_party/googletest/googlemock/CMakeLists.txt
similarity index 100%
rename from googlemock/CMakeLists.txt
rename to third_party/googletest/googlemock/CMakeLists.txt
diff --git a/googlemock/CONTRIBUTORS b/third_party/googletest/googlemock/CONTRIBUTORS
similarity index 100%
rename from googlemock/CONTRIBUTORS
rename to third_party/googletest/googlemock/CONTRIBUTORS
diff --git a/googlemock/LICENSE b/third_party/googletest/googlemock/LICENSE
similarity index 100%
rename from googlemock/LICENSE
rename to third_party/googletest/googlemock/LICENSE
diff --git a/googlemock/Makefile.am b/third_party/googletest/googlemock/Makefile.am
similarity index 100%
rename from googlemock/Makefile.am
rename to third_party/googletest/googlemock/Makefile.am
diff --git a/googlemock/README.md b/third_party/googletest/googlemock/README.md
similarity index 100%
rename from googlemock/README.md
rename to third_party/googletest/googlemock/README.md
diff --git a/googlemock/build-aux/.keep b/third_party/googletest/googlemock/build-aux/.keep
similarity index 100%
rename from googlemock/build-aux/.keep
rename to third_party/googletest/googlemock/build-aux/.keep
diff --git a/googlemock/cmake/gmock.pc.in b/third_party/googletest/googlemock/cmake/gmock.pc.in
similarity index 100%
rename from googlemock/cmake/gmock.pc.in
rename to third_party/googletest/googlemock/cmake/gmock.pc.in
diff --git a/googlemock/cmake/gmock_main.pc.in b/third_party/googletest/googlemock/cmake/gmock_main.pc.in
similarity index 100%
rename from googlemock/cmake/gmock_main.pc.in
rename to third_party/googletest/googlemock/cmake/gmock_main.pc.in
diff --git a/googlemock/configure.ac b/third_party/googletest/googlemock/configure.ac
similarity index 100%
rename from googlemock/configure.ac
rename to third_party/googletest/googlemock/configure.ac
diff --git a/googlemock/docs/CheatSheet.md b/third_party/googletest/googlemock/docs/CheatSheet.md
similarity index 100%
rename from googlemock/docs/CheatSheet.md
rename to third_party/googletest/googlemock/docs/CheatSheet.md
diff --git a/googlemock/docs/CookBook.md b/third_party/googletest/googlemock/docs/CookBook.md
similarity index 100%
rename from googlemock/docs/CookBook.md
rename to third_party/googletest/googlemock/docs/CookBook.md
diff --git a/googlemock/docs/DesignDoc.md b/third_party/googletest/googlemock/docs/DesignDoc.md
similarity index 100%
rename from googlemock/docs/DesignDoc.md
rename to third_party/googletest/googlemock/docs/DesignDoc.md
diff --git a/googlemock/docs/Documentation.md b/third_party/googletest/googlemock/docs/Documentation.md
similarity index 100%
rename from googlemock/docs/Documentation.md
rename to third_party/googletest/googlemock/docs/Documentation.md
diff --git a/googlemock/docs/ForDummies.md b/third_party/googletest/googlemock/docs/ForDummies.md
similarity index 100%
rename from googlemock/docs/ForDummies.md
rename to third_party/googletest/googlemock/docs/ForDummies.md
diff --git a/googlemock/docs/FrequentlyAskedQuestions.md b/third_party/googletest/googlemock/docs/FrequentlyAskedQuestions.md
similarity index 100%
rename from googlemock/docs/FrequentlyAskedQuestions.md
rename to third_party/googletest/googlemock/docs/FrequentlyAskedQuestions.md
diff --git a/googlemock/docs/KnownIssues.md b/third_party/googletest/googlemock/docs/KnownIssues.md
similarity index 100%
rename from googlemock/docs/KnownIssues.md
rename to third_party/googletest/googlemock/docs/KnownIssues.md
diff --git a/googlemock/include/gmock/gmock-actions.h b/third_party/googletest/googlemock/include/gmock/gmock-actions.h
similarity index 100%
rename from googlemock/include/gmock/gmock-actions.h
rename to third_party/googletest/googlemock/include/gmock/gmock-actions.h
diff --git a/googlemock/include/gmock/gmock-cardinalities.h b/third_party/googletest/googlemock/include/gmock/gmock-cardinalities.h
similarity index 100%
rename from googlemock/include/gmock/gmock-cardinalities.h
rename to third_party/googletest/googlemock/include/gmock/gmock-cardinalities.h
diff --git a/googlemock/include/gmock/gmock-generated-actions.h b/third_party/googletest/googlemock/include/gmock/gmock-generated-actions.h
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-actions.h
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-actions.h
diff --git a/googlemock/include/gmock/gmock-generated-actions.h.pump b/third_party/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-actions.h.pump
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-actions.h.pump
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h b/third_party/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-function-mockers.h
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h
diff --git a/googlemock/include/gmock/gmock-generated-function-mockers.h.pump b/third_party/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-function-mockers.h.pump
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h b/third_party/googletest/googlemock/include/gmock/gmock-generated-matchers.h
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-matchers.h
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-matchers.h
diff --git a/googlemock/include/gmock/gmock-generated-matchers.h.pump b/third_party/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-matchers.h.pump
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-matchers.h.pump
diff --git a/googlemock/include/gmock/gmock-generated-nice-strict.h b/third_party/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-nice-strict.h
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h
diff --git a/googlemock/include/gmock/gmock-generated-nice-strict.h.pump b/third_party/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
similarity index 100%
rename from googlemock/include/gmock/gmock-generated-nice-strict.h.pump
rename to third_party/googletest/googlemock/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/googlemock/include/gmock/gmock-matchers.h b/third_party/googletest/googlemock/include/gmock/gmock-matchers.h
similarity index 100%
rename from googlemock/include/gmock/gmock-matchers.h
rename to third_party/googletest/googlemock/include/gmock/gmock-matchers.h
diff --git a/googlemock/include/gmock/gmock-more-actions.h b/third_party/googletest/googlemock/include/gmock/gmock-more-actions.h
similarity index 100%
rename from googlemock/include/gmock/gmock-more-actions.h
rename to third_party/googletest/googlemock/include/gmock/gmock-more-actions.h
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/third_party/googletest/googlemock/include/gmock/gmock-more-matchers.h
similarity index 100%
rename from googlemock/include/gmock/gmock-more-matchers.h
rename to third_party/googletest/googlemock/include/gmock/gmock-more-matchers.h
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/third_party/googletest/googlemock/include/gmock/gmock-spec-builders.h
similarity index 100%
rename from googlemock/include/gmock/gmock-spec-builders.h
rename to third_party/googletest/googlemock/include/gmock/gmock-spec-builders.h
diff --git a/googlemock/include/gmock/gmock.h b/third_party/googletest/googlemock/include/gmock/gmock.h
similarity index 100%
rename from googlemock/include/gmock/gmock.h
rename to third_party/googletest/googlemock/include/gmock/gmock.h
diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h b/third_party/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
similarity index 100%
rename from googlemock/include/gmock/internal/custom/gmock-generated-actions.h
rename to third_party/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h
diff --git a/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump b/third_party/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
similarity index 100%
rename from googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
rename to third_party/googletest/googlemock/include/gmock/internal/custom/gmock-generated-actions.h.pump
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/third_party/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
similarity index 100%
rename from googlemock/include/gmock/internal/custom/gmock-matchers.h
rename to third_party/googletest/googlemock/include/gmock/internal/custom/gmock-matchers.h
diff --git a/googlemock/include/gmock/internal/custom/gmock-port.h b/third_party/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
similarity index 100%
rename from googlemock/include/gmock/internal/custom/gmock-port.h
rename to third_party/googletest/googlemock/include/gmock/internal/custom/gmock-port.h
diff --git a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h b/third_party/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
similarity index 100%
rename from googlemock/include/gmock/internal/gmock-generated-internal-utils.h
rename to third_party/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump b/third_party/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
similarity index 100%
rename from googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
rename to third_party/googletest/googlemock/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/googlemock/include/gmock/internal/gmock-internal-utils.h b/third_party/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
similarity index 100%
rename from googlemock/include/gmock/internal/gmock-internal-utils.h
rename to third_party/googletest/googlemock/include/gmock/internal/gmock-internal-utils.h
diff --git a/googlemock/include/gmock/internal/gmock-port.h b/third_party/googletest/googlemock/include/gmock/internal/gmock-port.h
similarity index 100%
rename from googlemock/include/gmock/internal/gmock-port.h
rename to third_party/googletest/googlemock/include/gmock/internal/gmock-port.h
diff --git a/googlemock/make/Makefile b/third_party/googletest/googlemock/make/Makefile
similarity index 100%
rename from googlemock/make/Makefile
rename to third_party/googletest/googlemock/make/Makefile
diff --git a/googlemock/msvc/2005/gmock.sln b/third_party/googletest/googlemock/msvc/2005/gmock.sln
similarity index 100%
rename from googlemock/msvc/2005/gmock.sln
rename to third_party/googletest/googlemock/msvc/2005/gmock.sln
diff --git a/googlemock/msvc/2005/gmock.vcproj b/third_party/googletest/googlemock/msvc/2005/gmock.vcproj
similarity index 100%
rename from googlemock/msvc/2005/gmock.vcproj
rename to third_party/googletest/googlemock/msvc/2005/gmock.vcproj
diff --git a/googlemock/msvc/2005/gmock_config.vsprops b/third_party/googletest/googlemock/msvc/2005/gmock_config.vsprops
similarity index 100%
rename from googlemock/msvc/2005/gmock_config.vsprops
rename to third_party/googletest/googlemock/msvc/2005/gmock_config.vsprops
diff --git a/googlemock/msvc/2005/gmock_main.vcproj b/third_party/googletest/googlemock/msvc/2005/gmock_main.vcproj
similarity index 100%
rename from googlemock/msvc/2005/gmock_main.vcproj
rename to third_party/googletest/googlemock/msvc/2005/gmock_main.vcproj
diff --git a/googlemock/msvc/2005/gmock_test.vcproj b/third_party/googletest/googlemock/msvc/2005/gmock_test.vcproj
similarity index 100%
rename from googlemock/msvc/2005/gmock_test.vcproj
rename to third_party/googletest/googlemock/msvc/2005/gmock_test.vcproj
diff --git a/googlemock/msvc/2010/gmock.sln b/third_party/googletest/googlemock/msvc/2010/gmock.sln
similarity index 100%
rename from googlemock/msvc/2010/gmock.sln
rename to third_party/googletest/googlemock/msvc/2010/gmock.sln
diff --git a/googlemock/msvc/2010/gmock.vcxproj b/third_party/googletest/googlemock/msvc/2010/gmock.vcxproj
similarity index 100%
rename from googlemock/msvc/2010/gmock.vcxproj
rename to third_party/googletest/googlemock/msvc/2010/gmock.vcxproj
diff --git a/googlemock/msvc/2010/gmock_config.props b/third_party/googletest/googlemock/msvc/2010/gmock_config.props
similarity index 100%
rename from googlemock/msvc/2010/gmock_config.props
rename to third_party/googletest/googlemock/msvc/2010/gmock_config.props
diff --git a/googlemock/msvc/2010/gmock_main.vcxproj b/third_party/googletest/googlemock/msvc/2010/gmock_main.vcxproj
similarity index 100%
rename from googlemock/msvc/2010/gmock_main.vcxproj
rename to third_party/googletest/googlemock/msvc/2010/gmock_main.vcxproj
diff --git a/googlemock/msvc/2010/gmock_test.vcxproj b/third_party/googletest/googlemock/msvc/2010/gmock_test.vcxproj
similarity index 100%
rename from googlemock/msvc/2010/gmock_test.vcxproj
rename to third_party/googletest/googlemock/msvc/2010/gmock_test.vcxproj
diff --git a/googlemock/msvc/2015/gmock.sln b/third_party/googletest/googlemock/msvc/2015/gmock.sln
similarity index 100%
rename from googlemock/msvc/2015/gmock.sln
rename to third_party/googletest/googlemock/msvc/2015/gmock.sln
diff --git a/googlemock/msvc/2015/gmock.vcxproj b/third_party/googletest/googlemock/msvc/2015/gmock.vcxproj
similarity index 100%
rename from googlemock/msvc/2015/gmock.vcxproj
rename to third_party/googletest/googlemock/msvc/2015/gmock.vcxproj
diff --git a/googlemock/msvc/2015/gmock_config.props b/third_party/googletest/googlemock/msvc/2015/gmock_config.props
similarity index 100%
rename from googlemock/msvc/2015/gmock_config.props
rename to third_party/googletest/googlemock/msvc/2015/gmock_config.props
diff --git a/googlemock/msvc/2015/gmock_main.vcxproj b/third_party/googletest/googlemock/msvc/2015/gmock_main.vcxproj
similarity index 100%
rename from googlemock/msvc/2015/gmock_main.vcxproj
rename to third_party/googletest/googlemock/msvc/2015/gmock_main.vcxproj
diff --git a/googlemock/msvc/2015/gmock_test.vcxproj b/third_party/googletest/googlemock/msvc/2015/gmock_test.vcxproj
similarity index 100%
rename from googlemock/msvc/2015/gmock_test.vcxproj
rename to third_party/googletest/googlemock/msvc/2015/gmock_test.vcxproj
diff --git a/googlemock/scripts/fuse_gmock_files.py b/third_party/googletest/googlemock/scripts/fuse_gmock_files.py
similarity index 100%
rename from googlemock/scripts/fuse_gmock_files.py
rename to third_party/googletest/googlemock/scripts/fuse_gmock_files.py
diff --git a/googlemock/scripts/generator/LICENSE b/third_party/googletest/googlemock/scripts/generator/LICENSE
similarity index 100%
rename from googlemock/scripts/generator/LICENSE
rename to third_party/googletest/googlemock/scripts/generator/LICENSE
diff --git a/googlemock/scripts/generator/README b/third_party/googletest/googlemock/scripts/generator/README
similarity index 100%
rename from googlemock/scripts/generator/README
rename to third_party/googletest/googlemock/scripts/generator/README
diff --git a/googlemock/scripts/generator/README.cppclean b/third_party/googletest/googlemock/scripts/generator/README.cppclean
similarity index 100%
rename from googlemock/scripts/generator/README.cppclean
rename to third_party/googletest/googlemock/scripts/generator/README.cppclean
diff --git a/googlemock/scripts/generator/cpp/__init__.py b/third_party/googletest/googlemock/scripts/generator/cpp/__init__.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/__init__.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/__init__.py
diff --git a/googlemock/scripts/generator/cpp/ast.py b/third_party/googletest/googlemock/scripts/generator/cpp/ast.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/ast.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/ast.py
diff --git a/googlemock/scripts/generator/cpp/gmock_class.py b/third_party/googletest/googlemock/scripts/generator/cpp/gmock_class.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/gmock_class.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/gmock_class.py
diff --git a/googlemock/scripts/generator/cpp/gmock_class_test.py b/third_party/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/gmock_class_test.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/gmock_class_test.py
diff --git a/googlemock/scripts/generator/cpp/keywords.py b/third_party/googletest/googlemock/scripts/generator/cpp/keywords.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/keywords.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/keywords.py
diff --git a/googlemock/scripts/generator/cpp/tokenize.py b/third_party/googletest/googlemock/scripts/generator/cpp/tokenize.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/tokenize.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/tokenize.py
diff --git a/googlemock/scripts/generator/cpp/utils.py b/third_party/googletest/googlemock/scripts/generator/cpp/utils.py
similarity index 100%
rename from googlemock/scripts/generator/cpp/utils.py
rename to third_party/googletest/googlemock/scripts/generator/cpp/utils.py
diff --git a/googlemock/scripts/generator/gmock_gen.py b/third_party/googletest/googlemock/scripts/generator/gmock_gen.py
similarity index 100%
rename from googlemock/scripts/generator/gmock_gen.py
rename to third_party/googletest/googlemock/scripts/generator/gmock_gen.py
diff --git a/googlemock/scripts/gmock-config.in b/third_party/googletest/googlemock/scripts/gmock-config.in
similarity index 100%
rename from googlemock/scripts/gmock-config.in
rename to third_party/googletest/googlemock/scripts/gmock-config.in
diff --git a/googlemock/scripts/gmock_doctor.py b/third_party/googletest/googlemock/scripts/gmock_doctor.py
similarity index 100%
rename from googlemock/scripts/gmock_doctor.py
rename to third_party/googletest/googlemock/scripts/gmock_doctor.py
diff --git a/googlemock/scripts/upload.py b/third_party/googletest/googlemock/scripts/upload.py
similarity index 100%
rename from googlemock/scripts/upload.py
rename to third_party/googletest/googlemock/scripts/upload.py
diff --git a/googlemock/scripts/upload_gmock.py b/third_party/googletest/googlemock/scripts/upload_gmock.py
similarity index 100%
rename from googlemock/scripts/upload_gmock.py
rename to third_party/googletest/googlemock/scripts/upload_gmock.py
diff --git a/googlemock/src/gmock-all.cc b/third_party/googletest/googlemock/src/gmock-all.cc
similarity index 100%
rename from googlemock/src/gmock-all.cc
rename to third_party/googletest/googlemock/src/gmock-all.cc
diff --git a/googlemock/src/gmock-cardinalities.cc b/third_party/googletest/googlemock/src/gmock-cardinalities.cc
similarity index 100%
rename from googlemock/src/gmock-cardinalities.cc
rename to third_party/googletest/googlemock/src/gmock-cardinalities.cc
diff --git a/googlemock/src/gmock-internal-utils.cc b/third_party/googletest/googlemock/src/gmock-internal-utils.cc
similarity index 100%
rename from googlemock/src/gmock-internal-utils.cc
rename to third_party/googletest/googlemock/src/gmock-internal-utils.cc
diff --git a/googlemock/src/gmock-matchers.cc b/third_party/googletest/googlemock/src/gmock-matchers.cc
similarity index 100%
rename from googlemock/src/gmock-matchers.cc
rename to third_party/googletest/googlemock/src/gmock-matchers.cc
diff --git a/googlemock/src/gmock-spec-builders.cc b/third_party/googletest/googlemock/src/gmock-spec-builders.cc
similarity index 100%
rename from googlemock/src/gmock-spec-builders.cc
rename to third_party/googletest/googlemock/src/gmock-spec-builders.cc
diff --git a/googlemock/src/gmock.cc b/third_party/googletest/googlemock/src/gmock.cc
similarity index 100%
rename from googlemock/src/gmock.cc
rename to third_party/googletest/googlemock/src/gmock.cc
diff --git a/googlemock/src/gmock_main.cc b/third_party/googletest/googlemock/src/gmock_main.cc
similarity index 100%
rename from googlemock/src/gmock_main.cc
rename to third_party/googletest/googlemock/src/gmock_main.cc
diff --git a/googlemock/test/BUILD.bazel b/third_party/googletest/googlemock/test/BUILD.bazel
similarity index 100%
rename from googlemock/test/BUILD.bazel
rename to third_party/googletest/googlemock/test/BUILD.bazel
diff --git a/googlemock/test/gmock-actions_test.cc b/third_party/googletest/googlemock/test/gmock-actions_test.cc
similarity index 100%
rename from googlemock/test/gmock-actions_test.cc
rename to third_party/googletest/googlemock/test/gmock-actions_test.cc
diff --git a/googlemock/test/gmock-cardinalities_test.cc b/third_party/googletest/googlemock/test/gmock-cardinalities_test.cc
similarity index 100%
rename from googlemock/test/gmock-cardinalities_test.cc
rename to third_party/googletest/googlemock/test/gmock-cardinalities_test.cc
diff --git a/googlemock/test/gmock-generated-actions_test.cc b/third_party/googletest/googlemock/test/gmock-generated-actions_test.cc
similarity index 100%
rename from googlemock/test/gmock-generated-actions_test.cc
rename to third_party/googletest/googlemock/test/gmock-generated-actions_test.cc
diff --git a/googlemock/test/gmock-generated-function-mockers_test.cc b/third_party/googletest/googlemock/test/gmock-generated-function-mockers_test.cc
similarity index 100%
rename from googlemock/test/gmock-generated-function-mockers_test.cc
rename to third_party/googletest/googlemock/test/gmock-generated-function-mockers_test.cc
diff --git a/googlemock/test/gmock-generated-internal-utils_test.cc b/third_party/googletest/googlemock/test/gmock-generated-internal-utils_test.cc
similarity index 100%
rename from googlemock/test/gmock-generated-internal-utils_test.cc
rename to third_party/googletest/googlemock/test/gmock-generated-internal-utils_test.cc
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/third_party/googletest/googlemock/test/gmock-generated-matchers_test.cc
similarity index 100%
rename from googlemock/test/gmock-generated-matchers_test.cc
rename to third_party/googletest/googlemock/test/gmock-generated-matchers_test.cc
diff --git a/googlemock/test/gmock-internal-utils_test.cc b/third_party/googletest/googlemock/test/gmock-internal-utils_test.cc
similarity index 100%
rename from googlemock/test/gmock-internal-utils_test.cc
rename to third_party/googletest/googlemock/test/gmock-internal-utils_test.cc
diff --git a/googlemock/test/gmock-matchers_test.cc b/third_party/googletest/googlemock/test/gmock-matchers_test.cc
similarity index 100%
rename from googlemock/test/gmock-matchers_test.cc
rename to third_party/googletest/googlemock/test/gmock-matchers_test.cc
diff --git a/googlemock/test/gmock-more-actions_test.cc b/third_party/googletest/googlemock/test/gmock-more-actions_test.cc
similarity index 100%
rename from googlemock/test/gmock-more-actions_test.cc
rename to third_party/googletest/googlemock/test/gmock-more-actions_test.cc
diff --git a/googlemock/test/gmock-nice-strict_test.cc b/third_party/googletest/googlemock/test/gmock-nice-strict_test.cc
similarity index 100%
rename from googlemock/test/gmock-nice-strict_test.cc
rename to third_party/googletest/googlemock/test/gmock-nice-strict_test.cc
diff --git a/googlemock/test/gmock-port_test.cc b/third_party/googletest/googlemock/test/gmock-port_test.cc
similarity index 100%
rename from googlemock/test/gmock-port_test.cc
rename to third_party/googletest/googlemock/test/gmock-port_test.cc
diff --git a/googlemock/test/gmock-spec-builders_test.cc b/third_party/googletest/googlemock/test/gmock-spec-builders_test.cc
similarity index 100%
rename from googlemock/test/gmock-spec-builders_test.cc
rename to third_party/googletest/googlemock/test/gmock-spec-builders_test.cc
diff --git a/googlemock/test/gmock_all_test.cc b/third_party/googletest/googlemock/test/gmock_all_test.cc
similarity index 100%
rename from googlemock/test/gmock_all_test.cc
rename to third_party/googletest/googlemock/test/gmock_all_test.cc
diff --git a/googlemock/test/gmock_ex_test.cc b/third_party/googletest/googlemock/test/gmock_ex_test.cc
similarity index 100%
rename from googlemock/test/gmock_ex_test.cc
rename to third_party/googletest/googlemock/test/gmock_ex_test.cc
diff --git a/googlemock/test/gmock_leak_test.py b/third_party/googletest/googlemock/test/gmock_leak_test.py
similarity index 100%
rename from googlemock/test/gmock_leak_test.py
rename to third_party/googletest/googlemock/test/gmock_leak_test.py
diff --git a/googlemock/test/gmock_leak_test_.cc b/third_party/googletest/googlemock/test/gmock_leak_test_.cc
similarity index 100%
rename from googlemock/test/gmock_leak_test_.cc
rename to third_party/googletest/googlemock/test/gmock_leak_test_.cc
diff --git a/googlemock/test/gmock_link2_test.cc b/third_party/googletest/googlemock/test/gmock_link2_test.cc
similarity index 100%
rename from googlemock/test/gmock_link2_test.cc
rename to third_party/googletest/googlemock/test/gmock_link2_test.cc
diff --git a/googlemock/test/gmock_link_test.cc b/third_party/googletest/googlemock/test/gmock_link_test.cc
similarity index 100%
rename from googlemock/test/gmock_link_test.cc
rename to third_party/googletest/googlemock/test/gmock_link_test.cc
diff --git a/googlemock/test/gmock_link_test.h b/third_party/googletest/googlemock/test/gmock_link_test.h
similarity index 100%
rename from googlemock/test/gmock_link_test.h
rename to third_party/googletest/googlemock/test/gmock_link_test.h
diff --git a/googlemock/test/gmock_output_test.py b/third_party/googletest/googlemock/test/gmock_output_test.py
similarity index 100%
rename from googlemock/test/gmock_output_test.py
rename to third_party/googletest/googlemock/test/gmock_output_test.py
diff --git a/googlemock/test/gmock_output_test_.cc b/third_party/googletest/googlemock/test/gmock_output_test_.cc
similarity index 100%
rename from googlemock/test/gmock_output_test_.cc
rename to third_party/googletest/googlemock/test/gmock_output_test_.cc
diff --git a/googlemock/test/gmock_output_test_golden.txt b/third_party/googletest/googlemock/test/gmock_output_test_golden.txt
similarity index 100%
rename from googlemock/test/gmock_output_test_golden.txt
rename to third_party/googletest/googlemock/test/gmock_output_test_golden.txt
diff --git a/googlemock/test/gmock_stress_test.cc b/third_party/googletest/googlemock/test/gmock_stress_test.cc
similarity index 100%
rename from googlemock/test/gmock_stress_test.cc
rename to third_party/googletest/googlemock/test/gmock_stress_test.cc
diff --git a/googlemock/test/gmock_test.cc b/third_party/googletest/googlemock/test/gmock_test.cc
similarity index 100%
rename from googlemock/test/gmock_test.cc
rename to third_party/googletest/googlemock/test/gmock_test.cc
diff --git a/googlemock/test/gmock_test_utils.py b/third_party/googletest/googlemock/test/gmock_test_utils.py
similarity index 100%
rename from googlemock/test/gmock_test_utils.py
rename to third_party/googletest/googlemock/test/gmock_test_utils.py
diff --git a/googletest/CHANGES b/third_party/googletest/googletest/CHANGES
similarity index 100%
rename from googletest/CHANGES
rename to third_party/googletest/googletest/CHANGES
diff --git a/googletest/CMakeLists.txt b/third_party/googletest/googletest/CMakeLists.txt
similarity index 100%
rename from googletest/CMakeLists.txt
rename to third_party/googletest/googletest/CMakeLists.txt
diff --git a/googletest/CONTRIBUTORS b/third_party/googletest/googletest/CONTRIBUTORS
similarity index 100%
rename from googletest/CONTRIBUTORS
rename to third_party/googletest/googletest/CONTRIBUTORS
diff --git a/googletest/LICENSE b/third_party/googletest/googletest/LICENSE
similarity index 100%
copy from googletest/LICENSE
copy to third_party/googletest/googletest/LICENSE
diff --git a/googletest/Makefile.am b/third_party/googletest/googletest/Makefile.am
similarity index 100%
rename from googletest/Makefile.am
rename to third_party/googletest/googletest/Makefile.am
diff --git a/googletest/README.md b/third_party/googletest/googletest/README.md
similarity index 100%
rename from googletest/README.md
rename to third_party/googletest/googletest/README.md
diff --git a/googletest/cmake/gtest.pc.in b/third_party/googletest/googletest/cmake/gtest.pc.in
similarity index 100%
rename from googletest/cmake/gtest.pc.in
rename to third_party/googletest/googletest/cmake/gtest.pc.in
diff --git a/googletest/cmake/gtest_main.pc.in b/third_party/googletest/googletest/cmake/gtest_main.pc.in
similarity index 100%
rename from googletest/cmake/gtest_main.pc.in
rename to third_party/googletest/googletest/cmake/gtest_main.pc.in
diff --git a/googletest/cmake/internal_utils.cmake b/third_party/googletest/googletest/cmake/internal_utils.cmake
similarity index 100%
rename from googletest/cmake/internal_utils.cmake
rename to third_party/googletest/googletest/cmake/internal_utils.cmake
diff --git a/googletest/codegear/gtest.cbproj b/third_party/googletest/googletest/codegear/gtest.cbproj
similarity index 100%
rename from googletest/codegear/gtest.cbproj
rename to third_party/googletest/googletest/codegear/gtest.cbproj
diff --git a/googletest/codegear/gtest.groupproj b/third_party/googletest/googletest/codegear/gtest.groupproj
similarity index 100%
rename from googletest/codegear/gtest.groupproj
rename to third_party/googletest/googletest/codegear/gtest.groupproj
diff --git a/googletest/codegear/gtest_all.cc b/third_party/googletest/googletest/codegear/gtest_all.cc
similarity index 100%
rename from googletest/codegear/gtest_all.cc
rename to third_party/googletest/googletest/codegear/gtest_all.cc
diff --git a/googletest/codegear/gtest_link.cc b/third_party/googletest/googletest/codegear/gtest_link.cc
similarity index 100%
rename from googletest/codegear/gtest_link.cc
rename to third_party/googletest/googletest/codegear/gtest_link.cc
diff --git a/googletest/codegear/gtest_main.cbproj b/third_party/googletest/googletest/codegear/gtest_main.cbproj
similarity index 100%
rename from googletest/codegear/gtest_main.cbproj
rename to third_party/googletest/googletest/codegear/gtest_main.cbproj
diff --git a/googletest/codegear/gtest_unittest.cbproj b/third_party/googletest/googletest/codegear/gtest_unittest.cbproj
similarity index 100%
rename from googletest/codegear/gtest_unittest.cbproj
rename to third_party/googletest/googletest/codegear/gtest_unittest.cbproj
diff --git a/googletest/configure.ac b/third_party/googletest/googletest/configure.ac
similarity index 100%
rename from googletest/configure.ac
rename to third_party/googletest/googletest/configure.ac
diff --git a/googletest/docs/Pkgconfig.md b/third_party/googletest/googletest/docs/Pkgconfig.md
similarity index 100%
rename from googletest/docs/Pkgconfig.md
rename to third_party/googletest/googletest/docs/Pkgconfig.md
diff --git a/googletest/docs/PumpManual.md b/third_party/googletest/googletest/docs/PumpManual.md
similarity index 100%
rename from googletest/docs/PumpManual.md
rename to third_party/googletest/googletest/docs/PumpManual.md
diff --git a/googletest/docs/XcodeGuide.md b/third_party/googletest/googletest/docs/XcodeGuide.md
similarity index 100%
rename from googletest/docs/XcodeGuide.md
rename to third_party/googletest/googletest/docs/XcodeGuide.md
diff --git a/googletest/docs/advanced.md b/third_party/googletest/googletest/docs/advanced.md
similarity index 100%
rename from googletest/docs/advanced.md
rename to third_party/googletest/googletest/docs/advanced.md
diff --git a/googletest/docs/faq.md b/third_party/googletest/googletest/docs/faq.md
similarity index 100%
rename from googletest/docs/faq.md
rename to third_party/googletest/googletest/docs/faq.md
diff --git a/googletest/docs/primer.md b/third_party/googletest/googletest/docs/primer.md
similarity index 100%
rename from googletest/docs/primer.md
rename to third_party/googletest/googletest/docs/primer.md
diff --git a/googletest/docs/samples.md b/third_party/googletest/googletest/docs/samples.md
similarity index 100%
rename from googletest/docs/samples.md
rename to third_party/googletest/googletest/docs/samples.md
diff --git a/googletest/include/gtest/gtest-death-test.h b/third_party/googletest/googletest/include/gtest/gtest-death-test.h
similarity index 100%
rename from googletest/include/gtest/gtest-death-test.h
rename to third_party/googletest/googletest/include/gtest/gtest-death-test.h
diff --git a/googletest/include/gtest/gtest-message.h b/third_party/googletest/googletest/include/gtest/gtest-message.h
similarity index 100%
rename from googletest/include/gtest/gtest-message.h
rename to third_party/googletest/googletest/include/gtest/gtest-message.h
diff --git a/googletest/include/gtest/gtest-param-test.h b/third_party/googletest/googletest/include/gtest/gtest-param-test.h
similarity index 100%
rename from googletest/include/gtest/gtest-param-test.h
rename to third_party/googletest/googletest/include/gtest/gtest-param-test.h
diff --git a/googletest/include/gtest/gtest-param-test.h.pump b/third_party/googletest/googletest/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from googletest/include/gtest/gtest-param-test.h.pump
rename to third_party/googletest/googletest/include/gtest/gtest-param-test.h.pump
diff --git a/googletest/include/gtest/gtest-printers.h b/third_party/googletest/googletest/include/gtest/gtest-printers.h
similarity index 100%
rename from googletest/include/gtest/gtest-printers.h
rename to third_party/googletest/googletest/include/gtest/gtest-printers.h
diff --git a/googletest/include/gtest/gtest-spi.h b/third_party/googletest/googletest/include/gtest/gtest-spi.h
similarity index 100%
rename from googletest/include/gtest/gtest-spi.h
rename to third_party/googletest/googletest/include/gtest/gtest-spi.h
diff --git a/googletest/include/gtest/gtest-test-part.h b/third_party/googletest/googletest/include/gtest/gtest-test-part.h
similarity index 100%
rename from googletest/include/gtest/gtest-test-part.h
rename to third_party/googletest/googletest/include/gtest/gtest-test-part.h
diff --git a/googletest/include/gtest/gtest-typed-test.h b/third_party/googletest/googletest/include/gtest/gtest-typed-test.h
similarity index 100%
rename from googletest/include/gtest/gtest-typed-test.h
rename to third_party/googletest/googletest/include/gtest/gtest-typed-test.h
diff --git a/googletest/include/gtest/gtest.h b/third_party/googletest/googletest/include/gtest/gtest.h
similarity index 100%
rename from googletest/include/gtest/gtest.h
rename to third_party/googletest/googletest/include/gtest/gtest.h
diff --git a/googletest/include/gtest/gtest_pred_impl.h b/third_party/googletest/googletest/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from googletest/include/gtest/gtest_pred_impl.h
rename to third_party/googletest/googletest/include/gtest/gtest_pred_impl.h
diff --git a/googletest/include/gtest/gtest_prod.h b/third_party/googletest/googletest/include/gtest/gtest_prod.h
similarity index 100%
rename from googletest/include/gtest/gtest_prod.h
rename to third_party/googletest/googletest/include/gtest/gtest_prod.h
diff --git a/googletest/include/gtest/internal/custom/gtest-port.h b/third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from googletest/include/gtest/internal/custom/gtest-port.h
rename to third_party/googletest/googletest/include/gtest/internal/custom/gtest-port.h
diff --git a/googletest/include/gtest/internal/custom/gtest-printers.h b/third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from googletest/include/gtest/internal/custom/gtest-printers.h
rename to third_party/googletest/googletest/include/gtest/internal/custom/gtest-printers.h
diff --git a/googletest/include/gtest/internal/custom/gtest.h b/third_party/googletest/googletest/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from googletest/include/gtest/internal/custom/gtest.h
rename to third_party/googletest/googletest/include/gtest/internal/custom/gtest.h
diff --git a/googletest/include/gtest/internal/gtest-death-test-internal.h b/third_party/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-death-test-internal.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-death-test-internal.h
diff --git a/googletest/include/gtest/internal/gtest-filepath.h b/third_party/googletest/googletest/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-filepath.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-filepath.h
diff --git a/googletest/include/gtest/internal/gtest-internal.h b/third_party/googletest/googletest/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-internal.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-internal.h
diff --git a/googletest/include/gtest/internal/gtest-linked_ptr.h b/third_party/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-linked_ptr.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-linked_ptr.h
diff --git a/googletest/include/gtest/internal/gtest-param-util-generated.h b/third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-param-util-generated.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h
diff --git a/googletest/include/gtest/internal/gtest-param-util-generated.h.pump b/third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from googletest/include/gtest/internal/gtest-param-util-generated.h.pump
rename to third_party/googletest/googletest/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/third_party/googletest/googletest/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-param-util.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-param-util.h
diff --git a/googletest/include/gtest/internal/gtest-port-arch.h b/third_party/googletest/googletest/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-port-arch.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-port-arch.h
diff --git a/googletest/include/gtest/internal/gtest-port.h b/third_party/googletest/googletest/include/gtest/internal/gtest-port.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-port.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-port.h
diff --git a/googletest/include/gtest/internal/gtest-string.h b/third_party/googletest/googletest/include/gtest/internal/gtest-string.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-string.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-string.h
diff --git a/googletest/include/gtest/internal/gtest-tuple.h b/third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-tuple.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h
diff --git a/googletest/include/gtest/internal/gtest-tuple.h.pump b/third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from googletest/include/gtest/internal/gtest-tuple.h.pump
rename to third_party/googletest/googletest/include/gtest/internal/gtest-tuple.h.pump
diff --git a/googletest/include/gtest/internal/gtest-type-util.h b/third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from googletest/include/gtest/internal/gtest-type-util.h
rename to third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h
diff --git a/googletest/include/gtest/internal/gtest-type-util.h.pump b/third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from googletest/include/gtest/internal/gtest-type-util.h.pump
rename to third_party/googletest/googletest/include/gtest/internal/gtest-type-util.h.pump
diff --git a/googletest/m4/acx_pthread.m4 b/third_party/googletest/googletest/m4/acx_pthread.m4
similarity index 100%
rename from googletest/m4/acx_pthread.m4
rename to third_party/googletest/googletest/m4/acx_pthread.m4
diff --git a/googletest/m4/gtest.m4 b/third_party/googletest/googletest/m4/gtest.m4
similarity index 100%
rename from googletest/m4/gtest.m4
rename to third_party/googletest/googletest/m4/gtest.m4
diff --git a/googletest/make/Makefile b/third_party/googletest/googletest/make/Makefile
similarity index 100%
rename from googletest/make/Makefile
rename to third_party/googletest/googletest/make/Makefile
diff --git a/googletest/msvc/2010/gtest-md.sln b/third_party/googletest/googletest/msvc/2010/gtest-md.sln
similarity index 100%
rename from googletest/msvc/2010/gtest-md.sln
rename to third_party/googletest/googletest/msvc/2010/gtest-md.sln
diff --git a/googletest/msvc/2010/gtest-md.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest-md.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest-md.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest-md.vcxproj
diff --git a/googletest/msvc/2010/gtest-md.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest-md.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest-md.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest.sln b/third_party/googletest/googletest/msvc/2010/gtest.sln
similarity index 100%
rename from googletest/msvc/2010/gtest.sln
rename to third_party/googletest/googletest/msvc/2010/gtest.sln
diff --git a/googletest/msvc/2010/gtest.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest.vcxproj
diff --git a/googletest/msvc/2010/gtest.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_main-md.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_main-md.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_main-md.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_main-md.vcxproj
diff --git a/googletest/msvc/2010/gtest_main-md.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_main-md.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_main-md.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_main.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_main.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_main.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_main.vcxproj
diff --git a/googletest/msvc/2010/gtest_main.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_main.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_main.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_prod_test-md.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_prod_test-md.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj
diff --git a/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_prod_test-md.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_prod_test.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_prod_test.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj
diff --git a/googletest/msvc/2010/gtest_prod_test.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_prod_test.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_prod_test.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_unittest-md.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_unittest-md.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj
diff --git a/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_unittest-md.vcxproj.filters
diff --git a/googletest/msvc/2010/gtest_unittest.vcxproj b/third_party/googletest/googletest/msvc/2010/gtest_unittest.vcxproj
similarity index 100%
rename from googletest/msvc/2010/gtest_unittest.vcxproj
rename to third_party/googletest/googletest/msvc/2010/gtest_unittest.vcxproj
diff --git a/googletest/msvc/2010/gtest_unittest.vcxproj.filters b/third_party/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters
similarity index 100%
rename from googletest/msvc/2010/gtest_unittest.vcxproj.filters
rename to third_party/googletest/googletest/msvc/2010/gtest_unittest.vcxproj.filters
diff --git a/googletest/samples/prime_tables.h b/third_party/googletest/googletest/samples/prime_tables.h
similarity index 100%
rename from googletest/samples/prime_tables.h
rename to third_party/googletest/googletest/samples/prime_tables.h
diff --git a/googletest/samples/sample1.cc b/third_party/googletest/googletest/samples/sample1.cc
similarity index 100%
rename from googletest/samples/sample1.cc
rename to third_party/googletest/googletest/samples/sample1.cc
diff --git a/googletest/samples/sample1.h b/third_party/googletest/googletest/samples/sample1.h
similarity index 100%
rename from googletest/samples/sample1.h
rename to third_party/googletest/googletest/samples/sample1.h
diff --git a/googletest/samples/sample10_unittest.cc b/third_party/googletest/googletest/samples/sample10_unittest.cc
similarity index 100%
rename from googletest/samples/sample10_unittest.cc
rename to third_party/googletest/googletest/samples/sample10_unittest.cc
diff --git a/googletest/samples/sample1_unittest.cc b/third_party/googletest/googletest/samples/sample1_unittest.cc
similarity index 100%
rename from googletest/samples/sample1_unittest.cc
rename to third_party/googletest/googletest/samples/sample1_unittest.cc
diff --git a/googletest/samples/sample2.cc b/third_party/googletest/googletest/samples/sample2.cc
similarity index 100%
rename from googletest/samples/sample2.cc
rename to third_party/googletest/googletest/samples/sample2.cc
diff --git a/googletest/samples/sample2.h b/third_party/googletest/googletest/samples/sample2.h
similarity index 100%
rename from googletest/samples/sample2.h
rename to third_party/googletest/googletest/samples/sample2.h
diff --git a/googletest/samples/sample2_unittest.cc b/third_party/googletest/googletest/samples/sample2_unittest.cc
similarity index 100%
rename from googletest/samples/sample2_unittest.cc
rename to third_party/googletest/googletest/samples/sample2_unittest.cc
diff --git a/googletest/samples/sample3-inl.h b/third_party/googletest/googletest/samples/sample3-inl.h
similarity index 100%
rename from googletest/samples/sample3-inl.h
rename to third_party/googletest/googletest/samples/sample3-inl.h
diff --git a/googletest/samples/sample3_unittest.cc b/third_party/googletest/googletest/samples/sample3_unittest.cc
similarity index 100%
rename from googletest/samples/sample3_unittest.cc
rename to third_party/googletest/googletest/samples/sample3_unittest.cc
diff --git a/googletest/samples/sample4.cc b/third_party/googletest/googletest/samples/sample4.cc
similarity index 100%
rename from googletest/samples/sample4.cc
rename to third_party/googletest/googletest/samples/sample4.cc
diff --git a/googletest/samples/sample4.h b/third_party/googletest/googletest/samples/sample4.h
similarity index 100%
rename from googletest/samples/sample4.h
rename to third_party/googletest/googletest/samples/sample4.h
diff --git a/googletest/samples/sample4_unittest.cc b/third_party/googletest/googletest/samples/sample4_unittest.cc
similarity index 100%
rename from googletest/samples/sample4_unittest.cc
rename to third_party/googletest/googletest/samples/sample4_unittest.cc
diff --git a/googletest/samples/sample5_unittest.cc b/third_party/googletest/googletest/samples/sample5_unittest.cc
similarity index 100%
rename from googletest/samples/sample5_unittest.cc
rename to third_party/googletest/googletest/samples/sample5_unittest.cc
diff --git a/googletest/samples/sample6_unittest.cc b/third_party/googletest/googletest/samples/sample6_unittest.cc
similarity index 100%
rename from googletest/samples/sample6_unittest.cc
rename to third_party/googletest/googletest/samples/sample6_unittest.cc
diff --git a/googletest/samples/sample7_unittest.cc b/third_party/googletest/googletest/samples/sample7_unittest.cc
similarity index 100%
rename from googletest/samples/sample7_unittest.cc
rename to third_party/googletest/googletest/samples/sample7_unittest.cc
diff --git a/googletest/samples/sample8_unittest.cc b/third_party/googletest/googletest/samples/sample8_unittest.cc
similarity index 100%
rename from googletest/samples/sample8_unittest.cc
rename to third_party/googletest/googletest/samples/sample8_unittest.cc
diff --git a/googletest/samples/sample9_unittest.cc b/third_party/googletest/googletest/samples/sample9_unittest.cc
similarity index 100%
rename from googletest/samples/sample9_unittest.cc
rename to third_party/googletest/googletest/samples/sample9_unittest.cc
diff --git a/googletest/scripts/common.py b/third_party/googletest/googletest/scripts/common.py
similarity index 100%
rename from googletest/scripts/common.py
rename to third_party/googletest/googletest/scripts/common.py
diff --git a/googletest/scripts/fuse_gtest_files.py b/third_party/googletest/googletest/scripts/fuse_gtest_files.py
similarity index 100%
rename from googletest/scripts/fuse_gtest_files.py
rename to third_party/googletest/googletest/scripts/fuse_gtest_files.py
diff --git a/googletest/scripts/gen_gtest_pred_impl.py b/third_party/googletest/googletest/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from googletest/scripts/gen_gtest_pred_impl.py
rename to third_party/googletest/googletest/scripts/gen_gtest_pred_impl.py
diff --git a/googletest/scripts/gtest-config.in b/third_party/googletest/googletest/scripts/gtest-config.in
similarity index 100%
rename from googletest/scripts/gtest-config.in
rename to third_party/googletest/googletest/scripts/gtest-config.in
diff --git a/googletest/scripts/pump.py b/third_party/googletest/googletest/scripts/pump.py
similarity index 100%
rename from googletest/scripts/pump.py
rename to third_party/googletest/googletest/scripts/pump.py
diff --git a/googletest/scripts/release_docs.py b/third_party/googletest/googletest/scripts/release_docs.py
similarity index 100%
rename from googletest/scripts/release_docs.py
rename to third_party/googletest/googletest/scripts/release_docs.py
diff --git a/googletest/scripts/test/Makefile b/third_party/googletest/googletest/scripts/test/Makefile
similarity index 100%
rename from googletest/scripts/test/Makefile
rename to third_party/googletest/googletest/scripts/test/Makefile
diff --git a/googletest/scripts/upload.py b/third_party/googletest/googletest/scripts/upload.py
similarity index 100%
rename from googletest/scripts/upload.py
rename to third_party/googletest/googletest/scripts/upload.py
diff --git a/googletest/scripts/upload_gtest.py b/third_party/googletest/googletest/scripts/upload_gtest.py
similarity index 100%
rename from googletest/scripts/upload_gtest.py
rename to third_party/googletest/googletest/scripts/upload_gtest.py
diff --git a/googletest/src/gtest-all.cc b/third_party/googletest/googletest/src/gtest-all.cc
similarity index 100%
rename from googletest/src/gtest-all.cc
rename to third_party/googletest/googletest/src/gtest-all.cc
diff --git a/googletest/src/gtest-death-test.cc b/third_party/googletest/googletest/src/gtest-death-test.cc
similarity index 100%
rename from googletest/src/gtest-death-test.cc
rename to third_party/googletest/googletest/src/gtest-death-test.cc
diff --git a/googletest/src/gtest-filepath.cc b/third_party/googletest/googletest/src/gtest-filepath.cc
similarity index 100%
rename from googletest/src/gtest-filepath.cc
rename to third_party/googletest/googletest/src/gtest-filepath.cc
diff --git a/googletest/src/gtest-internal-inl.h b/third_party/googletest/googletest/src/gtest-internal-inl.h
similarity index 100%
rename from googletest/src/gtest-internal-inl.h
rename to third_party/googletest/googletest/src/gtest-internal-inl.h
diff --git a/googletest/src/gtest-port.cc b/third_party/googletest/googletest/src/gtest-port.cc
similarity index 100%
rename from googletest/src/gtest-port.cc
rename to third_party/googletest/googletest/src/gtest-port.cc
diff --git a/googletest/src/gtest-printers.cc b/third_party/googletest/googletest/src/gtest-printers.cc
similarity index 100%
rename from googletest/src/gtest-printers.cc
rename to third_party/googletest/googletest/src/gtest-printers.cc
diff --git a/googletest/src/gtest-test-part.cc b/third_party/googletest/googletest/src/gtest-test-part.cc
similarity index 100%
rename from googletest/src/gtest-test-part.cc
rename to third_party/googletest/googletest/src/gtest-test-part.cc
diff --git a/googletest/src/gtest-typed-test.cc b/third_party/googletest/googletest/src/gtest-typed-test.cc
similarity index 100%
rename from googletest/src/gtest-typed-test.cc
rename to third_party/googletest/googletest/src/gtest-typed-test.cc
diff --git a/googletest/src/gtest.cc b/third_party/googletest/googletest/src/gtest.cc
similarity index 100%
rename from googletest/src/gtest.cc
rename to third_party/googletest/googletest/src/gtest.cc
diff --git a/googletest/src/gtest_main.cc b/third_party/googletest/googletest/src/gtest_main.cc
similarity index 100%
rename from googletest/src/gtest_main.cc
rename to third_party/googletest/googletest/src/gtest_main.cc
diff --git a/googletest/test/BUILD.bazel b/third_party/googletest/googletest/test/BUILD.bazel
similarity index 100%
rename from googletest/test/BUILD.bazel
rename to third_party/googletest/googletest/test/BUILD.bazel
diff --git a/googletest/test/gtest-death-test_ex_test.cc b/third_party/googletest/googletest/test/gtest-death-test_ex_test.cc
similarity index 100%
rename from googletest/test/gtest-death-test_ex_test.cc
rename to third_party/googletest/googletest/test/gtest-death-test_ex_test.cc
diff --git a/googletest/test/gtest-death-test_test.cc b/third_party/googletest/googletest/test/gtest-death-test_test.cc
similarity index 100%
rename from googletest/test/gtest-death-test_test.cc
rename to third_party/googletest/googletest/test/gtest-death-test_test.cc
diff --git a/googletest/test/gtest-filepath_test.cc b/third_party/googletest/googletest/test/gtest-filepath_test.cc
similarity index 100%
rename from googletest/test/gtest-filepath_test.cc
rename to third_party/googletest/googletest/test/gtest-filepath_test.cc
diff --git a/googletest/test/gtest-linked_ptr_test.cc b/third_party/googletest/googletest/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from googletest/test/gtest-linked_ptr_test.cc
rename to third_party/googletest/googletest/test/gtest-linked_ptr_test.cc
diff --git a/googletest/test/gtest-listener_test.cc b/third_party/googletest/googletest/test/gtest-listener_test.cc
similarity index 100%
rename from googletest/test/gtest-listener_test.cc
rename to third_party/googletest/googletest/test/gtest-listener_test.cc
diff --git a/googletest/test/gtest-message_test.cc b/third_party/googletest/googletest/test/gtest-message_test.cc
similarity index 100%
rename from googletest/test/gtest-message_test.cc
rename to third_party/googletest/googletest/test/gtest-message_test.cc
diff --git a/googletest/test/gtest-options_test.cc b/third_party/googletest/googletest/test/gtest-options_test.cc
similarity index 100%
rename from googletest/test/gtest-options_test.cc
rename to third_party/googletest/googletest/test/gtest-options_test.cc
diff --git a/googletest/test/gtest-param-test2_test.cc b/third_party/googletest/googletest/test/gtest-param-test2_test.cc
similarity index 100%
rename from googletest/test/gtest-param-test2_test.cc
rename to third_party/googletest/googletest/test/gtest-param-test2_test.cc
diff --git a/googletest/test/gtest-param-test_test.cc b/third_party/googletest/googletest/test/gtest-param-test_test.cc
similarity index 100%
rename from googletest/test/gtest-param-test_test.cc
rename to third_party/googletest/googletest/test/gtest-param-test_test.cc
diff --git a/googletest/test/gtest-param-test_test.h b/third_party/googletest/googletest/test/gtest-param-test_test.h
similarity index 100%
rename from googletest/test/gtest-param-test_test.h
rename to third_party/googletest/googletest/test/gtest-param-test_test.h
diff --git a/googletest/test/gtest-port_test.cc b/third_party/googletest/googletest/test/gtest-port_test.cc
similarity index 100%
rename from googletest/test/gtest-port_test.cc
rename to third_party/googletest/googletest/test/gtest-port_test.cc
diff --git a/googletest/test/gtest-printers_test.cc b/third_party/googletest/googletest/test/gtest-printers_test.cc
similarity index 100%
rename from googletest/test/gtest-printers_test.cc
rename to third_party/googletest/googletest/test/gtest-printers_test.cc
diff --git a/googletest/test/gtest-test-part_test.cc b/third_party/googletest/googletest/test/gtest-test-part_test.cc
similarity index 100%
rename from googletest/test/gtest-test-part_test.cc
rename to third_party/googletest/googletest/test/gtest-test-part_test.cc
diff --git a/googletest/test/gtest-tuple_test.cc b/third_party/googletest/googletest/test/gtest-tuple_test.cc
similarity index 100%
rename from googletest/test/gtest-tuple_test.cc
rename to third_party/googletest/googletest/test/gtest-tuple_test.cc
diff --git a/googletest/test/gtest-typed-test2_test.cc b/third_party/googletest/googletest/test/gtest-typed-test2_test.cc
similarity index 100%
rename from googletest/test/gtest-typed-test2_test.cc
rename to third_party/googletest/googletest/test/gtest-typed-test2_test.cc
diff --git a/googletest/test/gtest-typed-test_test.cc b/third_party/googletest/googletest/test/gtest-typed-test_test.cc
similarity index 100%
rename from googletest/test/gtest-typed-test_test.cc
rename to third_party/googletest/googletest/test/gtest-typed-test_test.cc
diff --git a/googletest/test/gtest-typed-test_test.h b/third_party/googletest/googletest/test/gtest-typed-test_test.h
similarity index 100%
rename from googletest/test/gtest-typed-test_test.h
rename to third_party/googletest/googletest/test/gtest-typed-test_test.h
diff --git a/googletest/test/gtest-unittest-api_test.cc b/third_party/googletest/googletest/test/gtest-unittest-api_test.cc
similarity index 100%
rename from googletest/test/gtest-unittest-api_test.cc
rename to third_party/googletest/googletest/test/gtest-unittest-api_test.cc
diff --git a/googletest/test/gtest_all_test.cc b/third_party/googletest/googletest/test/gtest_all_test.cc
similarity index 100%
rename from googletest/test/gtest_all_test.cc
rename to third_party/googletest/googletest/test/gtest_all_test.cc
diff --git a/googletest/test/gtest_assert_by_exception_test.cc b/third_party/googletest/googletest/test/gtest_assert_by_exception_test.cc
similarity index 100%
rename from googletest/test/gtest_assert_by_exception_test.cc
rename to third_party/googletest/googletest/test/gtest_assert_by_exception_test.cc
diff --git a/googletest/test/gtest_break_on_failure_unittest.py b/third_party/googletest/googletest/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from googletest/test/gtest_break_on_failure_unittest.py
rename to third_party/googletest/googletest/test/gtest_break_on_failure_unittest.py
diff --git a/googletest/test/gtest_break_on_failure_unittest_.cc b/third_party/googletest/googletest/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from googletest/test/gtest_break_on_failure_unittest_.cc
rename to third_party/googletest/googletest/test/gtest_break_on_failure_unittest_.cc
diff --git a/googletest/test/gtest_catch_exceptions_test.py b/third_party/googletest/googletest/test/gtest_catch_exceptions_test.py
similarity index 100%
rename from googletest/test/gtest_catch_exceptions_test.py
rename to third_party/googletest/googletest/test/gtest_catch_exceptions_test.py
diff --git a/googletest/test/gtest_catch_exceptions_test_.cc b/third_party/googletest/googletest/test/gtest_catch_exceptions_test_.cc
similarity index 100%
rename from googletest/test/gtest_catch_exceptions_test_.cc
rename to third_party/googletest/googletest/test/gtest_catch_exceptions_test_.cc
diff --git a/googletest/test/gtest_color_test.py b/third_party/googletest/googletest/test/gtest_color_test.py
similarity index 100%
rename from googletest/test/gtest_color_test.py
rename to third_party/googletest/googletest/test/gtest_color_test.py
diff --git a/googletest/test/gtest_color_test_.cc b/third_party/googletest/googletest/test/gtest_color_test_.cc
similarity index 100%
rename from googletest/test/gtest_color_test_.cc
rename to third_party/googletest/googletest/test/gtest_color_test_.cc
diff --git a/googletest/test/gtest_env_var_test.py b/third_party/googletest/googletest/test/gtest_env_var_test.py
similarity index 100%
rename from googletest/test/gtest_env_var_test.py
rename to third_party/googletest/googletest/test/gtest_env_var_test.py
diff --git a/googletest/test/gtest_env_var_test_.cc b/third_party/googletest/googletest/test/gtest_env_var_test_.cc
similarity index 100%
rename from googletest/test/gtest_env_var_test_.cc
rename to third_party/googletest/googletest/test/gtest_env_var_test_.cc
diff --git a/googletest/test/gtest_environment_test.cc b/third_party/googletest/googletest/test/gtest_environment_test.cc
similarity index 100%
rename from googletest/test/gtest_environment_test.cc
rename to third_party/googletest/googletest/test/gtest_environment_test.cc
diff --git a/googletest/test/gtest_filter_unittest.py b/third_party/googletest/googletest/test/gtest_filter_unittest.py
similarity index 100%
rename from googletest/test/gtest_filter_unittest.py
rename to third_party/googletest/googletest/test/gtest_filter_unittest.py
diff --git a/googletest/test/gtest_filter_unittest_.cc b/third_party/googletest/googletest/test/gtest_filter_unittest_.cc
similarity index 100%
rename from googletest/test/gtest_filter_unittest_.cc
rename to third_party/googletest/googletest/test/gtest_filter_unittest_.cc
diff --git a/googletest/test/gtest_help_test.py b/third_party/googletest/googletest/test/gtest_help_test.py
similarity index 100%
rename from googletest/test/gtest_help_test.py
rename to third_party/googletest/googletest/test/gtest_help_test.py
diff --git a/googletest/test/gtest_help_test_.cc b/third_party/googletest/googletest/test/gtest_help_test_.cc
similarity index 100%
rename from googletest/test/gtest_help_test_.cc
rename to third_party/googletest/googletest/test/gtest_help_test_.cc
diff --git a/googletest/test/gtest_json_outfiles_test.py b/third_party/googletest/googletest/test/gtest_json_outfiles_test.py
similarity index 100%
rename from googletest/test/gtest_json_outfiles_test.py
rename to third_party/googletest/googletest/test/gtest_json_outfiles_test.py
diff --git a/googletest/test/gtest_json_output_unittest.py b/third_party/googletest/googletest/test/gtest_json_output_unittest.py
similarity index 100%
rename from googletest/test/gtest_json_output_unittest.py
rename to third_party/googletest/googletest/test/gtest_json_output_unittest.py
diff --git a/googletest/test/gtest_json_test_utils.py b/third_party/googletest/googletest/test/gtest_json_test_utils.py
similarity index 100%
rename from googletest/test/gtest_json_test_utils.py
rename to third_party/googletest/googletest/test/gtest_json_test_utils.py
diff --git a/googletest/test/gtest_list_tests_unittest.py b/third_party/googletest/googletest/test/gtest_list_tests_unittest.py
similarity index 100%
rename from googletest/test/gtest_list_tests_unittest.py
rename to third_party/googletest/googletest/test/gtest_list_tests_unittest.py
diff --git a/googletest/test/gtest_list_tests_unittest_.cc b/third_party/googletest/googletest/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from googletest/test/gtest_list_tests_unittest_.cc
rename to third_party/googletest/googletest/test/gtest_list_tests_unittest_.cc
diff --git a/googletest/test/gtest_main_unittest.cc b/third_party/googletest/googletest/test/gtest_main_unittest.cc
similarity index 100%
rename from googletest/test/gtest_main_unittest.cc
rename to third_party/googletest/googletest/test/gtest_main_unittest.cc
diff --git a/googletest/test/gtest_no_test_unittest.cc b/third_party/googletest/googletest/test/gtest_no_test_unittest.cc
similarity index 100%
rename from googletest/test/gtest_no_test_unittest.cc
rename to third_party/googletest/googletest/test/gtest_no_test_unittest.cc
diff --git a/googletest/test/gtest_output_test.py b/third_party/googletest/googletest/test/gtest_output_test.py
similarity index 100%
rename from googletest/test/gtest_output_test.py
rename to third_party/googletest/googletest/test/gtest_output_test.py
diff --git a/googletest/test/gtest_output_test_.cc b/third_party/googletest/googletest/test/gtest_output_test_.cc
similarity index 100%
rename from googletest/test/gtest_output_test_.cc
rename to third_party/googletest/googletest/test/gtest_output_test_.cc
diff --git a/googletest/test/gtest_output_test_golden_lin.txt b/third_party/googletest/googletest/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from googletest/test/gtest_output_test_golden_lin.txt
rename to third_party/googletest/googletest/test/gtest_output_test_golden_lin.txt
diff --git a/googletest/test/gtest_pred_impl_unittest.cc b/third_party/googletest/googletest/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from googletest/test/gtest_pred_impl_unittest.cc
rename to third_party/googletest/googletest/test/gtest_pred_impl_unittest.cc
diff --git a/googletest/test/gtest_premature_exit_test.cc b/third_party/googletest/googletest/test/gtest_premature_exit_test.cc
similarity index 100%
rename from googletest/test/gtest_premature_exit_test.cc
rename to third_party/googletest/googletest/test/gtest_premature_exit_test.cc
diff --git a/googletest/test/gtest_prod_test.cc b/third_party/googletest/googletest/test/gtest_prod_test.cc
similarity index 100%
rename from googletest/test/gtest_prod_test.cc
rename to third_party/googletest/googletest/test/gtest_prod_test.cc
diff --git a/googletest/test/gtest_repeat_test.cc b/third_party/googletest/googletest/test/gtest_repeat_test.cc
similarity index 100%
rename from googletest/test/gtest_repeat_test.cc
rename to third_party/googletest/googletest/test/gtest_repeat_test.cc
diff --git a/googletest/test/gtest_shuffle_test.py b/third_party/googletest/googletest/test/gtest_shuffle_test.py
similarity index 100%
rename from googletest/test/gtest_shuffle_test.py
rename to third_party/googletest/googletest/test/gtest_shuffle_test.py
diff --git a/googletest/test/gtest_shuffle_test_.cc b/third_party/googletest/googletest/test/gtest_shuffle_test_.cc
similarity index 100%
rename from googletest/test/gtest_shuffle_test_.cc
rename to third_party/googletest/googletest/test/gtest_shuffle_test_.cc
diff --git a/googletest/test/gtest_sole_header_test.cc b/third_party/googletest/googletest/test/gtest_sole_header_test.cc
similarity index 100%
rename from googletest/test/gtest_sole_header_test.cc
rename to third_party/googletest/googletest/test/gtest_sole_header_test.cc
diff --git a/googletest/test/gtest_stress_test.cc b/third_party/googletest/googletest/test/gtest_stress_test.cc
similarity index 100%
rename from googletest/test/gtest_stress_test.cc
rename to third_party/googletest/googletest/test/gtest_stress_test.cc
diff --git a/googletest/test/gtest_test_utils.py b/third_party/googletest/googletest/test/gtest_test_utils.py
similarity index 100%
rename from googletest/test/gtest_test_utils.py
rename to third_party/googletest/googletest/test/gtest_test_utils.py
diff --git a/googletest/test/gtest_testbridge_test.py b/third_party/googletest/googletest/test/gtest_testbridge_test.py
similarity index 100%
rename from googletest/test/gtest_testbridge_test.py
rename to third_party/googletest/googletest/test/gtest_testbridge_test.py
diff --git a/googletest/test/gtest_testbridge_test_.cc b/third_party/googletest/googletest/test/gtest_testbridge_test_.cc
similarity index 100%
rename from googletest/test/gtest_testbridge_test_.cc
rename to third_party/googletest/googletest/test/gtest_testbridge_test_.cc
diff --git a/googletest/test/gtest_throw_on_failure_ex_test.cc b/third_party/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from googletest/test/gtest_throw_on_failure_ex_test.cc
rename to third_party/googletest/googletest/test/gtest_throw_on_failure_ex_test.cc
diff --git a/googletest/test/gtest_throw_on_failure_test.py b/third_party/googletest/googletest/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from googletest/test/gtest_throw_on_failure_test.py
rename to third_party/googletest/googletest/test/gtest_throw_on_failure_test.py
diff --git a/googletest/test/gtest_throw_on_failure_test_.cc b/third_party/googletest/googletest/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from googletest/test/gtest_throw_on_failure_test_.cc
rename to third_party/googletest/googletest/test/gtest_throw_on_failure_test_.cc
diff --git a/googletest/test/gtest_uninitialized_test.py b/third_party/googletest/googletest/test/gtest_uninitialized_test.py
similarity index 100%
rename from googletest/test/gtest_uninitialized_test.py
rename to third_party/googletest/googletest/test/gtest_uninitialized_test.py
diff --git a/googletest/test/gtest_uninitialized_test_.cc b/third_party/googletest/googletest/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from googletest/test/gtest_uninitialized_test_.cc
rename to third_party/googletest/googletest/test/gtest_uninitialized_test_.cc
diff --git a/googletest/test/gtest_unittest.cc b/third_party/googletest/googletest/test/gtest_unittest.cc
similarity index 100%
rename from googletest/test/gtest_unittest.cc
rename to third_party/googletest/googletest/test/gtest_unittest.cc
diff --git a/googletest/test/gtest_xml_outfile1_test_.cc b/third_party/googletest/googletest/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from googletest/test/gtest_xml_outfile1_test_.cc
rename to third_party/googletest/googletest/test/gtest_xml_outfile1_test_.cc
diff --git a/googletest/test/gtest_xml_outfile2_test_.cc b/third_party/googletest/googletest/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from googletest/test/gtest_xml_outfile2_test_.cc
rename to third_party/googletest/googletest/test/gtest_xml_outfile2_test_.cc
diff --git a/googletest/test/gtest_xml_outfiles_test.py b/third_party/googletest/googletest/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from googletest/test/gtest_xml_outfiles_test.py
rename to third_party/googletest/googletest/test/gtest_xml_outfiles_test.py
diff --git a/googletest/test/gtest_xml_output_unittest.py b/third_party/googletest/googletest/test/gtest_xml_output_unittest.py
similarity index 100%
rename from googletest/test/gtest_xml_output_unittest.py
rename to third_party/googletest/googletest/test/gtest_xml_output_unittest.py
diff --git a/googletest/test/gtest_xml_output_unittest_.cc b/third_party/googletest/googletest/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from googletest/test/gtest_xml_output_unittest_.cc
rename to third_party/googletest/googletest/test/gtest_xml_output_unittest_.cc
diff --git a/googletest/test/gtest_xml_test_utils.py b/third_party/googletest/googletest/test/gtest_xml_test_utils.py
similarity index 100%
rename from googletest/test/gtest_xml_test_utils.py
rename to third_party/googletest/googletest/test/gtest_xml_test_utils.py
diff --git a/googletest/test/production.cc b/third_party/googletest/googletest/test/production.cc
similarity index 100%
rename from googletest/test/production.cc
rename to third_party/googletest/googletest/test/production.cc
diff --git a/googletest/test/production.h b/third_party/googletest/googletest/test/production.h
similarity index 100%
rename from googletest/test/production.h
rename to third_party/googletest/googletest/test/production.h
diff --git a/googletest/xcode/Config/DebugProject.xcconfig b/third_party/googletest/googletest/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from googletest/xcode/Config/DebugProject.xcconfig
rename to third_party/googletest/googletest/xcode/Config/DebugProject.xcconfig
diff --git a/googletest/xcode/Config/FrameworkTarget.xcconfig b/third_party/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from googletest/xcode/Config/FrameworkTarget.xcconfig
rename to third_party/googletest/googletest/xcode/Config/FrameworkTarget.xcconfig
diff --git a/googletest/xcode/Config/General.xcconfig b/third_party/googletest/googletest/xcode/Config/General.xcconfig
similarity index 100%
rename from googletest/xcode/Config/General.xcconfig
rename to third_party/googletest/googletest/xcode/Config/General.xcconfig
diff --git a/googletest/xcode/Config/ReleaseProject.xcconfig b/third_party/googletest/googletest/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from googletest/xcode/Config/ReleaseProject.xcconfig
rename to third_party/googletest/googletest/xcode/Config/ReleaseProject.xcconfig
diff --git a/googletest/xcode/Config/StaticLibraryTarget.xcconfig b/third_party/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from googletest/xcode/Config/StaticLibraryTarget.xcconfig
rename to third_party/googletest/googletest/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/googletest/xcode/Config/TestTarget.xcconfig b/third_party/googletest/googletest/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from googletest/xcode/Config/TestTarget.xcconfig
rename to third_party/googletest/googletest/xcode/Config/TestTarget.xcconfig
diff --git a/googletest/xcode/Resources/Info.plist b/third_party/googletest/googletest/xcode/Resources/Info.plist
similarity index 100%
rename from googletest/xcode/Resources/Info.plist
rename to third_party/googletest/googletest/xcode/Resources/Info.plist
diff --git a/googletest/xcode/Samples/FrameworkSample/Info.plist b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/Info.plist
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/Info.plist
diff --git a/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/googletest/xcode/Samples/FrameworkSample/runtests.sh b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/runtests.sh
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/googletest/xcode/Samples/FrameworkSample/widget.cc b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/widget.cc
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget.cc
diff --git a/googletest/xcode/Samples/FrameworkSample/widget.h b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/widget.h
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget.h
diff --git a/googletest/xcode/Samples/FrameworkSample/widget_test.cc b/third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from googletest/xcode/Samples/FrameworkSample/widget_test.cc
rename to third_party/googletest/googletest/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/googletest/xcode/Scripts/runtests.sh b/third_party/googletest/googletest/xcode/Scripts/runtests.sh
similarity index 100%
rename from googletest/xcode/Scripts/runtests.sh
rename to third_party/googletest/googletest/xcode/Scripts/runtests.sh
diff --git a/googletest/xcode/Scripts/versiongenerate.py b/third_party/googletest/googletest/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from googletest/xcode/Scripts/versiongenerate.py
rename to third_party/googletest/googletest/xcode/Scripts/versiongenerate.py
diff --git a/googletest/xcode/gtest.xcodeproj/project.pbxproj b/third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from googletest/xcode/gtest.xcodeproj/project.pbxproj
rename to third_party/googletest/googletest/xcode/gtest.xcodeproj/project.pbxproj