diff --git a/Android.bp b/gtest_isolated/Android.bp
similarity index 100%
rename from Android.bp
rename to gtest_isolated/Android.bp
diff --git a/Color.cpp b/gtest_isolated/Color.cpp
similarity index 100%
rename from Color.cpp
rename to gtest_isolated/Color.cpp
diff --git a/Color.h b/gtest_isolated/Color.h
similarity index 100%
rename from Color.h
rename to gtest_isolated/Color.h
diff --git a/Isolate.cpp b/gtest_isolated/Isolate.cpp
similarity index 100%
rename from Isolate.cpp
rename to gtest_isolated/Isolate.cpp
diff --git a/Isolate.h b/gtest_isolated/Isolate.h
similarity index 100%
rename from Isolate.h
rename to gtest_isolated/Isolate.h
diff --git a/IsolateMain.cpp b/gtest_isolated/IsolateMain.cpp
similarity index 100%
rename from IsolateMain.cpp
rename to gtest_isolated/IsolateMain.cpp
diff --git a/Log.h b/gtest_isolated/Log.h
similarity index 100%
rename from Log.h
rename to gtest_isolated/Log.h
diff --git a/Main.cpp b/gtest_isolated/Main.cpp
similarity index 100%
rename from Main.cpp
rename to gtest_isolated/Main.cpp
diff --git a/NanoTime.cpp b/gtest_isolated/NanoTime.cpp
similarity index 100%
rename from NanoTime.cpp
rename to gtest_isolated/NanoTime.cpp
diff --git a/NanoTime.h b/gtest_isolated/NanoTime.h
similarity index 100%
rename from NanoTime.h
rename to gtest_isolated/NanoTime.h
diff --git a/OWNERS b/gtest_isolated/OWNERS
similarity index 100%
rename from OWNERS
rename to gtest_isolated/OWNERS
diff --git a/Options.cpp b/gtest_isolated/Options.cpp
similarity index 100%
rename from Options.cpp
rename to gtest_isolated/Options.cpp
diff --git a/Options.h b/gtest_isolated/Options.h
similarity index 100%
rename from Options.h
rename to gtest_isolated/Options.h
diff --git a/Test.cpp b/gtest_isolated/Test.cpp
similarity index 100%
rename from Test.cpp
rename to gtest_isolated/Test.cpp
diff --git a/Test.h b/gtest_isolated/Test.h
similarity index 100%
rename from Test.h
rename to gtest_isolated/Test.h
diff --git a/include/gtest_extras/IsolateMain.h b/gtest_isolated/include/gtest_extras/IsolateMain.h
similarity index 100%
rename from include/gtest_extras/IsolateMain.h
rename to gtest_isolated/include/gtest_extras/IsolateMain.h
diff --git a/tests/OptionsTest.cpp b/gtest_isolated/tests/OptionsTest.cpp
similarity index 100%
rename from tests/OptionsTest.cpp
rename to gtest_isolated/tests/OptionsTest.cpp
diff --git a/tests/SystemTests.cpp b/gtest_isolated/tests/SystemTests.cpp
similarity index 98%
rename from tests/SystemTests.cpp
rename to gtest_isolated/tests/SystemTests.cpp
index f4a579f..47ca5db 100644
--- a/tests/SystemTests.cpp
+++ b/gtest_isolated/tests/SystemTests.cpp
@@ -1675,29 +1675,21 @@
 
 TEST(SystemTestsShard1, DISABLED_case1_test4) {}
 
-TEST(SystemTestsShard2, DISABLED_case2_test1) {
-}
+TEST(SystemTestsShard2, DISABLED_case2_test1) {}
 
-TEST(SystemTestsShard2, DISABLED_case2_test2) {
-}
+TEST(SystemTestsShard2, DISABLED_case2_test2) {}
 
-TEST(SystemTestsShard2, DISABLED_case2_test3) {
-}
+TEST(SystemTestsShard2, DISABLED_case2_test3) {}
 
-TEST(SystemTestsShard2, DISABLED_case2_test4) {
-}
+TEST(SystemTestsShard2, DISABLED_case2_test4) {}
 
-TEST(SystemTestsShard3, DISABLED_case3_test1) {
-}
+TEST(SystemTestsShard3, DISABLED_case3_test1) {}
 
-TEST(SystemTestsShard3, DISABLED_case3_test2) {
-}
+TEST(SystemTestsShard3, DISABLED_case3_test2) {}
 
-TEST(SystemTestsShard3, DISABLED_case3_test3) {
-}
+TEST(SystemTestsShard3, DISABLED_case3_test3) {}
 
-TEST(SystemTestsShard3, DISABLED_case3_test4) {
-}
+TEST(SystemTestsShard3, DISABLED_case3_test4) {}
 
 }  // namespace gtest_extras
 }  // namespace android