Move examples

Reorganize the examples into Getting Started, API, Demo, and Tutorial
Update build scripts to support example sub-dirs.

Disable examples that don't fit this model until we fix them.

R=binji@chromium.org
BUG=234855

Review URL: https://codereview.chromium.org/13971006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196443 0039d316-1c4b-4281-b951-d872f2087c98

100 files changed, 84 insertions, 64 deletions

diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index bc904a0..bd51d6d 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -87,6 +87,7 @@ def UpdateProjects(pepperdir, platform, project_tree, toolchains,
         buildbot_common.RemoveDir(dirpath)
       buildbot_common.MakeDir(dirpath)
 
+  landing_page = None
   for branch, projects in project_tree.iteritems():
     dirpath = os.path.join(pepperdir, branch)
     if clobber:
@@ -99,7 +100,7 @@ def UpdateProjects(pepperdir, platform, project_tree, toolchains,
     generate_make.GenerateMasterMakefile(os.path.join(pepperdir, branch),
                                          targets, depth)
 
-    if branch == 'examples':
+    if branch.startswith('examples') and not landing_page:
       landing_page = LandingPage()
 
     # Generate individual projects
@@ -107,19 +108,18 @@ def UpdateProjects(pepperdir, platform, project_tree, toolchains,
       srcroot = os.path.dirname(desc['FILEPATH'])
       generate_make.ProcessProject(srcroot, pepperdir, desc, toolchains)
 
-      if branch == 'examples':
+      if branch.startswith('examples'):
         landing_page.AddDesc(desc)
 
-    if branch == 'examples':
-      # Generate the landing page text file.
-      index_html = os.path.join(pepperdir, 'examples', 'index.html')
-      example_resources_dir = os.path.join(SDK_EXAMPLE_DIR, 'resources')
-      index_template = os.path.join(example_resources_dir,
-                                    'index.html.template')
-      with open(index_html, 'w') as fh:
-        out = landing_page.GeneratePage(index_template)
-        fh.write(out)
-      print 'Generated landing page.'
+  if landing_page:
+    # Generate the landing page text file.
+    index_html = os.path.join(pepperdir, 'examples', 'index.html')
+    example_resources_dir = os.path.join(SDK_EXAMPLE_DIR, 'resources')
+    index_template = os.path.join(example_resources_dir,
+                                  'index.html.template')
+    with open(index_html, 'w') as fh:
+      out = landing_page.GeneratePage(index_template)
+      fh.write(out)
 
   #
   # TODO(noelallen) Add back in once we move examples
diff --git a/native_client_sdk/src/build_tools/generate_index.py b/native_client_sdk/src/build_tools/generate_index.py
index 37c2a52..2aed35c 100644
--- a/native_client_sdk/src/build_tools/generate_index.py
+++ b/native_client_sdk/src/build_tools/generate_index.py
@@ -6,15 +6,26 @@ import collections
 
 import easy_template
 
+def CmpByName(x, y):
+  return cmp(x['NAME'], y['NAME'])
+  
 class LandingPage(object):
   def __init__(self):
-    self.section_list = ['Tools', 'API', 'Concepts']
+    self.section_list = ['Getting Started', 'API', 'Demo', 'Tutorial']
     self.section_map = collections.defaultdict(list)
 
   def GeneratePage(self, template_path):
     with open(template_path) as template_file:
       template = template_file.read()
-    template_dict = { 'section_map': self.section_map }
+
+    sec_map = {}
+    for section_name in self.section_map:
+      items = self.section_map[section_name]
+      items = sorted(items, cmp=CmpByName)
+      sec_map[section_name] = items
+      print 'Add section ' + section_name
+
+    template_dict = { 'section_map': sec_map }
     return easy_template.RunTemplateString(template, template_dict)
 
   def AddDesc(self, desc):
diff --git a/native_client_sdk/src/build_tools/generate_make.py b/native_client_sdk/src/build_tools/generate_make.py
index 9bd0fa0..d6b2b6c 100644
--- a/native_client_sdk/src/build_tools/generate_make.py
+++ b/native_client_sdk/src/build_tools/generate_make.py
@@ -17,7 +17,8 @@ Trace.verbose = False
 
 
 def ShouldProcessHTML(desc):
-  return desc['DEST'] in ('examples', 'tests')
+  dest = desc['DEST']
+  return dest.startswith('examples') or dest.startswith('tests')
 
 
 def GenerateSourceCopyList(desc):
@@ -114,9 +115,11 @@ def IsNexe(desc):
 
 def ProcessHTML(srcroot, dstroot, desc, toolchains, configs, first_toolchain):
   name = desc['NAME']
+  nmf = desc['TARGETS'][0]['NAME']
   outdir = os.path.join(dstroot, desc['DEST'], name)
   srcpath = os.path.join(srcroot, 'index.html')
   dstpath = os.path.join(outdir, 'index.html')
+  
   tools = GetPlatforms(toolchains, desc['TOOLS'], first_toolchain)
 
   path = "{tc}/{config}"
@@ -124,7 +127,7 @@ def ProcessHTML(srcroot, dstroot, desc, toolchains, configs, first_toolchain):
     'title': desc['TITLE'],
     'attrs':
         'data-name="%s" data-tools="%s" data-configs="%s" data-path="%s"' % (
-        name, ' '.join(tools), ' '.join(configs), path),
+        nmf, ' '.join(tools), ' '.join(configs), path),
   }
   RunTemplateFileIfChanged(srcpath, dstpath, replace)
 
@@ -152,7 +155,7 @@ def ProcessProject(srcroot, dstroot, desc, toolchains, configs=None,
   name = desc['NAME']
   out_dir = os.path.join(dstroot, desc['DEST'], name)
   buildbot_common.MakeDir(out_dir)
-  srcdirs = desc.get('SEARCH', ['.', '..'])
+  srcdirs = desc.get('SEARCH', ['.', '..', '../..'])
 
   # Copy sources to example directory
   sources = GenerateSourceCopyList(desc)
diff --git a/native_client_sdk/src/build_tools/parse_dsc.py b/native_client_sdk/src/build_tools/parse_dsc.py
index 6b900bd..fbd5212 100644
--- a/native_client_sdk/src/build_tools/parse_dsc.py
+++ b/native_client_sdk/src/build_tools/parse_dsc.py
@@ -38,7 +38,9 @@ DSC_FORMAT = {
     'SEARCH': (list, '', False),
     'POST': (str, '', False),
     'PRE': (str, '', False),
-    'DEST': (str, ['examples', 'src', 'testlibs', 'tests'], True),
+    'DEST': (str, ['examples/getting_started', 'examples/api',
+                   'examples/demo', 'examples/tutorial',
+                   'src', 'testlibs', 'tests'], True),
     'NAME': (str, '', False),
     'DATA': (list, '', False),
     'TITLE': (str, '', False),
diff --git a/native_client_sdk/src/examples/sine_synth/example.dsc b/native_client_sdk/src/examples/api/audio/example.dsc
index 8e01041..e401dc7 100644
--- a/native_client_sdk/src/examples/sine_synth/example.dsc
+++ b/native_client_sdk/src/examples/api/audio/example.dsc
@@ -11,9 +11,9 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
-  'NAME': 'sine_synth',
-  'TITLE': 'Sine Wave Synthesizer',
+  'DEST': 'examples/api',
+  'NAME': 'audio',
+  'TITLE': 'Audio',
   'GROUP': 'API',
 }
 
diff --git a/native_client_sdk/src/examples/sine_synth/example.js b/native_client_sdk/src/examples/api/audio/example.js
index 6a7398a..6a7398a 100644
--- a/native_client_sdk/src/examples/sine_synth/example.js
+++ b/native_client_sdk/src/examples/api/audio/example.js
diff --git a/native_client_sdk/src/examples/sine_synth/index.html b/native_client_sdk/src/examples/api/audio/index.html
index 70e8ed2..70e8ed2 100644
--- a/native_client_sdk/src/examples/sine_synth/index.html
+++ b/native_client_sdk/src/examples/api/audio/index.html
diff --git a/native_client_sdk/src/examples/sine_synth/sine_synth.cc b/native_client_sdk/src/examples/api/audio/sine_synth.cc
index 99bdf7f..99bdf7f 100644
--- a/native_client_sdk/src/examples/sine_synth/sine_synth.cc
+++ b/native_client_sdk/src/examples/api/audio/sine_synth.cc
diff --git a/native_client_sdk/src/examples/file_io/example.dsc b/native_client_sdk/src/examples/api/file_io/example.dsc
index 2a1d207..ac5e916 100644
--- a/native_client_sdk/src/examples/file_io/example.dsc
+++ b/native_client_sdk/src/examples/api/file_io/example.dsc
@@ -11,7 +11,7 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/api',
   'NAME': 'file_io',
   'TITLE': 'File I/O',
   'GROUP': 'API'
diff --git a/native_client_sdk/src/examples/file_io/example.js b/native_client_sdk/src/examples/api/file_io/example.js
index e73f4b9..e73f4b9 100644
--- a/native_client_sdk/src/examples/file_io/example.js
+++ b/native_client_sdk/src/examples/api/file_io/example.js
diff --git a/native_client_sdk/src/examples/file_io/file_io.cc b/native_client_sdk/src/examples/api/file_io/file_io.cc
index 6803982..6803982 100644
--- a/native_client_sdk/src/examples/file_io/file_io.cc
+++ b/native_client_sdk/src/examples/api/file_io/file_io.cc
diff --git a/native_client_sdk/src/examples/file_io/index.html b/native_client_sdk/src/examples/api/file_io/index.html
index 7625bd6..7625bd6 100644
--- a/native_client_sdk/src/examples/file_io/index.html
+++ b/native_client_sdk/src/examples/api/file_io/index.html
diff --git a/native_client_sdk/src/examples/gamepad/example.dsc b/native_client_sdk/src/examples/api/gamepad/example.dsc
index 8a494b5..65a61bc 100644
--- a/native_client_sdk/src/examples/gamepad/example.dsc
+++ b/native_client_sdk/src/examples/api/gamepad/example.dsc
@@ -8,9 +8,9 @@
       'LIBS': ['ppapi_cpp', 'ppapi', 'pthread']
     }
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/api',
   'NAME': 'gamepad',
-  'TITLE': 'Gamepad Example.',
+  'TITLE': 'Gamepad',
   'GROUP': 'API'
 }
 
