diff --git a/tools/sandbox/embed_iframe.html b/sandbox/embed_iframe.html
similarity index 100%
rename from tools/sandbox/embed_iframe.html
rename to sandbox/embed_iframe.html
diff --git a/tools/sandbox/embed_iframe_scroll.html b/sandbox/embed_iframe_scroll.html
similarity index 100%
rename from tools/sandbox/embed_iframe_scroll.html
rename to sandbox/embed_iframe_scroll.html
diff --git a/tools/sandbox/embed_selfhost_fullscreen.html b/sandbox/embed_selfhost_fullscreen.html
similarity index 100%
rename from tools/sandbox/embed_selfhost_fullscreen.html
rename to sandbox/embed_selfhost_fullscreen.html
diff --git a/tools/sandbox/embed_selfhost_multiple.html b/sandbox/embed_selfhost_multiple.html
similarity index 100%
rename from tools/sandbox/embed_selfhost_multiple.html
rename to sandbox/embed_selfhost_multiple.html
diff --git a/tools/sandbox/embed_selfhost_single.html b/sandbox/embed_selfhost_single.html
similarity index 100%
rename from tools/sandbox/embed_selfhost_single.html
rename to sandbox/embed_selfhost_single.html
diff --git a/tools/sandbox/embed_selfhost_single_scroll.html b/sandbox/embed_selfhost_single_scroll.html
similarity index 100%
rename from tools/sandbox/embed_selfhost_single_scroll.html
rename to sandbox/embed_selfhost_single_scroll.html
diff --git a/tools/sandbox/generate_test_obj.py b/sandbox/generate_test_obj.py
similarity index 100%
rename from tools/sandbox/generate_test_obj.py
rename to sandbox/generate_test_obj.py
diff --git a/tools/sandbox/three_minimal.html b/sandbox/three_minimal.html
similarity index 100%
rename from tools/sandbox/three_minimal.html
rename to sandbox/three_minimal.html
diff --git a/tools/update_includes.py b/tools/update_includes.py
index 166c793..307c7f4 100644
--- a/tools/update_includes.py
+++ b/tools/update_includes.py
@@ -34,18 +34,16 @@ def Main (argv):
 		replacer.ReplaceTokenFileLinks ('<!-- website start -->', '<!-- website end -->', websiteFiles, None)
 		replacer.WriteToFile (htmlFilePath)
 
-	sandboxFiles = [
-		os.path.join ('tools', 'sandbox', 'embed_selfhost_single.html'),
-		os.path.join ('tools', 'sandbox', 'embed_selfhost_multiple.html'),
-		os.path.join ('tools', 'sandbox', 'embed_selfhost_fullscreen.html')
-	]
-	for htmlFileName in sandboxFiles:
-		htmlFilePath = os.path.join (rootDir, htmlFileName)
+	sandboxFolder = os.path.join (rootDir, 'sandbox')
+	for htmlFileName in sandboxFolder:
+		if os.path.splitext (htmlFileName)[1] != '.html':
+			continue
+		htmlFilePath = os.path.join (sandboxFolder, htmlFileName)
 		replacer = Tools.TokenReplacer (htmlFilePath, True)
 		importerFiles = Tools.CreateFileList (config['importer_files'], 'source/', '../../source/')
 		replacer.ReplaceTokenFileLinks ('<!-- importer start -->', '<!-- importer end -->', importerFiles, None)
 		replacer.WriteToFile (htmlFilePath)
-	
+		
 	return 0
 
 sys.exit (Main (sys.argv))