diff --git a/android-studio-plugin/BUILD b/android-studio-plugin/BUILD
index 5545167..069f21e 100644
--- a/android-studio-plugin/BUILD
+++ b/android-studio-plugin/BUILD
@@ -20,11 +20,12 @@
     visibility = ["//visibility:public"],
     # do not sort: must match IML order
     runtime_deps = [
-        "//tools/idea:credential-store",
-        "//tools/idea:json",
-        "//tools/idea:relaxng",
+        "//tools/idea/platform/credential-store",
+        "//tools/idea/json",
+        "//tools/idea/xml/relaxng",
         "//tools/idea/java/compiler/instrumentation-util-8",
         "//tools/idea/plugins/maven:maven2-server-impl",
+        "//tools/adt/idea/adt-branding",
     ],
     # do not sort: must match IML order
     deps = [
@@ -34,12 +35,12 @@
         "//tools/idea/platform/lang-api[module]",
         "//tools/idea/java/debugger/openapi:debugger-openapi[module]",
         "//tools/idea:jps-builders_and_others[module]",
-        "//tools/idea:dom-openapi[module]",
+        "//tools/idea/xml/dom-openapi[module]",
         "//tools/idea:java-impl[module]",
-        "//tools/idea:xml[module]",
+        "//tools/idea/xml/impl:xml[module]",
         "//tools/adt/idea/android[module]",
         "//tools/adt/idea/android-test-framework[module, test]",
-        "//tools/idea:external-system-impl[module]",
+        "//tools/idea/platform/external-system-impl[module]",
         "//tools/idea/platform/external-system-api[module]",
         "//tools/idea/plugins/gradle[module]",
         "//tools/idea/plugins/groovy:jetgroovy[module]",
@@ -47,14 +48,14 @@
         "//tools/studio/google/cloud/tools/android-studio-plugin/lib:gradle-appengine-builder-model-0.1.0",
         "//tools/idea/platform/bootstrap[module]",
         "//tools/idea/java/execution/openapi:execution-openapi[module]",
-        "//tools/idea:execution-impl[module]",
-        "//tools/idea:testFramework[module, test]",
+        "//tools/idea/java/execution/impl:execution-impl[module]",
+        "//tools/idea/platform/testFramework[module, test]",
         "//tools/studio/google/cloud/tools/android-studio-plugin/lib:samplesindex-v1-1.0-SNAPSHOT",
         "//tools/idea/plugins/git4idea[module]",
-        "//tools/idea:vcs-impl[module]",
+        "//tools/idea/platform/vcs-impl[module]",
         "//tools/studio/google/cloud/tools/android-studio-plugin/lib:google-api-services-source",
         "//tools/studio/google/cloud/tools/android-studio-plugin/lib:google-api-services-debugger",
-        "//tools/idea:xdebugger-impl[module]",
+        "//tools/idea/platform/xdebugger-impl[module]",
         "//tools/studio/google/cloud/tools/google-login-plugin:google-login-as[module]",
         "//tools/studio/google/cloud/tools/core-plugin:google-cloud-tools-core-as[module]",
         "//tools/adt/idea/observable[module]",
diff --git a/core-plugin/BUILD b/core-plugin/BUILD
index fd58e82..f5989b2 100644
--- a/core-plugin/BUILD
+++ b/core-plugin/BUILD
@@ -20,9 +20,9 @@
     ],
     # do not sort: must match IML order
     runtime_deps = [
-        "//tools/idea:credential-store",
-        "//tools/idea:json",
-        "//tools/idea:relaxng",
+        "//tools/idea/platform/credential-store",
+        "//tools/idea/json",
+        "//tools/idea/xml/relaxng",
         "//tools/idea/java/compiler/instrumentation-util-8",
         "//tools/idea/plugins/maven:maven2-server-impl",
     ],
@@ -34,10 +34,10 @@
         "//tools/idea/platform/lang-api[module]",
         "//tools/idea/java/debugger/openapi:debugger-openapi[module]",
         "//tools/idea:jps-builders_and_others[module]",
-        "//tools/idea:dom-openapi[module]",
+        "//tools/idea/xml/dom-openapi[module]",
         "//tools/idea:java-impl[module]",
