diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd
index cb6bf48..834f8a9 100644
--- a/docs/html/distribute/googleplay/promote/brand.jd
+++ b/docs/html/distribute/googleplay/promote/brand.jd
@@ -51,7 +51,7 @@
     <p style="text-align:center">
        <a href="{@docRoot}images/brand/Android_Robot_100.png">100x118</a> |
        <a href="{@docRoot}images/brand/Android_Robot_200.png">200x237</a><br>
-       <a href="{@docRoot}images/brand/Android_Robot_outlined.ai">Illustrator (.ai)</a></p>
+       <a href="{@docRoot}downloads/brand/Android_Robot_outlined.ai">Illustrator (.ai)</a></p>
   </div>
 
     <p>The Android robot can be used, reproduced, and modified freely in marketing
diff --git a/docs/html/sdk/images/4.0/folders.xcf b/docs/html/sdk/images/4.0/folders.xcf
deleted file mode 100644
index 66cc02c..0000000
--- a/docs/html/sdk/images/4.0/folders.xcf
+++ /dev/null
Binary files differ
diff --git a/docs/html/shareables/README b/docs/html/shareables/README.txt
similarity index 100%
rename from docs/html/shareables/README
rename to docs/html/shareables/README.txt
diff --git a/docs/html/tools/sdk/images/4.0/folders.xcf b/docs/html/tools/sdk/images/4.0/folders.xcf
deleted file mode 100644
index 66cc02c..0000000
--- a/docs/html/tools/sdk/images/4.0/folders.xcf
+++ /dev/null
Binary files differ
diff --git a/docs/html/images/activity_lifecycle.graffle b/docs/image_sources/activity_lifecycle.graffle
similarity index 100%
rename from docs/html/images/activity_lifecycle.graffle
rename to docs/image_sources/activity_lifecycle.graffle
diff --git a/docs/html/images/brand/Android_Robot_outlined.ai b/docs/image_sources/brand/Android_Robot_outlined.ai
similarity index 100%
rename from docs/html/images/brand/Android_Robot_outlined.ai
rename to docs/image_sources/brand/Android_Robot_outlined.ai
Binary files differ
diff --git a/docs/html/images/brand/Google_Play_Store.ai b/docs/image_sources/brand/Google_Play_Store.ai
similarity index 100%
rename from docs/html/images/brand/Google_Play_Store.ai
rename to docs/image_sources/brand/Google_Play_Store.ai
Binary files differ
diff --git a/docs/html/images/brand/en_app_rgb_wo.ai b/docs/image_sources/brand/en_app_rgb_wo.ai
similarity index 100%
rename from docs/html/images/brand/en_app_rgb_wo.ai
rename to docs/image_sources/brand/en_app_rgb_wo.ai
Binary files differ
diff --git a/docs/html/images/brand/en_generic_rgb_wo.ai b/docs/image_sources/brand/en_generic_rgb_wo.ai
similarity index 100%
rename from docs/html/images/brand/en_generic_rgb_wo.ai
rename to docs/image_sources/brand/en_generic_rgb_wo.ai
Binary files differ
diff --git a/docs/html/images/fundamentals/fragments.graffle b/docs/image_sources/fundamentals/fragments.graffle
similarity index 100%
rename from docs/html/images/fundamentals/fragments.graffle
rename to docs/image_sources/fundamentals/fragments.graffle
diff --git a/docs/html/images/fundamentals/restore_instance.graffle b/docs/image_sources/fundamentals/restore_instance.graffle
similarity index 100%
rename from docs/html/images/fundamentals/restore_instance.graffle
rename to docs/image_sources/fundamentals/restore_instance.graffle
diff --git a/docs/html/images/fundamentals/service_lifecycle.graffle b/docs/image_sources/fundamentals/service_lifecycle.graffle
similarity index 100%
rename from docs/html/images/fundamentals/service_lifecycle.graffle
rename to docs/image_sources/fundamentals/service_lifecycle.graffle
diff --git a/docs/html/images/providers/datamodel.graffle b/docs/image_sources/providers/datamodel.graffle
similarity index 100%
rename from docs/html/images/providers/datamodel.graffle
rename to docs/image_sources/providers/datamodel.graffle
diff --git a/docs/html/images/resources/res-selection-flowchart.graffle b/docs/image_sources/resources/res-selection-flowchart.graffle
similarity index 100%
rename from docs/html/images/resources/res-selection-flowchart.graffle
rename to docs/image_sources/resources/res-selection-flowchart.graffle
diff --git a/docs/html/images/resources/resource_devices_diagram.graffle b/docs/image_sources/resources/resource_devices_diagram.graffle
similarity index 100%
rename from docs/html/images/resources/resource_devices_diagram.graffle
rename to docs/image_sources/resources/resource_devices_diagram.graffle
diff --git a/docs/html/images/rs_compute.graffle b/docs/image_sources/rs_compute.graffle
similarity index 100%
rename from docs/html/images/rs_compute.graffle
rename to docs/image_sources/rs_compute.graffle
diff --git a/docs/html/images/rs_graphics.graffle b/docs/image_sources/rs_graphics.graffle
similarity index 100%
rename from docs/html/images/rs_graphics.graffle
rename to docs/image_sources/rs_graphics.graffle
diff --git a/docs/html/images/rs_overview.graffle b/docs/image_sources/rs_overview.graffle
similarity index 100%
rename from docs/html/images/rs_overview.graffle
rename to docs/image_sources/rs_overview.graffle
diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf
similarity index 100%
rename from docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf
rename to docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Preview.pdf
Binary files differ
diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff
similarity index 100%
rename from docs/html/images/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff
rename to docs/image_sources/training/basics/basic-lifecycle.graffle/QuickLook/Thumbnail.tiff
Binary files differ
diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/data.plist b/docs/image_sources/training/basics/basic-lifecycle.graffle/data.plist
similarity index 100%
rename from docs/html/images/training/basics/basic-lifecycle.graffle/data.plist
rename to docs/image_sources/training/basics/basic-lifecycle.graffle/data.plist
diff --git a/docs/html/images/training/basics/basic-lifecycle.graffle/image1.png b/docs/image_sources/training/basics/basic-lifecycle.graffle/image1.png
similarity index 100%
rename from docs/html/images/training/basics/basic-lifecycle.graffle/image1.png
rename to docs/image_sources/training/basics/basic-lifecycle.graffle/image1.png
Binary files differ
diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf
similarity index 100%
rename from docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf
rename to docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Preview.pdf
Binary files differ
diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff
similarity index 100%
rename from docs/html/images/training/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff
rename to docs/image_sources/training/basics/basic-simple-screen-mock.graffle/QuickLook/Thumbnail.tiff
Binary files differ
diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/data.plist b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/data.plist
similarity index 100%
rename from docs/html/images/training/basic-simple-screen-mock.graffle/data.plist
rename to docs/image_sources/training/basics/basic-simple-screen-mock.graffle/data.plist
diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image1.png b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image1.png
similarity index 100%
rename from docs/html/images/training/basic-simple-screen-mock.graffle/image1.png
rename to docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image1.png
Binary files differ
diff --git a/docs/html/images/training/basic-simple-screen-mock.graffle/image2.png b/docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image2.png
similarity index 100%
rename from docs/html/images/training/basic-simple-screen-mock.graffle/image2.png
rename to docs/image_sources/training/basics/basic-simple-screen-mock.graffle/image2.png
Binary files differ
diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Preview.pdf
similarity index 100%
rename from docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Preview.pdf
rename to docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Preview.pdf
Binary files differ
diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff b/docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff
similarity index 100%
rename from docs/html/images/training/basics/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff
rename to docs/image_sources/training/fragments-screen-mock.graffle/QuickLook/Thumbnail.tiff
Binary files differ
diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist b/docs/image_sources/training/fragments-screen-mock.graffle/data.plist
similarity index 100%
rename from docs/html/images/training/basics/fragments-screen-mock.graffle/data.plist
rename to docs/image_sources/training/fragments-screen-mock.graffle/data.plist
diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png b/docs/image_sources/training/fragments-screen-mock.graffle/image1.png
similarity index 100%
rename from docs/html/images/training/basics/fragments-screen-mock.graffle/image1.png
rename to docs/image_sources/training/fragments-screen-mock.graffle/image1.png
Binary files differ
diff --git a/docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png b/docs/image_sources/training/fragments-screen-mock.graffle/image2.png
similarity index 100%
rename from docs/html/images/training/basics/fragments-screen-mock.graffle/image2.png
rename to docs/image_sources/training/fragments-screen-mock.graffle/image2.png
Binary files differ
diff --git a/docs/html/images/ui/actionbar-navigate-up.xcf b/docs/image_sources/ui/actionbar-navigate-up.xcf
similarity index 100%
rename from docs/html/images/ui/actionbar-navigate-up.xcf
rename to docs/image_sources/ui/actionbar-navigate-up.xcf
Binary files differ