diff --git a/apisample-error-worker.js b/examples/apisample-error-worker.js
similarity index 56%
rename from apisample-error-worker.js
rename to examples/apisample-error-worker.js
index c0285c37d5adfc..9bfe0a6f343d5e 100644
--- a/apisample-error-worker.js
+++ b/examples/apisample-error-worker.js
@@ -1,3 +1,3 @@
-importScripts("testharness.js");
+importScripts("../testharness.js");
 
 throw new Error("This failure is expected.");
diff --git a/apisample-worker.js b/examples/apisample-worker.js
similarity index 95%
rename from apisample-worker.js
rename to examples/apisample-worker.js
index 6fd1ceb5376bec..b1d086314cc981 100644
--- a/apisample-worker.js
+++ b/examples/apisample-worker.js
@@ -1,4 +1,4 @@
-importScripts("testharness.js");
+importScripts("../testharness.js");
 
 test(
     function(test) {
diff --git a/apisample.htm b/examples/apisample.htm
similarity index 95%
rename from apisample.htm
rename to examples/apisample.htm
index 6eb3279f5f6dab..504a343acdbbc8 100644
--- a/apisample.htm
+++ b/examples/apisample.htm
@@ -7,8 +7,8 @@
 <body onload="load_test_attr.done()">
 <h1>Sample HTML5 API Tests</h1>
 <div id="log"></div>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
     setup_run = false;
     setup(function() {
diff --git a/apisample10.html b/examples/apisample10.html
similarity index 96%
rename from apisample10.html
rename to examples/apisample10.html
index a1a7070fbfd386..69810fe16cf6bf 100644
--- a/apisample10.html
+++ b/examples/apisample10.html
@@ -7,8 +7,8 @@
 <h1>Async Tests and Promises</h1>
 <p>This test assumes ECMAScript 6 Promise support. Some failures are expected.</p>
 <div id="log"></div>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 
 test(function() {
diff --git a/apisample11.html b/examples/apisample11.html
similarity index 97%
rename from apisample11.html
rename to examples/apisample11.html
index d33edd79db9041..32e8984c3f1640 100644
--- a/apisample11.html
+++ b/examples/apisample11.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>Example with iframe that notifies containing document via callbacks</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 </head>
 <body onload="start_test_in_iframe()">
 <h1>Callbacks From Tests Running In An IFRAME</h1>
diff --git a/apisample12.html b/examples/apisample12.html
similarity index 95%
rename from apisample12.html
rename to examples/apisample12.html
index e16ebcf44e8a2c..785d57b2ba5a02 100644
--- a/apisample12.html
+++ b/examples/apisample12.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>Example with iframe that notifies containing document via cross document messaging</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 </head>
 <body>
 <h1>Notifications From Tests Running In An IFRAME</h1>
diff --git a/apisample13.html b/examples/apisample13.html
similarity index 97%
rename from apisample13.html
rename to examples/apisample13.html
index cddd90fe508892..f6cf0eec83186e 100644
--- a/apisample13.html
+++ b/examples/apisample13.html
@@ -8,8 +8,8 @@ <h1>Promise Tests</h1>
 <p>This test demonstrates the use of <tt>promise_test</tt>. Assumes ECMAScript 6
 Promise support. Some failures are expected.</p>
 <div id="log"></div>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 test(
     function() {
diff --git a/apisample14.html b/examples/apisample14.html
similarity index 88%
rename from apisample14.html
rename to examples/apisample14.html
index 3d809f97e7f7a7..89803f0bb6a37a 100644
--- a/apisample14.html
+++ b/examples/apisample14.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>Dedicated Worker Tests</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 </head>
 <body>
 <h1>Dedicated Web Worker Tests</h1>
diff --git a/apisample15.html b/examples/apisample15.html
similarity index 89%
rename from apisample15.html
rename to examples/apisample15.html
index 0785797d403339..631d1922bac88c 100644
--- a/apisample15.html
+++ b/examples/apisample15.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>Example with a shared worker</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 </head>
 <body>
 <h1>Shared Web Worker Tests</h1>
diff --git a/apisample16.html b/examples/apisample16.html
similarity index 95%
rename from apisample16.html
rename to examples/apisample16.html
index 00be84c7530f79..d859d94bf6cbc0 100644
--- a/apisample16.html
+++ b/examples/apisample16.html
@@ -2,8 +2,8 @@
 <html>
 <head>
 <title>Example with a service worker</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 </head>
 <body>
 <h1>Service Worker Tests</h1>
diff --git a/apisample2.htm b/examples/apisample2.htm
similarity index 82%
rename from apisample2.htm
rename to examples/apisample2.htm
index 49eed8d9de0bc1..4a4c16b4dfabc4 100644
--- a/apisample2.htm
+++ b/examples/apisample2.htm
@@ -7,8 +7,8 @@
 <h1>Sample HTML5 API Tests</h1>
 <p>There should be two results</p>
 <div id="log"></div>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 setup({explicit_done:true})
 test(function() {assert_true(true)}, "Test defined before onload");
diff --git a/apisample3.htm b/examples/apisample3.htm
similarity index 88%
rename from apisample3.htm
rename to examples/apisample3.htm
index 80a892b9dd744a..4dbbf9a871bd42 100644
--- a/apisample3.htm
+++ b/examples/apisample3.htm
@@ -3,7 +3,7 @@
 <head>
 <title>Sample HTML5 API Tests</title>
 </head>
-<script src="testharness.js"></script>
+<script src="../testharness.js"></script>
 
 <body onload="load_test_attr.done()">
 <h1>Sample HTML5 API Tests</h1>
diff --git a/apisample4.htm b/examples/apisample4.htm
similarity index 88%
rename from apisample4.htm
rename to examples/apisample4.htm
index 731a3cb678f4bb..c8fbbded695fd6 100644
--- a/apisample4.htm
+++ b/examples/apisample4.htm
@@ -3,7 +3,7 @@
 <head>
 <title>Harness Handling Uncaught Exception</title>
 </head>
-<script src="testharness.js"></script>
+<script src="../testharness.js"></script>
 
 <body>
 <h1>Harness Handling Uncaught Exception</h1>
diff --git a/apisample5.htm b/examples/apisample5.htm
similarity index 91%
rename from apisample5.htm
rename to examples/apisample5.htm
index 3853ccf421b689..3edf602a1e6e75 100644
--- a/apisample5.htm
+++ b/examples/apisample5.htm
@@ -3,7 +3,7 @@
 <head>
 <title>Harness Ignoring Uncaught Exception</title>
 </head>
-<script src="testharness.js"></script>
+<script src="../testharness.js"></script>
 
 <body>
 <h1>Harness Ignoring Uncaught Exception</h1>
diff --git a/apisample6.html b/examples/apisample6.html
similarity index 59%
rename from apisample6.html
rename to examples/apisample6.html
index 526e4649d282c8..7459c54d57208c 100644
--- a/apisample6.html
+++ b/examples/apisample6.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Example with file_is_test</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 onload = function() {
   assert_true(true);
diff --git a/apisample7.html b/examples/apisample7.html
similarity index 61%
rename from apisample7.html
rename to examples/apisample7.html
index 03b20efdd1c34c..6885f52f8a53af 100644
--- a/apisample7.html
+++ b/examples/apisample7.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Example with file_is_test (should fail)</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 onload = function() {
   assert_true(false);
diff --git a/apisample8.html b/examples/apisample8.html
similarity index 55%
rename from apisample8.html
rename to examples/apisample8.html
index 821320f450979c..70853d9c6c5923 100644
--- a/apisample8.html
+++ b/examples/apisample8.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Example single page test with no body</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 assert_true(true);
 done();
diff --git a/apisample9.html b/examples/apisample9.html
similarity index 52%
rename from apisample9.html
rename to examples/apisample9.html
index 269a6cf818f302..f84433dd1989c7 100644
--- a/apisample9.html
+++ b/examples/apisample9.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <title>Example single page test with no asserts</title>
-<script src="testharness.js"></script>
-<script src="testharnessreport.js"></script>
+<script src="../testharness.js"></script>
+<script src="../testharnessreport.js"></script>
 <script>
 done();
 </script>
\ No newline at end of file
