diff --git a/base/BUILD b/base/BUILD
index d61383d..efad13f 100644
--- a/base/BUILD
+++ b/base/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "base",
diff --git a/base/strings/BUILD b/base/strings/BUILD
index 7a06170..5043906 100644
--- a/base/strings/BUILD
+++ b/base/strings/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "strings",
diff --git a/base/third_party/icu/BUILD b/base/third_party/icu/BUILD
index 6bfe0c3..ca5c9af 100644
--- a/base/third_party/icu/BUILD
+++ b/base/third_party/icu/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "icu",
diff --git a/build/BUILD b/build/BUILD
index 429d34c..db115d4 100644
--- a/build/BUILD
+++ b/build/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "build_config",
diff --git a/BUILD b/build_config/BUILD
similarity index 100%
rename from BUILD
rename to build_config/BUILD
diff --git a/build_config.bzl b/build_config/build_config.bzl
similarity index 100%
rename from build_config.bzl
rename to build_config/build_config.bzl
diff --git a/polyfills/BUILD b/polyfills/BUILD
index 454685b..beeac1a 100644
--- a/polyfills/BUILD
+++ b/polyfills/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "polyfills",
diff --git a/test/BUILD b/test/BUILD
index 3653782..59210a8 100644
--- a/test/BUILD
+++ b/test/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_test(
     name = "basic_test",
diff --git a/url/BUILD b/url/BUILD
index 0126bdc..e9081d9 100644
--- a/url/BUILD
+++ b/url/BUILD
@@ -1,7 +1,7 @@
 # Copyright 2019 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-load("//:build_config.bzl", "build_config")
+load("//build_config:build_config.bzl", "build_config")
 
 cc_library(
     name = "url",