-        "//tools/idea:xml[module]",
-        "//tools/idea:external-system-impl[module]",
+        "//tools/idea/xml/impl:xml[module]",
+        "//tools/idea/platform/external-system-impl[module]",
         "//tools/idea/platform/external-system-api[module]",
         "//tools/idea/plugins/gradle[module]",
         "//tools/idea/plugins/groovy:jetgroovy[module]",
@@ -45,14 +45,14 @@
         "//tools/studio/google/cloud/tools/core-plugin/third_party/gradle-appengine-builder-model:gradle-appengine-builder-model-0.1.0",
         "//tools/idea/platform/bootstrap[module]",
         "//tools/idea/java/execution/openapi:execution-openapi[module]",
-        "//tools/idea:execution-impl[module]",
-        "//tools/idea:testFramework[module, test]",
+        "//tools/idea/java/execution/impl:execution-impl[module]",
+        "//tools/idea/platform/testFramework[module, test]",
         "//tools/studio/google/cloud/tools/core-plugin/lib:google-api-services-cloudresourcemanager-v1beta1-rev12-1.21.0",
         "//tools/studio/google/cloud/tools/core-plugin/lib:google-api-services-appengine-v1-rev9-1.22.0",
         "//tools/idea/plugins/git4idea[module]",
-        "//tools/idea:vcs-impl[module]",
+        "//tools/idea/platform/vcs-impl[module]",
         "//tools/studio/google/cloud/tools/core-plugin/lib:google-api-services-source",
-        "//tools/idea:xdebugger-impl[module]",
+        "//tools/idea/platform/xdebugger-impl[module]",
         "//tools/studio/google/cloud/tools/core-plugin/lib:google-api-services-debugger",
         "//tools/studio/google/cloud/tools/google-login-plugin:google-login-as[module]",
         "//tools/studio/google/cloud/tools/core-plugin/third_party/org-eclipse-jgit:org.eclipse.jgit-3.3.0.201403021825-r",
diff --git a/google-login-plugin/BUILD b/google-login-plugin/BUILD
index 05ca46a..c8f3001 100644
--- a/google-login-plugin/BUILD
+++ b/google-login-plugin/BUILD
@@ -12,9 +12,9 @@
     tags = ["managed"],
     # do not sort: must match IML order
     test_runtime_deps = [
-        "//tools/idea:xml-structure-view-impl",
-        "//tools/idea:spellchecker",
-        "//tools/idea:images",
+        "//tools/idea/xml/xml-structure-view-impl",
+        "//tools/idea/spellchecker",
+        "//tools/idea/images",
     ],
     test_srcs = ["testSrc"],
     test_tags = ["manual"],
@@ -27,22 +27,22 @@
     ],
     # do not sort: must match IML order
     runtime_deps = [
-        "//tools/idea:RegExpSupport",
-        "//tools/idea:xml-analysis-impl",
-        "//tools/idea:xdebugger-impl",
-        "//tools/idea:lvcs-impl",
-        "//tools/idea:credential-store",
-        "//tools/idea:configuration-store-impl",
-        "//tools/idea:built-in-server",
-        "//tools/idea:tasks-platform-impl",
-        "//tools/idea:json",
-        "//tools/idea:relaxng",
-        "//tools/idea:dom-impl",
+        "//tools/idea/RegExpSupport",
+        "//tools/idea/xml/xml-analysis-impl",
+        "//tools/idea/platform/xdebugger-impl",
+        "//tools/idea/platform/lvcs-impl",
+        "//tools/idea/platform/credential-store",
+        "//tools/idea/platform/configuration-store-impl",
+        "//tools/idea/platform/built-in-server",
+        "//tools/idea/platform/tasks-platform-impl",
+        "//tools/idea/json",
+        "//tools/idea/xml/relaxng",
+        "//tools/idea/xml/dom-impl",
     ],
     # do not sort: must match IML order
     deps = [
         "//tools/idea/java/openapi[module]",
-        "//tools/idea:platform-impl[module]",
+        "//tools/idea/platform/platform-impl[module]",
         "//tools/idea/.idea/libraries:Guava",
         "//tools/idea/.idea/libraries:jcip",
         "//tools/idea/.idea/libraries:JUnit3[test]",