diff --git a/native_client_sdk/src/examples/gamepad/gamepad.cc b/native_client_sdk/src/examples/api/gamepad/gamepad.cc
index 9730e17..9730e17 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.cc
+++ b/native_client_sdk/src/examples/api/gamepad/gamepad.cc
diff --git a/native_client_sdk/src/examples/gamepad/gamepad.h b/native_client_sdk/src/examples/api/gamepad/gamepad.h
index dcb92de..dcb92de 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad.h
+++ b/native_client_sdk/src/examples/api/gamepad/gamepad.h
diff --git a/native_client_sdk/src/examples/gamepad/gamepad_module.cc b/native_client_sdk/src/examples/api/gamepad/gamepad_module.cc
index cac2570..cac2570 100644
--- a/native_client_sdk/src/examples/gamepad/gamepad_module.cc
+++ b/native_client_sdk/src/examples/api/gamepad/gamepad_module.cc
diff --git a/native_client_sdk/src/examples/gamepad/index.html b/native_client_sdk/src/examples/api/gamepad/index.html
index 8b580db..8b580db 100644
--- a/native_client_sdk/src/examples/gamepad/index.html
+++ b/native_client_sdk/src/examples/api/gamepad/index.html
diff --git a/native_client_sdk/src/examples/hello_world_gles/example.dsc b/native_client_sdk/src/examples/api/graphics_3d/example.dsc
index eda6f3d..ea8377f 100644
--- a/native_client_sdk/src/examples/hello_world_gles/example.dsc
+++ b/native_client_sdk/src/examples/api/graphics_3d/example.dsc
@@ -17,9 +17,9 @@
     'hello.raw',
     'vertex_shader_es2.vert'
   ],
