diff --git a/docs/html-ndk/ndk/downloads/downloads_toc.cs b/docs/html/ndk/downloads/downloads_toc.cs
similarity index 100%
rename from docs/html-ndk/ndk/downloads/downloads_toc.cs
rename to docs/html/ndk/downloads/downloads_toc.cs
diff --git a/docs/html-ndk/ndk/downloads/index.jd b/docs/html/ndk/downloads/index.jd
similarity index 100%
rename from docs/html-ndk/ndk/downloads/index.jd
rename to docs/html/ndk/downloads/index.jd
diff --git a/docs/html-ndk/ndk/downloads/revision_history.jd b/docs/html/ndk/downloads/revision_history.jd
similarity index 100%
rename from docs/html-ndk/ndk/downloads/revision_history.jd
rename to docs/html/ndk/downloads/revision_history.jd
diff --git a/docs/html-ndk/ndk/guides/abis.jd b/docs/html/ndk/guides/abis.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/abis.jd
rename to docs/html/ndk/guides/abis.jd
diff --git a/docs/html-ndk/ndk/guides/android_mk.jd b/docs/html/ndk/guides/android_mk.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/android_mk.jd
rename to docs/html/ndk/guides/android_mk.jd
diff --git a/docs/html-ndk/ndk/guides/application_mk.jd b/docs/html/ndk/guides/application_mk.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/application_mk.jd
rename to docs/html/ndk/guides/application_mk.jd
diff --git a/docs/html-ndk/ndk/guides/arch.jd b/docs/html/ndk/guides/arch.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/arch.jd
rename to docs/html/ndk/guides/arch.jd
diff --git a/docs/html-ndk/ndk/guides/build.jd b/docs/html/ndk/guides/build.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/build.jd
rename to docs/html/ndk/guides/build.jd
diff --git a/docs/html-ndk/ndk/guides/concepts.jd b/docs/html/ndk/guides/concepts.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/concepts.jd
rename to docs/html/ndk/guides/concepts.jd
diff --git a/docs/html-ndk/ndk/guides/cpp-support.jd b/docs/html/ndk/guides/cpp-support.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/cpp-support.jd
rename to docs/html/ndk/guides/cpp-support.jd
diff --git a/docs/html-ndk/ndk/guides/cpu-arm-neon.jd b/docs/html/ndk/guides/cpu-arm-neon.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/cpu-arm-neon.jd
rename to docs/html/ndk/guides/cpu-arm-neon.jd
diff --git a/docs/html-ndk/ndk/guides/cpu-features.jd b/docs/html/ndk/guides/cpu-features.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/cpu-features.jd
rename to docs/html/ndk/guides/cpu-features.jd
diff --git a/docs/html-ndk/ndk/guides/debug.jd b/docs/html/ndk/guides/debug.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/debug.jd
rename to docs/html/ndk/guides/debug.jd
diff --git a/docs/html-ndk/ndk/guides/guides_toc.cs b/docs/html/ndk/guides/guides_toc.cs
similarity index 100%
rename from docs/html-ndk/ndk/guides/guides_toc.cs
rename to docs/html/ndk/guides/guides_toc.cs
diff --git a/docs/html-ndk/ndk/guides/images/NDK_build_string.png b/docs/html/ndk/guides/images/NDK_build_string.png
similarity index 100%
rename from docs/html-ndk/ndk/guides/images/NDK_build_string.png
rename to docs/html/ndk/guides/images/NDK_build_string.png
Binary files differ
diff --git a/docs/html-ndk/ndk/guides/images/NDK_build_string@2x.png b/docs/html/ndk/guides/images/NDK_build_string@2x.png
similarity index 100%
rename from docs/html-ndk/ndk/guides/images/NDK_build_string@2x.png
rename to docs/html/ndk/guides/images/NDK_build_string@2x.png
Binary files differ
diff --git a/docs/html-ndk/ndk/guides/images/verification_screen.png b/docs/html/ndk/guides/images/verification_screen.png
similarity index 100%
rename from docs/html-ndk/ndk/guides/images/verification_screen.png
rename to docs/html/ndk/guides/images/verification_screen.png
Binary files differ
diff --git a/docs/html-ndk/ndk/guides/images/verification_screen@2x.png b/docs/html/ndk/guides/images/verification_screen@2x.png
similarity index 100%
rename from docs/html-ndk/ndk/guides/images/verification_screen@2x.png
rename to docs/html/ndk/guides/images/verification_screen@2x.png
Binary files differ
diff --git a/docs/html-ndk/ndk/guides/index.jd b/docs/html/ndk/guides/index.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/index.jd
rename to docs/html/ndk/guides/index.jd
diff --git a/docs/html-ndk/ndk/guides/libs.jd b/docs/html/ndk/guides/libs.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/libs.jd
rename to docs/html/ndk/guides/libs.jd
diff --git a/docs/html-ndk/ndk/guides/mips.jd b/docs/html/ndk/guides/mips.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/mips.jd
rename to docs/html/ndk/guides/mips.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-build.jd b/docs/html/ndk/guides/ndk-build.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/ndk-build.jd
rename to docs/html/ndk/guides/ndk-build.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-gdb.jd b/docs/html/ndk/guides/ndk-gdb.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/ndk-gdb.jd
rename to docs/html/ndk/guides/ndk-gdb.jd
diff --git a/docs/html-ndk/ndk/guides/ndk-stack.jd b/docs/html/ndk/guides/ndk-stack.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/ndk-stack.jd
rename to docs/html/ndk/guides/ndk-stack.jd
diff --git a/docs/html-ndk/ndk/guides/prebuilts.jd b/docs/html/ndk/guides/prebuilts.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/prebuilts.jd
rename to docs/html/ndk/guides/prebuilts.jd
diff --git a/docs/html-ndk/ndk/guides/sample.jd b/docs/html/ndk/guides/sample.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/sample.jd
rename to docs/html/ndk/guides/sample.jd
diff --git a/docs/html-ndk/ndk/guides/setup.jd b/docs/html/ndk/guides/setup.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/setup.jd
rename to docs/html/ndk/guides/setup.jd
diff --git a/docs/html-ndk/ndk/guides/stable_apis.jd b/docs/html/ndk/guides/stable_apis.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/stable_apis.jd
rename to docs/html/ndk/guides/stable_apis.jd
diff --git a/docs/html-ndk/ndk/guides/standalone_toolchain.jd b/docs/html/ndk/guides/standalone_toolchain.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/standalone_toolchain.jd
rename to docs/html/ndk/guides/standalone_toolchain.jd
diff --git a/docs/html-ndk/ndk/guides/x86-64.jd b/docs/html/ndk/guides/x86-64.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/x86-64.jd
rename to docs/html/ndk/guides/x86-64.jd
diff --git a/docs/html-ndk/ndk/guides/x86.jd b/docs/html/ndk/guides/x86.jd
similarity index 100%
rename from docs/html-ndk/ndk/guides/x86.jd
rename to docs/html/ndk/guides/x86.jd
diff --git a/docs/html-ndk/ndk/index.jd b/docs/html/ndk/index.jd
similarity index 100%
rename from docs/html-ndk/ndk/index.jd
rename to docs/html/ndk/index.jd
diff --git a/docs/html-ndk/ndk/reference/annotated.jd b/docs/html/ndk/reference/annotated.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/annotated.jd
rename to docs/html/ndk/reference/annotated.jd
diff --git a/docs/html-ndk/ndk/reference/asset__manager_8h.jd b/docs/html/ndk/reference/asset__manager_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/asset__manager_8h.jd
rename to docs/html/ndk/reference/asset__manager_8h.jd
diff --git a/docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd b/docs/html/ndk/reference/asset__manager__jni_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/asset__manager__jni_8h.jd
rename to docs/html/ndk/reference/asset__manager__jni_8h.jd
diff --git a/docs/html-ndk/ndk/reference/bc_s.png b/docs/html/ndk/reference/bc_s.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/bc_s.png
rename to docs/html/ndk/reference/bc_s.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/bdwn.png b/docs/html/ndk/reference/bdwn.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/bdwn.png
rename to docs/html/ndk/reference/bdwn.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/bitmap_8h.jd b/docs/html/ndk/reference/bitmap_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/bitmap_8h.jd
rename to docs/html/ndk/reference/bitmap_8h.jd
diff --git a/docs/html-ndk/ndk/reference/classes.jd b/docs/html/ndk/reference/classes.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/classes.jd
rename to docs/html/ndk/reference/classes.jd
diff --git a/docs/html-ndk/ndk/reference/closed.png b/docs/html/ndk/reference/closed.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/closed.png
rename to docs/html/ndk/reference/closed.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/configuration_8h.jd b/docs/html/ndk/reference/configuration_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/configuration_8h.jd
rename to docs/html/ndk/reference/configuration_8h.jd
diff --git a/docs/html-ndk/ndk/reference/deprecated.jd b/docs/html/ndk/reference/deprecated.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/deprecated.jd
rename to docs/html/ndk/reference/deprecated.jd
diff --git a/docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd b/docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
rename to docs/html/ndk/reference/dir_035c76f7235f5f563d38e3ab90cb9716.jd
diff --git a/docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd b/docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
rename to docs/html/ndk/reference/dir_d44c64559bbebec7f509842c48db8b23.jd
diff --git a/docs/html-ndk/ndk/reference/doxygen-dac.css b/docs/html/ndk/reference/doxygen-dac.css
similarity index 100%
rename from docs/html-ndk/ndk/reference/doxygen-dac.css
rename to docs/html/ndk/reference/doxygen-dac.css
diff --git a/docs/html-ndk/ndk/reference/doxygen.css b/docs/html/ndk/reference/doxygen.css
similarity index 100%
rename from docs/html-ndk/ndk/reference/doxygen.css
rename to docs/html/ndk/reference/doxygen.css
diff --git a/docs/html-ndk/ndk/reference/doxygen.png b/docs/html/ndk/reference/doxygen.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/doxygen.png
rename to docs/html/ndk/reference/doxygen.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/dynsections.js b/docs/html/ndk/reference/dynsections.js
similarity index 100%
rename from docs/html-ndk/ndk/reference/dynsections.js
rename to docs/html/ndk/reference/dynsections.js
diff --git a/docs/html-ndk/ndk/reference/files.jd b/docs/html/ndk/reference/files.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/files.jd
rename to docs/html/ndk/reference/files.jd
diff --git a/docs/html-ndk/ndk/reference/ftv2blank.png b/docs/html/ndk/reference/ftv2blank.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2blank.png
rename to docs/html/ndk/reference/ftv2blank.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2cl.png b/docs/html/ndk/reference/ftv2cl.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2cl.png
rename to docs/html/ndk/reference/ftv2cl.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2doc.png b/docs/html/ndk/reference/ftv2doc.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2doc.png
rename to docs/html/ndk/reference/ftv2doc.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2folderclosed.png b/docs/html/ndk/reference/ftv2folderclosed.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2folderclosed.png
rename to docs/html/ndk/reference/ftv2folderclosed.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2folderopen.png b/docs/html/ndk/reference/ftv2folderopen.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2folderopen.png
rename to docs/html/ndk/reference/ftv2folderopen.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2lastnode.png b/docs/html/ndk/reference/ftv2lastnode.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2lastnode.png
rename to docs/html/ndk/reference/ftv2lastnode.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2link.png b/docs/html/ndk/reference/ftv2link.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2link.png
rename to docs/html/ndk/reference/ftv2link.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2mlastnode.png b/docs/html/ndk/reference/ftv2mlastnode.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2mlastnode.png
rename to docs/html/ndk/reference/ftv2mlastnode.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2mnode.png b/docs/html/ndk/reference/ftv2mnode.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2mnode.png
rename to docs/html/ndk/reference/ftv2mnode.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2mo.png b/docs/html/ndk/reference/ftv2mo.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2mo.png
rename to docs/html/ndk/reference/ftv2mo.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2node.png b/docs/html/ndk/reference/ftv2node.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2node.png
rename to docs/html/ndk/reference/ftv2node.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2ns.png b/docs/html/ndk/reference/ftv2ns.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2ns.png
rename to docs/html/ndk/reference/ftv2ns.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2plastnode.png b/docs/html/ndk/reference/ftv2plastnode.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2plastnode.png
rename to docs/html/ndk/reference/ftv2plastnode.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2pnode.png b/docs/html/ndk/reference/ftv2pnode.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2pnode.png
rename to docs/html/ndk/reference/ftv2pnode.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2splitbar.png b/docs/html/ndk/reference/ftv2splitbar.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2splitbar.png
rename to docs/html/ndk/reference/ftv2splitbar.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/ftv2vertline.png b/docs/html/ndk/reference/ftv2vertline.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/ftv2vertline.png
rename to docs/html/ndk/reference/ftv2vertline.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/functions.jd b/docs/html/ndk/reference/functions.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/functions.jd
rename to docs/html/ndk/reference/functions.jd
diff --git a/docs/html-ndk/ndk/reference/functions_vars.jd b/docs/html/ndk/reference/functions_vars.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/functions_vars.jd
rename to docs/html/ndk/reference/functions_vars.jd
diff --git a/docs/html-ndk/ndk/reference/globals.jd b/docs/html/ndk/reference/globals.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals.jd
rename to docs/html/ndk/reference/globals.jd
diff --git a/docs/html-ndk/ndk/reference/globals_defs.jd b/docs/html/ndk/reference/globals_defs.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_defs.jd
rename to docs/html/ndk/reference/globals_defs.jd
diff --git a/docs/html-ndk/ndk/reference/globals_enum.jd b/docs/html/ndk/reference/globals_enum.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_enum.jd
rename to docs/html/ndk/reference/globals_enum.jd
diff --git a/docs/html-ndk/ndk/reference/globals_eval.jd b/docs/html/ndk/reference/globals_eval.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_eval.jd
rename to docs/html/ndk/reference/globals_eval.jd
diff --git a/docs/html-ndk/ndk/reference/globals_eval_w.jd b/docs/html/ndk/reference/globals_eval_w.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_eval_w.jd
rename to docs/html/ndk/reference/globals_eval_w.jd
diff --git a/docs/html-ndk/ndk/reference/globals_func.jd b/docs/html/ndk/reference/globals_func.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_func.jd
rename to docs/html/ndk/reference/globals_func.jd
diff --git a/docs/html-ndk/ndk/reference/globals_type.jd b/docs/html/ndk/reference/globals_type.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_type.jd
rename to docs/html/ndk/reference/globals_type.jd
diff --git a/docs/html-ndk/ndk/reference/globals_vars.jd b/docs/html/ndk/reference/globals_vars.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_vars.jd
rename to docs/html/ndk/reference/globals_vars.jd
diff --git a/docs/html-ndk/ndk/reference/globals_w.jd b/docs/html/ndk/reference/globals_w.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/globals_w.jd
rename to docs/html/ndk/reference/globals_w.jd
diff --git a/docs/html-ndk/ndk/reference/group___asset.jd b/docs/html/ndk/reference/group___asset.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___asset.jd
rename to docs/html/ndk/reference/group___asset.jd
diff --git a/docs/html-ndk/ndk/reference/group___bitmap.jd b/docs/html/ndk/reference/group___bitmap.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___bitmap.jd
rename to docs/html/ndk/reference/group___bitmap.jd
diff --git a/docs/html-ndk/ndk/reference/group___configuration.jd b/docs/html/ndk/reference/group___configuration.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___configuration.jd
rename to docs/html/ndk/reference/group___configuration.jd
diff --git a/docs/html-ndk/ndk/reference/group___input.jd b/docs/html/ndk/reference/group___input.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___input.jd
rename to docs/html/ndk/reference/group___input.jd
diff --git a/docs/html-ndk/ndk/reference/group___looper.jd b/docs/html/ndk/reference/group___looper.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___looper.jd
rename to docs/html/ndk/reference/group___looper.jd
diff --git a/docs/html-ndk/ndk/reference/group___native_activity.jd b/docs/html/ndk/reference/group___native_activity.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___native_activity.jd
rename to docs/html/ndk/reference/group___native_activity.jd
diff --git a/docs/html-ndk/ndk/reference/group___sensor.jd b/docs/html/ndk/reference/group___sensor.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___sensor.jd
rename to docs/html/ndk/reference/group___sensor.jd
diff --git a/docs/html-ndk/ndk/reference/group___storage.jd b/docs/html/ndk/reference/group___storage.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/group___storage.jd
rename to docs/html/ndk/reference/group___storage.jd
diff --git a/docs/html-ndk/ndk/reference/index.jd b/docs/html/ndk/reference/index.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/index.jd
rename to docs/html/ndk/reference/index.jd
diff --git a/docs/html-ndk/ndk/reference/input_8h.jd b/docs/html/ndk/reference/input_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/input_8h.jd
rename to docs/html/ndk/reference/input_8h.jd
diff --git a/docs/html-ndk/ndk/reference/keycodes_8h.jd b/docs/html/ndk/reference/keycodes_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/keycodes_8h.jd
rename to docs/html/ndk/reference/keycodes_8h.jd
diff --git a/docs/html-ndk/ndk/reference/looper_8h.jd b/docs/html/ndk/reference/looper_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/looper_8h.jd
rename to docs/html/ndk/reference/looper_8h.jd
diff --git a/docs/html-ndk/ndk/reference/modules.jd b/docs/html/ndk/reference/modules.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/modules.jd
rename to docs/html/ndk/reference/modules.jd
diff --git a/docs/html-ndk/ndk/reference/native__activity_8h.jd b/docs/html/ndk/reference/native__activity_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/native__activity_8h.jd
rename to docs/html/ndk/reference/native__activity_8h.jd
diff --git a/docs/html-ndk/ndk/reference/native__window_8h.jd b/docs/html/ndk/reference/native__window_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/native__window_8h.jd
rename to docs/html/ndk/reference/native__window_8h.jd
diff --git a/docs/html-ndk/ndk/reference/native__window__jni_8h.jd b/docs/html/ndk/reference/native__window__jni_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/native__window__jni_8h.jd
rename to docs/html/ndk/reference/native__window__jni_8h.jd
diff --git a/docs/html-ndk/ndk/reference/nav_f.png b/docs/html/ndk/reference/nav_f.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/nav_f.png
rename to docs/html/ndk/reference/nav_f.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/nav_g.png b/docs/html/ndk/reference/nav_g.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/nav_g.png
rename to docs/html/ndk/reference/nav_g.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/nav_h.png b/docs/html/ndk/reference/nav_h.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/nav_h.png
rename to docs/html/ndk/reference/nav_h.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/obb_8h.jd b/docs/html/ndk/reference/obb_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/obb_8h.jd
rename to docs/html/ndk/reference/obb_8h.jd
diff --git a/docs/html-ndk/ndk/reference/open.png b/docs/html/ndk/reference/open.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/open.png
rename to docs/html/ndk/reference/open.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/pages.jd b/docs/html/ndk/reference/pages.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/pages.jd
rename to docs/html/ndk/reference/pages.jd
diff --git a/docs/html-ndk/ndk/reference/rect_8h.jd b/docs/html/ndk/reference/rect_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/rect_8h.jd
rename to docs/html/ndk/reference/rect_8h.jd
diff --git a/docs/html-ndk/ndk/reference/reference_toc.cs b/docs/html/ndk/reference/reference_toc.cs
similarity index 100%
rename from docs/html-ndk/ndk/reference/reference_toc.cs
rename to docs/html/ndk/reference/reference_toc.cs
diff --git a/docs/html-ndk/ndk/reference/sensor_8h.jd b/docs/html/ndk/reference/sensor_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/sensor_8h.jd
rename to docs/html/ndk/reference/sensor_8h.jd
diff --git a/docs/html-ndk/ndk/reference/storage__manager_8h.jd b/docs/html/ndk/reference/storage__manager_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/storage__manager_8h.jd
rename to docs/html/ndk/reference/storage__manager_8h.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd b/docs/html/ndk/reference/struct_a_heart_rate_event.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_heart_rate_event.jd
rename to docs/html/ndk/reference/struct_a_heart_rate_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd b/docs/html/ndk/reference/struct_a_meta_data_event.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_meta_data_event.jd
rename to docs/html/ndk/reference/struct_a_meta_data_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity.jd b/docs/html/ndk/reference/struct_a_native_activity.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_native_activity.jd
rename to docs/html/ndk/reference/struct_a_native_activity.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd b/docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_native_activity_callbacks.jd
rename to docs/html/ndk/reference/struct_a_native_activity_callbacks.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd b/docs/html/ndk/reference/struct_a_native_window___buffer.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_native_window___buffer.jd
rename to docs/html/ndk/reference/struct_a_native_window___buffer.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_rect.jd b/docs/html/ndk/reference/struct_a_rect.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_rect.jd
rename to docs/html/ndk/reference/struct_a_rect.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_event.jd b/docs/html/ndk/reference/struct_a_sensor_event.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_sensor_event.jd
rename to docs/html/ndk/reference/struct_a_sensor_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd b/docs/html/ndk/reference/struct_a_sensor_vector.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_sensor_vector.jd
rename to docs/html/ndk/reference/struct_a_sensor_vector.jd
diff --git a/docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd b/docs/html/ndk/reference/struct_a_uncalibrated_event.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_a_uncalibrated_event.jd
rename to docs/html/ndk/reference/struct_a_uncalibrated_event.jd
diff --git a/docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd b/docs/html/ndk/reference/struct_android_bitmap_info.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/struct_android_bitmap_info.jd
rename to docs/html/ndk/reference/struct_android_bitmap_info.jd
diff --git a/docs/html-ndk/ndk/reference/sync_off.png b/docs/html/ndk/reference/sync_off.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/sync_off.png
rename to docs/html/ndk/reference/sync_off.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/sync_on.png b/docs/html/ndk/reference/sync_on.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/sync_on.png
rename to docs/html/ndk/reference/sync_on.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/tab_a.png b/docs/html/ndk/reference/tab_a.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/tab_a.png
rename to docs/html/ndk/reference/tab_a.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/tab_b.png b/docs/html/ndk/reference/tab_b.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/tab_b.png
rename to docs/html/ndk/reference/tab_b.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/tab_h.png b/docs/html/ndk/reference/tab_h.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/tab_h.png
rename to docs/html/ndk/reference/tab_h.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/tab_s.png b/docs/html/ndk/reference/tab_s.png
similarity index 100%
rename from docs/html-ndk/ndk/reference/tab_s.png
rename to docs/html/ndk/reference/tab_s.png
Binary files differ
diff --git a/docs/html-ndk/ndk/reference/tabs.css b/docs/html/ndk/reference/tabs.css
similarity index 100%
rename from docs/html-ndk/ndk/reference/tabs.css
rename to docs/html/ndk/reference/tabs.css
diff --git a/docs/html-ndk/ndk/reference/window_8h.jd b/docs/html/ndk/reference/window_8h.jd
similarity index 100%
rename from docs/html-ndk/ndk/reference/window_8h.jd
rename to docs/html/ndk/reference/window_8h.jd
diff --git a/docs/html-ndk/ndk/samples/index.jd b/docs/html/ndk/samples/index.jd
similarity index 100%
rename from docs/html-ndk/ndk/samples/index.jd
rename to docs/html/ndk/samples/index.jd
diff --git a/docs/html-ndk/ndk/samples/sample_hellojni.jd b/docs/html/ndk/samples/sample_hellojni.jd
similarity index 100%
rename from docs/html-ndk/ndk/samples/sample_hellojni.jd
rename to docs/html/ndk/samples/sample_hellojni.jd
diff --git a/docs/html-ndk/ndk/samples/sample_na.jd b/docs/html/ndk/samples/sample_na.jd
similarity index 100%
rename from docs/html-ndk/ndk/samples/sample_na.jd
rename to docs/html/ndk/samples/sample_na.jd
diff --git a/docs/html-ndk/ndk/samples/sample_teapot.jd b/docs/html/ndk/samples/sample_teapot.jd
similarity index 100%
rename from docs/html-ndk/ndk/samples/sample_teapot.jd
rename to docs/html/ndk/samples/sample_teapot.jd
diff --git a/docs/html-ndk/ndk/samples/samples_toc.cs b/docs/html/ndk/samples/samples_toc.cs
similarity index 100%
rename from docs/html-ndk/ndk/samples/samples_toc.cs
rename to docs/html/ndk/samples/samples_toc.cs
diff --git a/docs/html-ndk/ndk/samples/walkthroughs.jd b/docs/html/ndk/samples/walkthroughs.jd
similarity index 100%
rename from docs/html-ndk/ndk/samples/walkthroughs.jd
rename to docs/html/ndk/samples/walkthroughs.jd