diff --git a/docs/html/tools/workflow/index.jd b/docs/html/tools/workflow/index.jd
index 6a114c76e057b..a24a2b0c5f54a 100644
--- a/docs/html/tools/workflow/index.jd
+++ b/docs/html/tools/workflow/index.jd
@@ -30,15 +30,15 @@ figure 1. The development steps encompass four development phases, which include
     <p>During this phase you install and set up your development environment. You also create
       Android Virtual Devices (AVDs) and connect hardware devices on which you can install your
       applications.</p>
-    <p>See <a href="{@docRoot}tools/workflow/devices/index.html">Managing Virtual Devices</a>
-      and <a href="{@docRoot}tools/workflow/device.html">Using Hardware Devices</a> for more
+    <p>See <a href="{@docRoot}tools/devices/index.html">Managing Virtual Devices</a>
+      and <a href="{@docRoot}tools/device.html">Using Hardware Devices</a> for more
       information.
   </li>
   <li><strong>Project Setup and Development</strong>
     <p>During this phase you set up and develop your Android Studio project and application modules,
     which contain all of the source code and resource files for your application. For more
     information, see
-    <a href="{@docRoot}tools/workflow/projects/index.html">Create an Android project</a>.</p>
+    <a href="{@docRoot}tools/projects/index.html">Create an Android project</a>.</p>
   </li>
   <li><strong>Building, Debugging and Testing</strong>
     <p>During this phase you build your project into a debuggable <code>.apk</code> package(s) 
@@ -47,7 +47,7 @@ figure 1. The development steps encompass four development phases, which include
     that provides flexibility, customized build variants, dependency resolution, and much more. 
     If you're using another IDE, you can build your project using Gradle and install it on a device 
     using <a href="{@docRoot}tools/help/adb.html">adb</a>. For more information, see
-    <a href="{@docRoot}tools/workflow/building/index.html">Build and run your application</a>.</p>
+    <a href="{@docRoot}tools/building/index.html">Build and run your application</a>.</p>
     <p>Next, with Android Studio you debug your application using the
     <a href="{@docRoot}tools/help/monitor.html">Android Debug Monitor</a> and device log messages
     (<a href="{@docRoot}tools/help/logcat.html">logact</a>) along with the IntelliJ IDEA intelligent