-  'DEST': 'examples',
-  'NAME': 'hello_world_gles',
-  'TITLE': 'Hello World GLES 2.0',
+  'DEST': 'examples/api',
+  'NAME': 'graphics_3d',
+  'TITLE': 'Graphics 3D',
   'GROUP': 'API'
 }
 
diff --git a/native_client_sdk/src/examples/hello_world_gles/fragment_shader_es2.frag b/native_client_sdk/src/examples/api/graphics_3d/fragment_shader_es2.frag
index 247c559..247c559 100644
--- a/native_client_sdk/src/examples/hello_world_gles/fragment_shader_es2.frag
+++ b/native_client_sdk/src/examples/api/graphics_3d/fragment_shader_es2.frag
diff --git a/native_client_sdk/src/examples/hello_world_gles/hello.raw b/native_client_sdk/src/examples/api/graphics_3d/hello.raw
index 3320575..3320575 100644
--- a/native_client_sdk/src/examples/hello_world_gles/hello.raw
+++ b/native_client_sdk/src/examples/api/graphics_3d/hello.raw
diff --git a/native_client_sdk/src/examples/hello_world_gles/hello_world.cc b/native_client_sdk/src/examples/api/graphics_3d/hello_world.cc
index fc6e3df..fc6e3df 100644
--- a/native_client_sdk/src/examples/hello_world_gles/hello_world.cc
+++ b/native_client_sdk/src/examples/api/graphics_3d/hello_world.cc
diff --git a/native_client_sdk/src/examples/hello_world_gles/index.html b/native_client_sdk/src/examples/api/graphics_3d/index.html
index 665ce4e..665ce4e 100644
--- a/native_client_sdk/src/examples/hello_world_gles/index.html
+++ b/native_client_sdk/src/examples/api/graphics_3d/index.html
diff --git a/native_client_sdk/src/examples/hello_world_gles/matrix.cc b/native_client_sdk/src/examples/api/graphics_3d/matrix.cc
index ea6010b..ea6010b 100644
--- a/native_client_sdk/src/examples/hello_world_gles/matrix.cc
+++ b/native_client_sdk/src/examples/api/graphics_3d/matrix.cc
diff --git a/native_client_sdk/src/examples/hello_world_gles/matrix.h b/native_client_sdk/src/examples/api/graphics_3d/matrix.h
index 7db7985..7db7985 100644
--- a/native_client_sdk/src/examples/hello_world_gles/matrix.h
+++ b/native_client_sdk/src/examples/api/graphics_3d/matrix.h
diff --git a/native_client_sdk/src/examples/hello_world_gles/vertex_shader_es2.vert b/native_client_sdk/src/examples/api/graphics_3d/vertex_shader_es2.vert
index da616cb..da616cb 100644
--- a/native_client_sdk/src/examples/hello_world_gles/vertex_shader_es2.vert
+++ b/native_client_sdk/src/examples/api/graphics_3d/vertex_shader_es2.vert
diff --git a/native_client_sdk/src/examples/input_events/custom_events.cc b/native_client_sdk/src/examples/api/input_event/custom_events.cc
index fe304c5..fe304c5 100644
--- a/native_client_sdk/src/examples/input_events/custom_events.cc
+++ b/native_client_sdk/src/examples/api/input_event/custom_events.cc
diff --git a/native_client_sdk/src/examples/input_events/custom_events.h b/native_client_sdk/src/examples/api/input_event/custom_events.h
index 2f7b10c..2f7b10c 100644
--- a/native_client_sdk/src/examples/input_events/custom_events.h
+++ b/native_client_sdk/src/examples/api/input_event/custom_events.h
diff --git a/native_client_sdk/src/examples/input_events/example.dsc b/native_client_sdk/src/examples/api/input_event/example.dsc
index 014815c..4c88c56 100644
--- a/native_client_sdk/src/examples/input_events/example.dsc
+++ b/native_client_sdk/src/examples/api/input_event/example.dsc
@@ -2,7 +2,7 @@
   'TOOLS': ['newlib', 'glibc', 'pnacl', 'linux', 'win'],
   'TARGETS': [
     {
-      'NAME' : 'input_events',
+      'NAME' : 'input_event',
       'TYPE' : 'main',
       'SOURCES' : [
         'custom_events.cc',
@@ -16,8 +16,8 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
-  'NAME': 'input_events',
+  'DEST': 'examples/api',
+  'NAME': 'input_event',
   'TITLE': 'Input Events',
   'GROUP': 'API',
 }
diff --git a/native_client_sdk/src/examples/input_events/example.js b/native_client_sdk/src/examples/api/input_event/example.js
index 003e843..003e843 100644
--- a/native_client_sdk/src/examples/input_events/example.js
+++ b/native_client_sdk/src/examples/api/input_event/example.js
diff --git a/native_client_sdk/src/examples/input_events/index.html b/native_client_sdk/src/examples/api/input_event/index.html
index 2e97b98..2e97b98 100644
--- a/native_client_sdk/src/examples/input_events/index.html
+++ b/native_client_sdk/src/examples/api/input_event/index.html
diff --git a/native_client_sdk/src/examples/input_events/input_events.cc b/native_client_sdk/src/examples/api/input_event/input_events.cc
index a216f0a..a216f0a 100644
--- a/native_client_sdk/src/examples/input_events/input_events.cc
+++ b/native_client_sdk/src/examples/api/input_event/input_events.cc
diff --git a/native_client_sdk/src/examples/input_events/shared_queue.h b/native_client_sdk/src/examples/api/input_event/shared_queue.h
index 48b70b3..48b70b3 100644
--- a/native_client_sdk/src/examples/input_events/shared_queue.h
+++ b/native_client_sdk/src/examples/api/input_event/shared_queue.h
diff --git a/native_client_sdk/src/examples/load_progress/check_browser.js b/native_client_sdk/src/examples/api/mouse_lock/check_browser.js
index 0c54ba4..0c54ba4 100644
--- a/native_client_sdk/src/examples/load_progress/check_browser.js
+++ b/native_client_sdk/src/examples/api/mouse_lock/check_browser.js
diff --git a/native_client_sdk/src/examples/mouselock/example.dsc b/native_client_sdk/src/examples/api/mouse_lock/example.dsc
index 478fe48..3200475 100644
--- a/native_client_sdk/src/examples/mouselock/example.dsc
+++ b/native_client_sdk/src/examples/api/mouse_lock/example.dsc
@@ -8,9 +8,9 @@
       'LIBS': ['ppapi_cpp', 'ppapi', 'pthread']
     }
   ],
