diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 85b0d130f7ea0..d8f6365888073 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -155,8 +155,7 @@ for your favorite IDE (if available).</p>
 
 <p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other"
 ><b>download the SDK now</b></a>,
-or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=adt">Eclipse ADT
-install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
+or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio
 install</a> instructions.</p>
 
 
diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index 81d6f92b0c358..696552a00ef6c 100644
--- a/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@ -14,8 +14,8 @@ page.title=Migrating to Android Studio
 </div>
 </div>
 
-<p>If you're currently using Eclipse with ADT, we recommend you migrate to <a
-href={@docRoot}tools/basics/index.html">Android Studio</a>, a new Android
+<p>If you're currently using Eclipse with ADT, we recommend you migrate to
+<a href="{@docRoot}tools/studio/index.html">Android Studio</a>, a new Android
 development environment powered by IntelliJ IDEA. On top of the capabilities you expect from
 IntelliJ, Android Studio offers:</p>
 <ul>
diff --git a/docs/html/tools/debugging/debugging-studio.jd b/docs/html/tools/debugging/debugging-studio.jd
index b0604572058aa..e1d80b98fe2a0 100644
--- a/docs/html/tools/debugging/debugging-studio.jd
+++ b/docs/html/tools/debugging/debugging-studio.jd
@@ -28,7 +28,7 @@ page.title=Debugging with Android Studio
 </ol>
 <h2>See also</h2>
 <ul>
-<li><a href="{@docRoot}tools/basics/index.html">
+<li><a href="{@docRoot}sdk/installing/studio-tips.html">
 Android Studio Tips and Tricks</a></li>
 <li><a href="{@docRoot}tools/debugging/index.html">Debugging</a></li>
 <li><a href="{@docRoot}tools/help/monitor.html">Device Monitor</a></li>
diff --git a/docs/html/tools/eclipse/index.jd b/docs/html/tools/eclipse/index.jd
index cd39b231838e1..5fc6f783e81d0 100644
--- a/docs/html/tools/eclipse/index.jd
+++ b/docs/html/tools/eclipse/index.jd
@@ -7,7 +7,7 @@ page.title=Eclipse ADT
   <h2>See also</h2>
   <ol>
     <li><a href="{@docRoot}tools/sdk/index.html">Downloading Android Studio</a></li>
-    <li><a href="{@docRoot}tools/basics/index.html">Android Studio Basics</a></li>
+    <li><a href="{@docRoot}tools/studio/index.html">Android Studio</a></li>
     <li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating to Android Studio</a></li>
   </ol>
 </div>
@@ -26,8 +26,8 @@ to Android Studio</a> as the Eclipse ADT is no longer in active development.
 with an Android plugin for <em>Gradle</em>. <a href="http://www.gradle.org/">Gradle</a> is an
 advanced build toolkit that manages dependencies and allows you to define custom build logic. Android
 Studio also adds support for Maven-based build dependencies, build variants, advanced code
-completion and refactoring. For more details about Android Studio, see
-<a href="{@docRoot}tools/studio/basics.html">Android Studio basics.</a>
+completion and refactoring. For more details about Android Studio, see the
+<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.
 
 <p>If you still wish to get started with the ADT plugin,
 <a href="{@docRoot}tools/eclipse/installing-adt.html">download and install the Eclipse ADT plugin.</a>
diff --git a/docs/html/tools/publishing/app-signing.jd b/docs/html/tools/publishing/app-signing.jd
index 6e64392ea3904..4265a636a7b71 100644
--- a/docs/html/tools/publishing/app-signing.jd
+++ b/docs/html/tools/publishing/app-signing.jd
@@ -206,7 +206,8 @@ more than one), and enter the required information.</p>
 </ol>
 
 <p>You can also specify your signing settings in Gradle configuration files. For more information,
-see <a href="{@docRoot}tools/gradle/studio-build.html#configureSigning">Signing settings</a>.</p>
+see <a href="{@docRoot}tools/building/configuring-gradle.html#configureSigning">Configuring Gradle
+Builds</a>.</p>
 
 
 
