diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index e2d0dd50d0..fe1acfe7ee 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -332,7 +332,8 @@ def _CheckNoMixingCAndCCSources(input_api, gn_files, output_api):
 
 def _CheckNoPackageBoundaryViolations(input_api, gn_files, output_api):
   cwd = input_api.PresubmitLocalPath()
-  script_path = os.path.join('tools_webrtc', 'check_package_boundaries.py')
+  script_path = os.path.join('tools_webrtc', 'presubmit_checks_lib',
+                             'check_package_boundaries.py')
   webrtc_path = os.path.join('webrtc')
   command = [sys.executable, script_path, webrtc_path]
   command += [gn_file.LocalPath() for gn_file in gn_files]
diff --git a/tools_webrtc/check_package_boundaries.py b/tools_webrtc/presubmit_checks_lib/check_package_boundaries.py
similarity index 100%
rename from tools_webrtc/check_package_boundaries.py
rename to tools_webrtc/presubmit_checks_lib/check_package_boundaries.py
diff --git a/tools_webrtc/check_package_boundaries_test.py b/tools_webrtc/presubmit_checks_lib/check_package_boundaries_test.py
similarity index 100%
rename from tools_webrtc/check_package_boundaries_test.py
rename to tools_webrtc/presubmit_checks_lib/check_package_boundaries_test.py
diff --git a/tools_webrtc/testdata/all_build_files/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/BUILD.gn
diff --git a/tools_webrtc/testdata/all_build_files/expected.pyl b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/expected.pyl
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/expected.pyl
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/expected.pyl
diff --git a/tools_webrtc/testdata/all_build_files/subpackage1/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage1/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/subpackage1/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage1/BUILD.gn
diff --git a/tools_webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage1/subsubpackage1/BUILD.gn
diff --git a/tools_webrtc/testdata/all_build_files/subpackage2/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage2/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/subpackage2/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage2/BUILD.gn
diff --git a/tools_webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/all_build_files/subpackage2/subsubpackage2/BUILD.gn
diff --git a/tools_webrtc/testdata/common_prefix/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/common_prefix/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/common_prefix/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/common_prefix/BUILD.gn
diff --git a/tools_webrtc/testdata/common_prefix/call/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/common_prefix/call/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/common_prefix/call/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/common_prefix/call/BUILD.gn
diff --git a/tools_webrtc/testdata/common_prefix/expected.pyl b/tools_webrtc/presubmit_checks_lib/testdata/common_prefix/expected.pyl
similarity index 100%
rename from tools_webrtc/testdata/common_prefix/expected.pyl
rename to tools_webrtc/presubmit_checks_lib/testdata/common_prefix/expected.pyl
diff --git a/tools_webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_multiple_targets/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/BUILD.gn
diff --git a/tools_webrtc/testdata/multiple_errors_multiple_targets/expected.pyl b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/expected.pyl
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_multiple_targets/expected.pyl
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/expected.pyl
diff --git a/tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/subpackage1/BUILD.gn
diff --git a/tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_multiple_targets/subpackage2/BUILD.gn
diff --git a/tools_webrtc/testdata/multiple_errors_single_target/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_single_target/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/BUILD.gn
diff --git a/tools_webrtc/testdata/multiple_errors_single_target/expected.pyl b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/expected.pyl
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_single_target/expected.pyl
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/expected.pyl
diff --git a/tools_webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/subpackage/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/multiple_errors_single_target/subpackage/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/multiple_errors_single_target/subpackage/BUILD.gn
diff --git a/tools_webrtc/testdata/no_errors/BUILD.gn b/tools_webrtc/presubmit_checks_lib/testdata/no_errors/BUILD.gn
similarity index 100%
rename from tools_webrtc/testdata/no_errors/BUILD.gn
rename to tools_webrtc/presubmit_checks_lib/testdata/no_errors/BUILD.gn
diff --git a/tools_webrtc/testdata/no_errors/expected.pyl b/tools_webrtc/presubmit_checks_lib/testdata/no_errors/expected.pyl
similarity index 100%
rename from tools_webrtc/testdata/no_errors/expected.pyl
rename to tools_webrtc/presubmit_checks_lib/testdata/no_errors/expected.pyl