-  'DEST': 'examples',
-  'NAME': 'mouselock',
+  'DEST': 'examples/api',
+  'NAME': 'mouse_lock',
   'TITLE': 'Mouse Lock',
-  'GROUP': 'Concepts'
+  'GROUP': 'API'
 }
 
diff --git a/native_client_sdk/src/examples/mouselock/index.html b/native_client_sdk/src/examples/api/mouse_lock/index.html
index c50377b..c50377b 100644
--- a/native_client_sdk/src/examples/mouselock/index.html
+++ b/native_client_sdk/src/examples/api/mouse_lock/index.html
diff --git a/native_client_sdk/src/examples/mouselock/mouselock.cc b/native_client_sdk/src/examples/api/mouse_lock/mouselock.cc
index 9aefac1..9aefac1 100644
--- a/native_client_sdk/src/examples/mouselock/mouselock.cc
+++ b/native_client_sdk/src/examples/api/mouse_lock/mouselock.cc
diff --git a/native_client_sdk/src/examples/mouselock/mouselock.h b/native_client_sdk/src/examples/api/mouse_lock/mouselock.h
index 2844a03..2844a03 100644
--- a/native_client_sdk/src/examples/mouselock/mouselock.h
+++ b/native_client_sdk/src/examples/api/mouse_lock/mouselock.h
diff --git a/native_client_sdk/src/examples/geturl/example.dsc b/native_client_sdk/src/examples/api/url_loader/example.dsc
index 4f5b1c8..a5c4503da 100644
--- a/native_client_sdk/src/examples/geturl/example.dsc
+++ b/native_client_sdk/src/examples/api/url_loader/example.dsc
@@ -12,9 +12,9 @@
     'example.js',
     'geturl_success.html',
   ],
-  'DEST': 'examples',
-  'NAME': 'geturl',
-  'TITLE': 'Get URL',
+  'DEST': 'examples/api',
+  'NAME': 'url_loader',
+  'TITLE': 'URL Loader',
   'GROUP': 'API'
 }
 
diff --git a/native_client_sdk/src/examples/geturl/example.js b/native_client_sdk/src/examples/api/url_loader/example.js
index 2ebdfeb..2ebdfeb 100644
--- a/native_client_sdk/src/examples/geturl/example.js
+++ b/native_client_sdk/src/examples/api/url_loader/example.js
diff --git a/native_client_sdk/src/examples/geturl/geturl.cc b/native_client_sdk/src/examples/api/url_loader/geturl.cc
index fa3838d..fa3838d 100644
--- a/native_client_sdk/src/examples/geturl/geturl.cc
+++ b/native_client_sdk/src/examples/api/url_loader/geturl.cc
diff --git a/native_client_sdk/src/examples/geturl/geturl_handler.cc b/native_client_sdk/src/examples/api/url_loader/geturl_handler.cc
index 2000854..2000854 100644
--- a/native_client_sdk/src/examples/geturl/geturl_handler.cc
+++ b/native_client_sdk/src/examples/api/url_loader/geturl_handler.cc
diff --git a/native_client_sdk/src/examples/geturl/geturl_handler.h b/native_client_sdk/src/examples/api/url_loader/geturl_handler.h
index b0ca684..b0ca684 100644
--- a/native_client_sdk/src/examples/geturl/geturl_handler.h
+++ b/native_client_sdk/src/examples/api/url_loader/geturl_handler.h
diff --git a/native_client_sdk/src/examples/geturl/geturl_success.html b/native_client_sdk/src/examples/api/url_loader/geturl_success.html
index f5a3b8b..f5a3b8b 100644
--- a/native_client_sdk/src/examples/geturl/geturl_success.html
+++ b/native_client_sdk/src/examples/api/url_loader/geturl_success.html
diff --git a/native_client_sdk/src/examples/geturl/index.html b/native_client_sdk/src/examples/api/url_loader/index.html
index cdaa241..cdaa241 100644
--- a/native_client_sdk/src/examples/geturl/index.html
+++ b/native_client_sdk/src/examples/api/url_loader/index.html
diff --git a/native_client_sdk/src/examples/file_histogram/example.dsc b/native_client_sdk/src/examples/api/var_array_buffer/example.dsc
index af8dbac..43da815 100644
--- a/native_client_sdk/src/examples/file_histogram/example.dsc
+++ b/native_client_sdk/src/examples/api/var_array_buffer/example.dsc
@@ -11,9 +11,9 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
-  'NAME': 'file_histogram',
-  'TITLE': 'File Histogram.',
+  'DEST': 'examples/api',
+  'NAME': 'var_array_buffer',
+  'TITLE': 'Var Array Buffer',
   'GROUP': 'API'
 }
 