diff --git a/docs/html/tools/publishing/preparing.jd b/docs/html/tools/publishing/preparing.jd
index b6b10fb4dd886..0b61aa7b3b676 100644
--- a/docs/html/tools/publishing/preparing.jd
+++ b/docs/html/tools/publishing/preparing.jd
@@ -85,7 +85,7 @@ and it is optimized with the zipalign tool.</p>
 Android Studio. For example, you can use Android Studio with the Gradle build files to compile, sign,
 and optimize your application all at once. You can also configure the Gradle build files to do the
 same when you build from the command line. For more details about using the Gradle build files, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+the <a href="{@docRoot}sdk/installing/studio-build.html">Build System</a> guide.</p>
 
 <p>To prepare your application for release you typically perform five main tasks (see figure 2).
 Each main task may include one or more smaller tasks depending on how you are releasing your
@@ -306,15 +306,16 @@ application, see <a href="{@docRoot}google/play/licensing/index.html">Applicatio
 <code>.apk</code> file that is signed and optimized. The JDK includes the tools for signing the
 <code>.apk</code> file (Keytool and Jarsigner); the Android SDK includes the tools for compiling and
 optimizing the <code>.apk</code> file. If you are using Android Studio or you are using
-the Gradle build system from the command line, you can automate the entire build process. See
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+the Gradle build system from the command line, you can automate the entire build process.
+For more information about configuring Gradle builds, see
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
 
 <h3>Building with Android Studio</h3>
 
 <p>You can use the Gradle build system, integrated with Android Studio to build a release-ready
 <code>.apk</code> file that is signed with your private key and optimized. To learn how to setup and
 run builds from Android Studio, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/building-studio.html">Building and Running from Android Studio</a>.</p>
 
 <p>The build process assumes that you have a certificate and private key
 suitable for signing your application. If you do not have a suitable certificate and private key,
diff --git a/docs/html/tools/publishing/versioning.jd b/docs/html/tools/publishing/versioning.jd
index f56dbc318155a..4af6f306168fd 100644
--- a/docs/html/tools/publishing/versioning.jd
+++ b/docs/html/tools/publishing/versioning.jd
@@ -96,7 +96,7 @@ value for display to users.</p>
 
 <p>You define both of these version attributes in the
 <code>&lt;manifest&gt;</code> element of the manifest file or the Gradle build file. See
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
 
 <p>Here's an example manifest that shows the <code>android:versionCode</code>
 and <code>android:versionName</code> attributes in the
@@ -174,4 +174,4 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code>&lt;uses-sdk&
 manifest element documentation and the <a
 href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API Levels</a> document. For
 Gradle build settings, see
-<a href="{@docRoot}tools/gradle/studio-build.html">Building Your Project with Gradle</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 25d8f0a47b177..9f743d2135d78 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -18,7 +18,6 @@ page.title=Android Studio
   <h2>See also</h2>
   <ol>
     <li><a href="{@docRoot}tools/sdk/index.html">Download Android Studio</a></li>
-    <li><a href="{@docRoot}tools/basics/index.html">Android Studio</a></li>
     <li><a href="http://wiki.jetbrains.net/intellij/Android">IntelliJ IDEA Android Tutorials</a></li>
     <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li>
     <li><a href="{@docRoot}tools/buildsystem/index.html">Build System</a></li>
@@ -165,7 +164,7 @@ the features of the build system to:</p>
 modifying your app's core source files. To build an Android Studio project, see
 <a href="{@docRoot}tools/building/building-studio.html">Building and Running from Android Studio</a>.
 To configure custom build settings in an Android Studio project, see
-<a href="{@docRoot}tools/gradle/configuring-studio-builds.html">Configure Android Studio Builds</a>.</p>
+<a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</a>.</p>
 
 
 <h3>Application ID for Package Identification </h3>