diff --git a/xctestrunner/BUILD b/BUILD
similarity index 100%
rename from xctestrunner/BUILD
rename to BUILD
diff --git a/xctestrunner/__init__.py b/__init__.py
similarity index 100%
rename from xctestrunner/__init__.py
rename to __init__.py
diff --git a/xctestrunner/shared/__init__.py b/shared/__init__.py
similarity index 100%
rename from xctestrunner/shared/__init__.py
rename to shared/__init__.py
diff --git a/xctestrunner/shared/bundle_util.py b/shared/bundle_util.py
similarity index 100%
rename from xctestrunner/shared/bundle_util.py
rename to shared/bundle_util.py
diff --git a/xctestrunner/shared/ios_constants.py b/shared/ios_constants.py
similarity index 100%
rename from xctestrunner/shared/ios_constants.py
rename to shared/ios_constants.py
diff --git a/xctestrunner/shared/ios_errors.py b/shared/ios_errors.py
similarity index 100%
rename from xctestrunner/shared/ios_errors.py
rename to shared/ios_errors.py
diff --git a/xctestrunner/shared/plist_util.py b/shared/plist_util.py
similarity index 100%
rename from xctestrunner/shared/plist_util.py
rename to shared/plist_util.py
diff --git a/xctestrunner/shared/provisioning_profile.py b/shared/provisioning_profile.py
similarity index 100%
rename from xctestrunner/shared/provisioning_profile.py
rename to shared/provisioning_profile.py
diff --git a/xctestrunner/shared/xcode_info_util.py b/shared/xcode_info_util.py
similarity index 100%
rename from xctestrunner/shared/xcode_info_util.py
rename to shared/xcode_info_util.py
diff --git a/xctestrunner/simulator_control/__init__.py b/simulator_control/__init__.py
similarity index 100%
rename from xctestrunner/simulator_control/__init__.py
rename to simulator_control/__init__.py
diff --git a/xctestrunner/simulator_control/simtype_profile.py b/simulator_control/simtype_profile.py
similarity index 100%
rename from xctestrunner/simulator_control/simtype_profile.py
rename to simulator_control/simtype_profile.py
diff --git a/xctestrunner/simulator_control/simulator_util.py b/simulator_control/simulator_util.py
similarity index 100%
rename from xctestrunner/simulator_control/simulator_util.py
rename to simulator_control/simulator_util.py
diff --git a/xctestrunner/test_runner/TestProject/TestProject.xcodeproj/project.pbxproj b/test_runner/TestProject/TestProject.xcodeproj/project.pbxproj
similarity index 100%
rename from xctestrunner/test_runner/TestProject/TestProject.xcodeproj/project.pbxproj
rename to test_runner/TestProject/TestProject.xcodeproj/project.pbxproj
diff --git a/xctestrunner/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXctest.xcscheme b/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXctest.xcscheme
similarity index 100%
rename from xctestrunner/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXctest.xcscheme
rename to test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXctest.xcscheme
diff --git a/xctestrunner/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXcuitest.xcscheme b/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXcuitest.xcscheme
similarity index 100%
rename from xctestrunner/test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXcuitest.xcscheme
rename to test_runner/TestProject/TestProject.xcodeproj/xcshareddata/xcschemes/TestProjectXcuitest.xcscheme
diff --git a/xctestrunner/test_runner/__init__.py b/test_runner/__init__.py
similarity index 100%
rename from xctestrunner/test_runner/__init__.py
rename to test_runner/__init__.py
diff --git a/xctestrunner/test_runner/dummy_project.py b/test_runner/dummy_project.py
similarity index 100%
rename from xctestrunner/test_runner/dummy_project.py
rename to test_runner/dummy_project.py
diff --git a/xctestrunner/test_runner/ios_test_runner.py b/test_runner/ios_test_runner.py
similarity index 100%
rename from xctestrunner/test_runner/ios_test_runner.py
rename to test_runner/ios_test_runner.py
diff --git a/xctestrunner/test_runner/logic_test_util.py b/test_runner/logic_test_util.py
similarity index 100%
rename from xctestrunner/test_runner/logic_test_util.py
rename to test_runner/logic_test_util.py
diff --git a/xctestrunner/test_runner/runner_exit_codes.py b/test_runner/runner_exit_codes.py
similarity index 100%
rename from xctestrunner/test_runner/runner_exit_codes.py
rename to test_runner/runner_exit_codes.py
diff --git a/xctestrunner/test_runner/test_summaries_util.py b/test_runner/test_summaries_util.py
similarity index 100%
rename from xctestrunner/test_runner/test_summaries_util.py
rename to test_runner/test_summaries_util.py
diff --git a/xctestrunner/test_runner/xcodebuild_test_executor.py b/test_runner/xcodebuild_test_executor.py
similarity index 100%
rename from xctestrunner/test_runner/xcodebuild_test_executor.py
rename to test_runner/xcodebuild_test_executor.py
diff --git a/xctestrunner/test_runner/xctest_session.py b/test_runner/xctest_session.py
similarity index 100%
rename from xctestrunner/test_runner/xctest_session.py
rename to test_runner/xctest_session.py
diff --git a/xctestrunner/test_runner/xctestrun.py b/test_runner/xctestrun.py
similarity index 100%
rename from xctestrunner/test_runner/xctestrun.py
rename to test_runner/xctestrun.py