diff --git a/native_client_sdk/src/examples/file_histogram/example.js b/native_client_sdk/src/examples/api/var_array_buffer/example.js
index 816a064..816a064 100644
--- a/native_client_sdk/src/examples/file_histogram/example.js
+++ b/native_client_sdk/src/examples/api/var_array_buffer/example.js
diff --git a/native_client_sdk/src/examples/file_histogram/file_histogram.cc b/native_client_sdk/src/examples/api/var_array_buffer/file_histogram.cc
index ea8c8e0a..ea8c8e0a 100644
--- a/native_client_sdk/src/examples/file_histogram/file_histogram.cc
+++ b/native_client_sdk/src/examples/api/var_array_buffer/file_histogram.cc
diff --git a/native_client_sdk/src/examples/file_histogram/index.html b/native_client_sdk/src/examples/api/var_array_buffer/index.html
index 53858d9..53858d9 100644
--- a/native_client_sdk/src/examples/file_histogram/index.html
+++ b/native_client_sdk/src/examples/api/var_array_buffer/index.html
diff --git a/native_client_sdk/src/examples/websocket/example.dsc b/native_client_sdk/src/examples/api/websocket/example.dsc
index e5c7e21..c3d02fc 100644
--- a/native_client_sdk/src/examples/websocket/example.dsc
+++ b/native_client_sdk/src/examples/api/websocket/example.dsc
@@ -11,7 +11,7 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/api',
   'NAME': 'websocket',
   'TITLE': 'Websocket',
   'GROUP': 'API'
