diff --git a/non_amd.html b/demo/without_bundled_dependencies.html
similarity index 51%
rename from non_amd.html
rename to demo/without_bundled_dependencies.html
index 13b31678f..b14753a95 100755
--- a/non_amd.html
+++ b/demo/without_bundled_dependencies.html
@@ -7,38 +7,38 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="description" content="Converse.js: A free chat client for your website" />
     <meta name="author" content="JC Brand" />
-    <link rel="shortcut icon" type="image/ico" href="css/images/favicon.ico"/>
-    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/bootstrap/dist/css/bootstrap.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="node_modules/font-awesome/css/font-awesome.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/theme.min.css" />
-    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" />
+    <link rel="shortcut icon" type="image/ico" href="../css/images/favicon.ico"/>
+    <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/bootstrap/dist/css/bootstrap.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../node_modules/font-awesome/css/font-awesome.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../css/theme.min.css" />
+    <link type="text/css" rel="stylesheet" media="screen" href="../css/converse.min.css" />
 
     <!-- BEGIN JQUERY -->
-    <script type="text/javascript" src="node_modules/jquery/dist/jquery.js"></script>
-    <script type="text/javascript" src="node_modules/jquery.browser/dist/jquery.browser.js"></script>
+    <script type="text/javascript" src="../node_modules/jquery/dist/jquery.js"></script>
+    <script type="text/javascript" src="../node_modules/jquery.browser/dist/jquery.browser.js"></script>
     <!-- END JQUERY -->
 
     <!-- BEGIN OTR: Off-the-record encryption stuff. Can be omitted if OTR is not used. -->
-    <script type="text/javascript" src="node_modules/otr/build/dep/crypto.js"></script>
-    <script type="text/javascript" src="node_modules/otr/build/dep/salsa20.js"></script>
-    <script type="text/javascript" src="node_modules/otr/build/dep/bigint.js"></script>
-    <script type="text/javascript" src="node_modules/otr/build/dep/eventemitter.js"></script>
-    <script type="text/javascript" src="node_modules/otr/build/otr.js"></script>
+    <script type="text/javascript" src="../node_modules/otr/build/dep/crypto.js"></script>
+    <script type="text/javascript" src="../node_modules/otr/build/dep/salsa20.js"></script>
+    <script type="text/javascript" src="../node_modules/otr/build/dep/bigint.js"></script>
+    <script type="text/javascript" src="../node_modules/otr/build/dep/eventemitter.js"></script>
+    <script type="text/javascript" src="../node_modules/otr/build/otr.js"></script>
     <!-- END OTR -->
 
     <!-- BEGIN STROPHE -->
-    <script type="text/javascript" src="node_modules/strophe.js/strophe.js"></script>
-    <script type="text/javascript" src="node_modules/strophejs-plugin-vcard/strophe.vcard.js"></script>
-    <script type="text/javascript" src="node_modules/strophejs-plugin-disco/strophe.disco.js"></script>
-    <script type="text/javascript" src="node_modules/strophejs-plugin-rsm/strophe.rsm.js"></script>
-    <script type="text/javascript" src="node_modules/strophejs-plugin-ping/strophe.ping.js"></script>
+    <script type="text/javascript" src="../node_modules/strophe.js/strophe.js"></script>
+    <script type="text/javascript" src="../node_modules/strophejs-plugin-vcard/strophe.vcard.js"></script>
+    <script type="text/javascript" src="../node_modules/strophejs-plugin-disco/strophe.disco.js"></script>
+    <script type="text/javascript" src="../node_modules/strophejs-plugin-rsm/strophe.rsm.js"></script>
+    <script type="text/javascript" src="../node_modules/strophejs-plugin-ping/strophe.ping.js"></script>
     <!-- END STROPHE -->
 
     <!-- BEGIN BACKBONE -->
-    <script type="text/javascript" src="node_modules/lodash/lodash.js"></script>
-    <script type="text/javascript" src="node_modules/backbone//backbone.js"></script>
-    <script type="text/javascript" src="node_modules/backbone.browserStorage/backbone.browserStorage.js"></script>
-    <script type="text/javascript" src="node_modules/backbone.overview/backbone.overview.js"></script>
+    <script type="text/javascript" src="../node_modules/lodash/lodash.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone//backbone.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.browserStorage/backbone.browserStorage.js"></script>
+    <script type="text/javascript" src="../node_modules/backbone.overview/backbone.overview.js"></script>
     <!-- END BACKBONE -->
 
     <!-- BEGIN I18N -->
@@ -48,14 +48,14 @@
         src/locales.js to remove those you don't need, and then run `make
         build` to generates a new dist/locales.js file.
     -->
-    <script type="text/javascript" src="node_modules/jed/jed.js"></script>
-    <script type="text/javascript" src="dist/locales.js"></script>
+    <script type="text/javascript" src="../node_modules/jed/jed.js"></script>
+    <script type="text/javascript" src="../dist/locales.js"></script>
     <!-- END I18N -->
 
-    <script type="text/javascript" src="node_modules/awesomplete/awesomplete.js"></script>
-    <script type="text/javascript" src="node_modules/moment/min/moment-with-locales.js"></script>
+    <script type="text/javascript" src="../node_modules/awesomplete/awesomplete.js"></script>
+    <script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
 
-	<script src="dist/converse-no-dependencies.js"></script>
+	<script src="../dist/converse-no-dependencies.js"></script>
 </head>
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
     <section class="intro">
@@ -64,8 +64,9 @@
                 <div class="row">
                     <div class="col-md-8 col-md-offset-2">
                         <h1 class="brand-heading"><i class="icon-conversejs"></i>Converse.js</h1>
-                        <p class="intro-text">Example page without require.js and AMD module loading.</p>
-                        <p class="intro-text">For this page to work, you need to
+                        <p class="intro-text">An example page where external dependencies are loaded seperately and not within the converse.js bundle.</p>
+                        <p class="intro-text">Look at the page source for details.</p>
+                        <p class="intro-text">For this page to work, you'll need to
                             <a href="https://conversejs.org/docs/html/developer_guidelines.html#installing-the-development-and-front-end-dependencies">
                             install the 3rd party dependencies</a> of converse.js.
                         </p>