diff --git a/test/demo/navigatorcustomlocationdemo.html b/test/demo/navigatorcustomlocationdemo.html
new file mode 100644
index 00000000..a8de7297
--- /dev/null
+++ b/test/demo/navigatorcustomlocationdemo.html
@@ -0,0 +1,48 @@
+<html>
+    <head>
+    <title>OpenSeadragon Navigator in a custom location Demo</title>
+    <script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script>
+
+    <style type="text/css">
+      .openseadragon1
+      {
+      width:      800px;
+      height:     600px;
+      border:     1px solid black;
+      color:      #333; /* text color for messages */
+      background-color: black;
+      }
+
+    </style>
+</head>
+<body>
+    <div>
+        Simple demo page to show how to put the navigator in a custom location
+    </div>
+    <div id="contentDiv" class="openseadragon1"></div>
+    <div id="navigatorDiv" class="findme"></div>
+
+    <script type="text/javascript">
+
+    var viewer = OpenSeadragon({
+        id:"contentDiv",
+        navigatorId: "navigatorDiv",
+        prefixUrl:"../../build/openseadragon/images/",
+        tileSources:{
+             Image:{
+                xmlns:"http://schemas.microsoft.com/deepzoom/2008",
+                Url:"../data/testpattern_files/",
+                Format:"jpg",
+                Overlap:"2",
+                TileSize:"256",
+                Size:{  
+                    Height:"1000",
+                    Width:"1000"
+                }
+            }
+        }
+    });
+
+        </script>
+    </body>
+</html>
diff --git a/test/navigatorjquerydemo.html b/test/demo/navigatorjquerydemo.html
similarity index 50%
rename from test/navigatorjquerydemo.html
rename to test/demo/navigatorjquerydemo.html
index d306a99f..d37a68b3 100644
--- a/test/navigatorjquerydemo.html
+++ b/test/demo/navigatorjquerydemo.html
@@ -1,10 +1,11 @@
 <html>
     <head>
-    <title>OpenSeadragon Expose Origina Event Demo</title>
-    <script type="text/javascript" src='../build/openseadragon/openseadragon.js'></script>
-        <script type="text/javascript" src='lib/jquery-1.9.1.min.js'></script>
-        <script type="text/javascript" src='lib/jquery-ui-1.10.2/js/jquery-ui-1.10.2.min.js'></script>
-        <link rel="stylesheet" type="text/css" href="lib/jquery-ui-1.10.2/css/smoothness/jquery-ui-1.10.2.min.css"/>
+    <title>OpenSeadragon Navigator in a JQuery UI Dialog Demo</title>
+    <script type="text/javascript" src='../../build/openseadragon/openseadragon.js'></script>
+        <script type="text/javascript" src='../lib/jquery-1.9.1.min.js'></script>
+        <script type="text/javascript" src='../lib/jquery-ui-1.10.2/js/jquery-ui-1.10.2.min.js'></script>
+        <link rel="stylesheet" type="text/css" href="../lib/jquery-ui-1.10.2/css/smoothness/jquery-ui-1.10.2.min.css"/>
+
     <style type="text/css">
       .openseadragon
       {
@@ -14,27 +15,17 @@
       color:      #333; /* text color for messages */
       background-color: black;
       }