diff --git a/native_client_sdk/src/examples/websocket/example.js b/native_client_sdk/src/examples/api/websocket/example.js
index 561d044..561d044 100644
--- a/native_client_sdk/src/examples/websocket/example.js
+++ b/native_client_sdk/src/examples/api/websocket/example.js
diff --git a/native_client_sdk/src/examples/websocket/index.html b/native_client_sdk/src/examples/api/websocket/index.html
index f077fcd..f077fcd 100644
--- a/native_client_sdk/src/examples/websocket/index.html
+++ b/native_client_sdk/src/examples/api/websocket/index.html
diff --git a/native_client_sdk/src/examples/websocket/websocket.cc b/native_client_sdk/src/examples/api/websocket/websocket.cc
index fd42934..fd42934 100644
--- a/native_client_sdk/src/examples/websocket/websocket.cc
+++ b/native_client_sdk/src/examples/api/websocket/websocket.cc
diff --git a/native_client_sdk/src/examples/hello_nacl_io/example.dsc b/native_client_sdk/src/examples/demo/nacl_io/example.dsc
index 8a4bc0b..f390187 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/example.dsc
+++ b/native_client_sdk/src/examples/demo/nacl_io/example.dsc
@@ -2,7 +2,7 @@
   'TOOLS': ['newlib', 'glibc', 'pnacl', 'win'],
   'TARGETS': [
     {
-      'NAME' : 'hello_nacl_io',
+      'NAME' : 'nacl_io',
       'TYPE' : 'main',
       'SOURCES' : [
         'handlers.c',
@@ -18,8 +18,8 @@
   'DATA': [
     'example.js'
   ],
-  'DEST': 'examples',
-  'NAME': 'hello_nacl_io',
-  'TITLE': 'Hello, Nacl IO!',
-  'GROUP': 'Concepts'
+  'DEST': 'examples/demo',
+  'NAME': 'nacl_io',
+  'TITLE': 'Nacl IO Demo',
+  'GROUP': 'Demo'
 }
diff --git a/native_client_sdk/src/examples/hello_nacl_io/example.js b/native_client_sdk/src/examples/demo/nacl_io/example.js
index e764c21..e764c21 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/example.js
+++ b/native_client_sdk/src/examples/demo/nacl_io/example.js
diff --git a/native_client_sdk/src/examples/hello_nacl_io/handlers.c b/native_client_sdk/src/examples/demo/nacl_io/handlers.c
index 062a41f..062a41f 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/handlers.c
+++ b/native_client_sdk/src/examples/demo/nacl_io/handlers.c
diff --git a/native_client_sdk/src/examples/hello_nacl_io/handlers.h b/native_client_sdk/src/examples/demo/nacl_io/handlers.h
index 9510dc7..9510dc7 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/handlers.h
+++ b/native_client_sdk/src/examples/demo/nacl_io/handlers.h
diff --git a/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.c b/native_client_sdk/src/examples/demo/nacl_io/hello_nacl_io.c
index fde9c1e..fde9c1e 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.c
+++ b/native_client_sdk/src/examples/demo/nacl_io/hello_nacl_io.c
diff --git a/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.h b/native_client_sdk/src/examples/demo/nacl_io/hello_nacl_io.h
index 82bf056..82bf056 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/hello_nacl_io.h
+++ b/native_client_sdk/src/examples/demo/nacl_io/hello_nacl_io.h
diff --git a/native_client_sdk/src/examples/hello_nacl_io/index.html b/native_client_sdk/src/examples/demo/nacl_io/index.html
index baed38d..baed38d 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/index.html
+++ b/native_client_sdk/src/examples/demo/nacl_io/index.html
diff --git a/native_client_sdk/src/examples/hello_nacl_io/queue.c b/native_client_sdk/src/examples/demo/nacl_io/queue.c
index bd0c438..bd0c438 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/queue.c
+++ b/native_client_sdk/src/examples/demo/nacl_io/queue.c
diff --git a/native_client_sdk/src/examples/hello_nacl_io/queue.h b/native_client_sdk/src/examples/demo/nacl_io/queue.h
index f622ee5..f622ee5 100644
--- a/native_client_sdk/src/examples/hello_nacl_io/queue.h
+++ b/native_client_sdk/src/examples/demo/nacl_io/queue.h
diff --git a/native_client_sdk/src/examples/pi_generator/example.dsc b/native_client_sdk/src/examples/demo/pi_generator/example.dsc
index 3bdba19..6a4b9a1 100644
--- a/native_client_sdk/src/examples/pi_generator/example.dsc
+++ b/native_client_sdk/src/examples/demo/pi_generator/example.dsc
@@ -15,8 +15,8 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/demo',
   'NAME': 'pi_generator',
   'TITLE': 'Monte Carlo Estimate for Pi',
-  'GROUP': 'Concepts'
+  'GROUP': 'Demo'
 }
diff --git a/native_client_sdk/src/examples/pi_generator/example.js b/native_client_sdk/src/examples/demo/pi_generator/example.js
index dfc7746..dfc7746 100644
--- a/native_client_sdk/src/examples/pi_generator/example.js
+++ b/native_client_sdk/src/examples/demo/pi_generator/example.js
diff --git a/native_client_sdk/src/examples/pi_generator/index.html b/native_client_sdk/src/examples/demo/pi_generator/index.html
index 7dc1df2..7dc1df2 100644
--- a/native_client_sdk/src/examples/pi_generator/index.html
+++ b/native_client_sdk/src/examples/demo/pi_generator/index.html
diff --git a/native_client_sdk/src/examples/pi_generator/pi_generator.cc b/native_client_sdk/src/examples/demo/pi_generator/pi_generator.cc
index 1106343f..1106343f 100644
--- a/native_client_sdk/src/examples/pi_generator/pi_generator.cc
+++ b/native_client_sdk/src/examples/demo/pi_generator/pi_generator.cc
diff --git a/native_client_sdk/src/examples/pi_generator/pi_generator.h b/native_client_sdk/src/examples/demo/pi_generator/pi_generator.h
index 50f2dbd..50f2dbd 100644
--- a/native_client_sdk/src/examples/pi_generator/pi_generator.h
+++ b/native_client_sdk/src/examples/demo/pi_generator/pi_generator.h
diff --git a/native_client_sdk/src/examples/pi_generator/pi_generator_module.cc b/native_client_sdk/src/examples/demo/pi_generator/pi_generator_module.cc
index 2434a09..2434a09 100644
--- a/native_client_sdk/src/examples/pi_generator/pi_generator_module.cc
+++ b/native_client_sdk/src/examples/demo/pi_generator/pi_generator_module.cc
diff --git a/native_client_sdk/src/examples/hello_world/example.dsc b/native_client_sdk/src/examples/getting_started/hello_world/example.dsc
index 850bf66..a02f542 100644
--- a/native_client_sdk/src/examples/hello_world/example.dsc
+++ b/native_client_sdk/src/examples/getting_started/hello_world/example.dsc
@@ -11,8 +11,8 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/getting_started',
   'NAME': 'hello_world',
-  'TITLE': 'Hello World.',
-  'GROUP': 'Tools'
+  'TITLE': 'Hello World',
+  'GROUP': 'Getting Started'
 }
diff --git a/native_client_sdk/src/examples/hello_world/example.js b/native_client_sdk/src/examples/getting_started/hello_world/example.js
index 7f26921..7f26921 100644
--- a/native_client_sdk/src/examples/hello_world/example.js
+++ b/native_client_sdk/src/examples/getting_started/hello_world/example.js
diff --git a/native_client_sdk/src/examples/hello_world/hello_world.c b/native_client_sdk/src/examples/getting_started/hello_world/hello_world.c
index 8c01be0..8c01be0 100644
--- a/native_client_sdk/src/examples/hello_world/hello_world.c
+++ b/native_client_sdk/src/examples/getting_started/hello_world/hello_world.c
diff --git a/native_client_sdk/src/examples/hello_world/index.html b/native_client_sdk/src/examples/getting_started/hello_world/index.html
index 4ed2986..4ed2986 100644
--- a/native_client_sdk/src/examples/hello_world/index.html
+++ b/native_client_sdk/src/examples/getting_started/hello_world/index.html
diff --git a/native_client_sdk/src/examples/hello_world_stdio/example.dsc b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc
index d0737bd..2bb125a 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/example.dsc
+++ b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.dsc
@@ -11,9 +11,9 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
-  'NAME': 'hello_world_stdio',
-  'TITLE': 'Hello World STDIO.',
-  'GROUP': 'Tools'
+  'DEST': 'examples/getting_started',
+  'NAME': 'hello_world_ppapi_main',
+  'TITLE': 'Hello World (libppapi_main)',
+  'GROUP': 'Getting Started'
 }
 
