diff --git a/BUILD.bazel b/BUILD.bazel
index d7a3b31..ce90434 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -101,6 +101,7 @@
         "//private/devices/google/common:debug_build_configs",
         "//private/devices/google/felix/touch/fst2:fst2.kconfig",
         "//private/devices/google/felix/touch/ftm5:ftm5.kconfig",
+        "//private/devices/google/gs201:build.config.gs201",
         "//private/google-modules/bms/misc:bms-misc.kconfig",
         "//private/google-modules/display/common:common.kconfig",
         "//private/google-modules/display/samsung:display.samsung.kconfig",
@@ -109,7 +110,6 @@
         "//private/google-modules/power/reset:reset.kconfig",
         "//private/google-modules/radio/samsung/s5300:cpif.kconfig",
         "//private/google-modules/radio/samsung/s5400:cpif.kconfig",
-        "//private/google-modules/soc/gs:build.config.gs201",
         "//private/google-modules/soc/gs:gs_soc.kconfig",
         "//private/google-modules/touch/common:touch.common.kconfig",
         "//private/google-modules/touch/fts/ftm5:ftm5.kconfig",
@@ -352,14 +352,14 @@
     name = "vendor_kernel_boot_modules.felix-cat",
     srcs = [
         "vendor_kernel_boot_modules.felix",
-        "//private/google-modules/soc/gs:vendor_kernel_boot_modules.gs201",
+        "//private/devices/google/gs201:vendor_kernel_boot_modules.gs201",
     ],
     outs = [
         "vendor_kernel_boot_modules.concat",
     ],
     cmd = """
         cat $(location vendor_kernel_boot_modules.felix) \\
-            $(location //private/google-modules/soc/gs:vendor_kernel_boot_modules.gs201) \\
+            $(location //private/devices/google/gs201:vendor_kernel_boot_modules.gs201) \\
             > $@
     """,
 )
@@ -393,12 +393,12 @@
     # Keep the following in sync with build.config.felix:
     modules_list = ":vendor_kernel_boot_modules.felix-cat",
     system_dlkm_modules_list = ":system_dlkm_modules_list",
-    system_dlkm_props = "//private/google-modules/soc/gs:system_dlkm.props.gs201",
+    system_dlkm_props = "//private/devices/google/gs201:system_dlkm.props.gs201",
     #vendor_dlkm_etc_files = ["//private/devices/google/felix:insmod_cfgs"],
-    vendor_dlkm_modules_blocklist = "//private/google-modules/soc/gs:vendor_dlkm.blocklist.gs201",
+    vendor_dlkm_modules_blocklist = "//private/devices/google/gs201:vendor_dlkm.blocklist.gs201",
     # No MODULES_BLOCKLIST
-    vendor_dlkm_modules_list = "//private/google-modules/soc/gs:vendor_dlkm_modules.gs201",
-    vendor_dlkm_props = "//private/google-modules/soc/gs:vendor_dlkm.props.gs201",
+    vendor_dlkm_modules_list = "//private/devices/google/gs201:vendor_dlkm_modules.gs201",
+    vendor_dlkm_props = "//private/devices/google/gs201:vendor_dlkm.props.gs201",
     deps = [
         # Keep the following in sync with vendor_dlkm.props:
         # selinux_fc
diff --git a/build.config.felix b/build.config.felix
index 3aa404b..eaf082c 100644
--- a/build.config.felix
+++ b/build.config.felix
@@ -7,7 +7,7 @@
 
 # These just need to be relative to the ROOT_DIR
 FRAGMENT_CONFIG=${DEVICE_DIR}/felix_gki.fragment
-. ${ROOT_DIR}/${SOC_DIR}/build.config.gs201
+. ${ROOT_DIR}/private/devices/google/gs201/build.config.gs201
 
 MAKE_GOALS="$MAKE_GOALS
 modules