-      .openseadragon-small
-      {
-      width:      40px;
-      height:     30px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-      
+
     </style>
 </head>
 <body>
-    <div class="demoarea">
     <div>
-       Simple demo page to verify that event handlers pass along the original source event
+       Simple demo page to show how to put the navigator in a moveable JQuery UI dialog.
     </div>
     <div id="contentDiv" class="openseadragon"></div>
         <div id="navigatorDialog">
-    <div id="navigatorDiv" class="findme"></div>
+    <div id="navigatorDiv"></div>
         </div>
-    </div>
 
     <script type="text/javascript">
 
@@ -43,11 +34,11 @@
     var viewer = OpenSeadragon({
         id:"contentDiv",
         navigatorId: "navigatorDiv",
-        prefixUrl:"../build/openseadragon/images/",
+        prefixUrl:"../../build/openseadragon/images/",
         tileSources:{
              Image:{
                 xmlns:"http://schemas.microsoft.com/deepzoom/2008",
-                Url:"data/testpattern_files/",
+                Url:"../data/testpattern_files/",
                 Format:"jpg",
                 Overlap:"2",
                 TileSize:"256",
diff --git a/test/navigatordefaultdemo.html b/test/navigatordefaultdemo.html
deleted file mode 100644
index 7a077f88..00000000
--- a/test/navigatordefaultdemo.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<html>
-    <head>
-    <title>OpenSeadragon Expose Origina Event Demo</title>
-    <script type="text/javascript" src='../build/openseadragon/openseadragon.js'></script>
-    <style type="text/css">
-      .openseadragon
-      {
-      width:      800px;
-      height:     600px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-      .openseadragon-small
-      {
-      width:      40px;
-      height:     30px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-      
-    </style>
-</head>
-<body>
-    <div class="demoarea">
-    <div>
-       Simple demo page to verify that event handlers pass along the original source event
-    </div>
-    <div id="contentDiv" class="openseadragon"></div>
-        <div id="navigatorDialog">
-    <div id="navigatorDiv" class="findme"></div>
-        </div>
-    </div>
-
-    <script type="text/javascript">
-
-    var viewer = OpenSeadragon({
-        id:"contentDiv",
-        prefixUrl:"../build/openseadragon/images/",
-        tileSources:{
-             Image:{
-                xmlns:"http://schemas.microsoft.com/deepzoom/2008",
-                Url:"data/testpattern_files/",
-                Format:"jpg",
-                Overlap:"2",
-                TileSize:"256",
-                Size:{  
-                    Height:"9221",
-                    Width:"7026"
-                }
-            }
-        }
-    });
-
-        </script>
-    </body>
-</html>
diff --git a/test/navigatordemo.html b/test/navigatordemo.html
deleted file mode 100644
index 33c28f9a..00000000
--- a/test/navigatordemo.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<html>
-    <head>
-    <title>OpenSeadragon Expose Origina Event Demo</title>
-    <script type="text/javascript" src='../build/openseadragon/openseadragon.js'></script>
-
-    <style type="text/css">
-      .openseadragon1
-      {
-      width:      300px;
-      height:     700px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-
-      .openseadragon2
-      {
-      width:      500px;
-      height:     1000px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-
-      .openseadragon3
-      {
-      width:      762px;
-      height:     1000px;
-      border:     1px solid black;
-      color:      #333; /* text color for messages */
-      background-color: black;
-      }
-
-
-
-    </style>
-</head>
-<body>
-    <div class="demoarea">
-    <div>
-       Simple demo page to verify navigator can be placed on an element outside of the main viewer
-    </div>
-    <div id="contentDiv1" class="openseadragon1"></div>
-        <div id="navigatorDialog1">
-    <div id="navigatorDiv1" class="findme"></div>
-        </div>
-
-
-    <div id="contentDiv2" class="openseadragon2"></div>
-        <div id="navigatorDialog2">
-    <div id="navigatorDiv2" class="findme"></div>
-        </div>
-
-
-    <div id="contentDiv3" class="openseadragon3"></div>
-        <div id="navigatorDialog3">
-    <div id="navigatorDiv3" class="findme"></div>
-        </div>
-    </div>
-
-
-
-    <script type="text/javascript">
-
-    var viewer1 = OpenSeadragon({
-        id:"contentDiv1",
-        navigatorId: "navigatorDiv1",
-        prefixUrl:"../build/openseadragon/images/",
-        tileSources:{
-             Image:{
-                xmlns:"http://schemas.microsoft.com/deepzoom/2008",
-                Url:"data/wide_files/",
-                Format:"jpg",
-                Overlap:"2",
-                TileSize:"256",
-                Size:{  
-                    Height:"500",
-                    Width:"2000"
-                }
-            }
-        }
-    });
-
-    var viewer2 = OpenSeadragon({
-        id:"contentDiv2",
-        navigatorId: "navigatorDiv2",
-        prefixUrl:"../build/openseadragon/images/",
-        tileSources:{
-             Image:{
-                xmlns:"http://schemas.microsoft.com/deepzoom/2008",
-                Url:"data/wide_files/",
-                Format:"jpg",
-                Overlap:"2",
-                TileSize:"256",
-                Size:{
-                    Height:"500",
-                    Width:"2000"
-                }
-            }
-        }
-    });
-
-    var viewer3 = OpenSeadragon({
-        id:"contentDiv3",
-        navigatorId: "navigatorDiv3",
-        prefixUrl:"../build/openseadragon/images/",
-        tileSources:{
-             Image:{
-                xmlns:"http://schemas.microsoft.com/deepzoom/2008",
-                Url:"data/tall_files/",
-                Format:"jpg",
-                Overlap:"2",
-                TileSize:"256",
-                Size:{
-                    Height:"2000",
-                    Width:"500"
-                }
-            }
-        }
-    });
-
-
-        </script>
-    </body>
-</html>