diff --git a/native_client_sdk/src/examples/hello_world_stdio/example.js b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.js
index 7f26921..7f26921 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/example.js
+++ b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/example.js
diff --git a/native_client_sdk/src/examples/hello_world_stdio/hello_world.c b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/hello_world.c
index e553da5..e553da5 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/hello_world.c
+++ b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/hello_world.c
diff --git a/native_client_sdk/src/examples/hello_world_stdio/index.html b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/index.html
index c6a4aa1..c6a4aa1 100644
--- a/native_client_sdk/src/examples/hello_world_stdio/index.html
+++ b/native_client_sdk/src/examples/getting_started/hello_world_ppapi_main/index.html
diff --git a/native_client_sdk/src/examples/hello_world_instance3d/example.dsc b/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
index 2c2d881..243af7c 100644
--- a/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
+++ b/native_client_sdk/src/examples/hello_world_instance3d/example.dsc
@@ -1,4 +1,5 @@
 {
+  'DISABLE': True,
   'TOOLS': ['newlib', 'glibc', 'pnacl'],
   'TARGETS': [
     {
diff --git a/native_client_sdk/src/examples/hello_world_interactive/example.dsc b/native_client_sdk/src/examples/hello_world_interactive/example.dsc
index c113eab..da6e554 100644
--- a/native_client_sdk/src/examples/hello_world_interactive/example.dsc
+++ b/native_client_sdk/src/examples/hello_world_interactive/example.dsc
@@ -1,4 +1,5 @@
 {
+  'DISABLE': True,
   'TOOLS': ['newlib', 'glibc', 'pnacl', 'win', 'linux'],
   'TARGETS': [
     {
diff --git a/native_client_sdk/src/examples/resources/index.html.template b/native_client_sdk/src/examples/resources/index.html.template
index cc192e3..207afdb 100644
--- a/native_client_sdk/src/examples/resources/index.html.template
+++ b/native_client_sdk/src/examples/resources/index.html.template
@@ -20,10 +20,12 @@
       <div class="left-border"></div>
       <div class="nav-wrapper">
         <div class="nav">
-[[for section in 'Tools', 'API', 'Concepts':]]
+[[for section in section_map:]]
           <div class="nav-group-header">{{section}}</div>
 [[  for desc in section_map[section]:]]
-          <div class="nav-item" data-href="{{desc['NAME']}}/index.html">
+[[    index_path = (desc['DEST'] + '/' + desc['NAME'])]]
+[[    index_path = '/'.join(index_path.split('/')[1:])]]
+          <div class="nav-item" data-href="{{index_path}}/index.html">
             <div class="nav-title">
               {{desc['TITLE']}}
             </div>
diff --git a/native_client_sdk/src/examples/debugging/example.dsc b/native_client_sdk/src/examples/tutorial/debugging/example.dsc
index 376b6e0..0bf35ad 100644
--- a/native_client_sdk/src/examples/debugging/example.dsc
+++ b/native_client_sdk/src/examples/tutorial/debugging/example.dsc
@@ -2,8 +2,8 @@
   'TOOLS': ['newlib'],
   'SEARCH': [
     '.',
-    '..',
-    '../../tools',
+    '../..',
+    '../../../tools',
   ],
   'TARGETS': [
     {
@@ -34,9 +34,9 @@ CHROME_ENV+=NACL_UNTRUSTED_EXCEPTION_HANDLING=1
     'example.js',
     'handler.py'
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/tutorial',
   'NAME': 'debugging',
   'TITLE': 'Debugging',
-  'GROUP': 'Concepts'
+  'GROUP': 'Tutorial'
 }
 
diff --git a/native_client_sdk/src/examples/debugging/example.js b/native_client_sdk/src/examples/tutorial/debugging/example.js
index 7fdc4ba..7fdc4ba 100644
--- a/native_client_sdk/src/examples/debugging/example.js
+++ b/native_client_sdk/src/examples/tutorial/debugging/example.js
diff --git a/native_client_sdk/src/examples/debugging/handler.py b/native_client_sdk/src/examples/tutorial/debugging/handler.py
index 4593223..4593223 100644
--- a/native_client_sdk/src/examples/debugging/handler.py
+++ b/native_client_sdk/src/examples/tutorial/debugging/handler.py
diff --git a/native_client_sdk/src/examples/debugging/hello_world.c b/native_client_sdk/src/examples/tutorial/debugging/hello_world.c
index a5dd333..a5dd333 100644
--- a/native_client_sdk/src/examples/debugging/hello_world.c
+++ b/native_client_sdk/src/examples/tutorial/debugging/hello_world.c
diff --git a/native_client_sdk/src/examples/debugging/index.html b/native_client_sdk/src/examples/tutorial/debugging/index.html
index d5d518b..d5d518b 100644
--- a/native_client_sdk/src/examples/debugging/index.html
+++ b/native_client_sdk/src/examples/tutorial/debugging/index.html
diff --git a/native_client_sdk/src/examples/debugging/string_stream.c b/native_client_sdk/src/examples/tutorial/debugging/string_stream.c
index 08783cc..08783cc 100644
--- a/native_client_sdk/src/examples/debugging/string_stream.c
+++ b/native_client_sdk/src/examples/tutorial/debugging/string_stream.c
diff --git a/native_client_sdk/src/examples/debugging/string_stream.h b/native_client_sdk/src/examples/tutorial/debugging/string_stream.h
index 9bb67e0..9bb67e0 100644
--- a/native_client_sdk/src/examples/debugging/string_stream.h
+++ b/native_client_sdk/src/examples/tutorial/debugging/string_stream.h
diff --git a/native_client_sdk/src/examples/debugging/untrusted_crash_dump.c b/native_client_sdk/src/examples/tutorial/debugging/untrusted_crash_dump.c
index 959ad9e..959ad9e 100644
--- a/native_client_sdk/src/examples/debugging/untrusted_crash_dump.c
+++ b/native_client_sdk/src/examples/tutorial/debugging/untrusted_crash_dump.c
diff --git a/native_client_sdk/src/examples/debugging/untrusted_crash_dump.h b/native_client_sdk/src/examples/tutorial/debugging/untrusted_crash_dump.h
index 8cd973a..8cd973a 100644
--- a/native_client_sdk/src/examples/debugging/untrusted_crash_dump.h
+++ b/native_client_sdk/src/examples/tutorial/debugging/untrusted_crash_dump.h
diff --git a/native_client_sdk/src/examples/dlopen/dlopen.cc b/native_client_sdk/src/examples/tutorial/dlopen/dlopen.cc
index 0a4e68b..0a4e68b 100644
--- a/native_client_sdk/src/examples/dlopen/dlopen.cc
+++ b/native_client_sdk/src/examples/tutorial/dlopen/dlopen.cc
diff --git a/native_client_sdk/src/examples/dlopen/eightball.cc b/native_client_sdk/src/examples/tutorial/dlopen/eightball.cc
index 531f8a61..531f8a61 100644
--- a/native_client_sdk/src/examples/dlopen/eightball.cc
+++ b/native_client_sdk/src/examples/tutorial/dlopen/eightball.cc
diff --git a/native_client_sdk/src/examples/dlopen/eightball.h b/native_client_sdk/src/examples/tutorial/dlopen/eightball.h
index df3d997..df3d997 100644
--- a/native_client_sdk/src/examples/dlopen/eightball.h
+++ b/native_client_sdk/src/examples/tutorial/dlopen/eightball.h
diff --git a/native_client_sdk/src/examples/dlopen/example.dsc b/native_client_sdk/src/examples/tutorial/dlopen/example.dsc
index a68c0ff..5282218 100644
--- a/native_client_sdk/src/examples/dlopen/example.dsc
+++ b/native_client_sdk/src/examples/tutorial/dlopen/example.dsc
@@ -27,9 +27,9 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/tutorial',
   'NAME': 'dlopen',
   'TITLE': 'Dynamic Library Open',
-  'GROUP': 'Concepts'
+  'GROUP': 'Tutorial'
 }
 
diff --git a/native_client_sdk/src/examples/dlopen/example.js b/native_client_sdk/src/examples/tutorial/dlopen/example.js
index 5e1b1e3..5e1b1e3 100644
--- a/native_client_sdk/src/examples/dlopen/example.js
+++ b/native_client_sdk/src/examples/tutorial/dlopen/example.js
diff --git a/native_client_sdk/src/examples/dlopen/index.html b/native_client_sdk/src/examples/tutorial/dlopen/index.html
index 0e535b4..0e535b4 100644
--- a/native_client_sdk/src/examples/dlopen/index.html
+++ b/native_client_sdk/src/examples/tutorial/dlopen/index.html
diff --git a/native_client_sdk/src/examples/dlopen/reverse.cc b/native_client_sdk/src/examples/tutorial/dlopen/reverse.cc
index 94eaaef..94eaaef 100644
--- a/native_client_sdk/src/examples/dlopen/reverse.cc
+++ b/native_client_sdk/src/examples/tutorial/dlopen/reverse.cc
diff --git a/native_client_sdk/src/examples/dlopen/reverse.h b/native_client_sdk/src/examples/tutorial/dlopen/reverse.h
index f0414ab..f0414ab 100644
--- a/native_client_sdk/src/examples/dlopen/reverse.h
+++ b/native_client_sdk/src/examples/tutorial/dlopen/reverse.h
diff --git a/native_client_sdk/src/examples/mouselock/check_browser.js b/native_client_sdk/src/examples/tutorial/load_progress/check_browser.js
index 0c54ba4..0c54ba4 100644
--- a/native_client_sdk/src/examples/mouselock/check_browser.js
+++ b/native_client_sdk/src/examples/tutorial/load_progress/check_browser.js
diff --git a/native_client_sdk/src/examples/load_progress/example.dsc b/native_client_sdk/src/examples/tutorial/load_progress/example.dsc
index 8d5f68b..3f8397f 100644
--- a/native_client_sdk/src/examples/load_progress/example.dsc
+++ b/native_client_sdk/src/examples/tutorial/load_progress/example.dsc
@@ -11,9 +11,9 @@
   'DATA': [
     'example.js',
   ],
-  'DEST': 'examples',
+  'DEST': 'examples/tutorial',
   'NAME': 'load_progress',
   'TITLE': 'Load Progress',
-  'GROUP': 'Concepts'
+  'GROUP': 'Tutorial'
 }
 
diff --git a/native_client_sdk/src/examples/load_progress/example.js b/native_client_sdk/src/examples/tutorial/load_progress/example.js
index 8e7c00d..8e7c00d 100644
--- a/native_client_sdk/src/examples/load_progress/example.js
+++ b/native_client_sdk/src/examples/tutorial/load_progress/example.js
diff --git a/native_client_sdk/src/examples/load_progress/index.html b/native_client_sdk/src/examples/tutorial/load_progress/index.html
index 108fc05..108fc05 100644
--- a/native_client_sdk/src/examples/load_progress/index.html
+++ b/native_client_sdk/src/examples/tutorial/load_progress/index.html
diff --git a/native_client_sdk/src/examples/load_progress/load_progress.cc b/native_client_sdk/src/examples/tutorial/load_progress/load_progress.cc
index 0610c5e..0610c5e 100644
--- a/native_client_sdk/src/examples/load_progress/load_progress.cc
+++ b/native_client_sdk/src/examples/tutorial/load_progress/load_progress.cc