diff --git a/download.html b/download.html
index 3c55072b1c..9b802edd7c 100644
--- a/download.html
+++ b/download.html
@@ -121,7 +121,7 @@
 		border-bottom-left-radius: 0;
 	}
 </style>
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -169,12 +169,12 @@ <h2>Customize your download</h2>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
-<script src="vendor/promise.js"></script>
-<script src="download.js"></script>
+<script src="scripts/code.js"></script>
+<script src="scripts/vendor/promise.js"></script>
+<script src="scripts/download.js"></script>
 
 </body>
 </html>
diff --git a/examples.html b/examples.html
index b7dce551ce..e60984c4d7 100644
--- a/examples.html
+++ b/examples.html
@@ -43,7 +43,7 @@
 	padding-left: 40px;
 }
 </style>
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -99,12 +99,12 @@ <h1>Per language examples</h1>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
-<script src="vendor/promise.js"></script>
-<script src="examples.js"></script>
+<script src="scripts/code.js"></script>
+<script src="scripts/vendor/promise.js"></script>
+<script src="scripts/examples.js"></script>
 
 </body>
 </html>
diff --git a/extending.html b/extending.html
index 6abebd39bc..7b12a07b82 100644
--- a/extending.html
+++ b/extending.html
@@ -7,7 +7,7 @@
 <title>Extending Prism ▲ Prism</title>
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -240,10 +240,10 @@ <h2>Returns</h2>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/faq.html b/faq.html
index 8d5da68472..1e8d0f513e 100644
--- a/faq.html
+++ b/faq.html
@@ -16,7 +16,7 @@
 	color: black;
 }
 </style>
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -25,33 +25,33 @@
 
 <header>
 	<div class="intro" data-src="templates/header-main.html" data-type="text/html"></div>
-	
+
 	<h2>FAQ</h2>
 	<p>Frequently Asked Questions, with a few Questions I want people to Frequently Ask.</p>
 </header>
 
 <section>
 	<h1>This page doesn’t work in Opera!</h1>
-	
+
 	<p><strong>Prism works fine in Opera.</strong> However, this page might sometimes appear to not be working in Opera, due to the theme switcher triggering an Opera bug.
 	This will be fixed soon.</p>
 </section>
 
 <section>
 	<h1>Isn’t it bad to do syntax highlighting with regular expressions?</h1>
-	
-	<p>It is true that to correctly handle every possible case of syntax found in the wild, one would need to write a full-blown parser. 
+
+	<p>It is true that to correctly handle every possible case of syntax found in the wild, one would need to write a full-blown parser.
 	However, in most web applications and websites a small error margin is usually acceptable and a rare highlighting failure is not the end of the world.
 	A syntax highlighter based on regular expressions might only be accurate 99% of the time (the actual percentage is just a guess),
 	but in exchange for the small error margin, it offers some very important benefits:
-	
+
 	<ul>
 		<li>Smaller filesize. Proper parsers are very big.</li>
-		<li>Extensibility. Authors can define new languages simply by knowing how to code regular expressions. 
+		<li>Extensibility. Authors can define new languages simply by knowing how to code regular expressions.
 			Writing a correct, unambiguous BNF grammar is a task at least an order of magnitude harder.</li>
 		<li>Graceful error recovery. Parsers fail on incorrect syntax, where regular expressions keep matching.</li>
 	</ul>
-	
+
 	<p>For this reason, most syntax highlighters on the web and on desktop, are powered by regular expressions. This includes the internal syntax
 	highlighters used by popular native applications like Espresso and Sublime Text, at the time of writing.
 	Of course, not every regex-powered syntax highlighter is created equal. The number and type of failures can be vastly different, depending on
@@ -60,12 +60,12 @@ <h1>Isn’t it bad to do syntax highlighting with regular expressions?</h1>
 
 <section>
 	<h1>Why is asynchronous highlighting disabled by default?</h1>
-	
+
 	<p>Web Workers are good for preventing syntax highlighting of really large code blocks from blocking the main UI thread.
 	In most cases, you will want to highlight reasonably sized chunks of code, and this will not be needed.
 	Furthermore, using Web Workers is actually <strong>slower</strong> than synchronously highlighting, due to the overhead of creating and terminating
 	the Worker. It just appears faster in these cases because it doesn’t block the main thread.
-	In addition, since Web Workers operate on files instead of objects, plugins that hook on core parts of Prism (e.g. modify language definitions) 
+	In addition, since Web Workers operate on files instead of objects, plugins that hook on core parts of Prism (e.g. modify language definitions)
 	will not work unless included in the same file (using the builder in the <a href="download.html">Download</a> page will protect you from this pitfall).
 	Lastly, Web Workers cannot interact with the DOM and most other APIs (e.g. the console), so they are notoriously hard to debug.
 	</p>
@@ -73,14 +73,14 @@ <h1>Why is asynchronous highlighting disabled by default?</h1>
 
 <section>
 	<h1>Why is pre-existing HTML stripped off?</h1>
-	
-	<p>Because it would complicate the code a lot, although it’s not a crucial feature for most people. 
+
+	<p>Because it would complicate the code a lot, although it’s not a crucial feature for most people.
 	If it’s very important to you, you can use the <a href="plugins/keep-markup/">Keep Markup plugin</a>.</p>
 </section>
 
 <section>
 	<h1>If pre-existing HTML is stripped off, how can I highlight certain parts of the code?</h1>
-	
+
 	<p>There is a number of ways around it. You can always break the block of code into multiple parts, and wrap the HTML around it (or just use a <code>.highlight</code> class).
 	You can see an example of this in action at the “<a href="index.html#basic-usage">Basic usage</a>” section of the homepage.</p>
 	<p>Another way around the limitation is to use the <a href="plugins/line-highlight/">Line Highlght plugin</a>, to highlight and link to specific lines and/or line ranges.
@@ -88,7 +88,7 @@ <h1>If pre-existing HTML is stripped off, how can I highlight certain parts of t
 
 <section>
 	<h1>How do I know which tokens I can style for every language?</h1>
-	
+
 	<p>Every token that is highlighted gets two classes: <code>token</code> and a class with the token type (e.g. <code>comment</code>).
 	You can find the different types of tokens either by looking at the keys of the object defining the language or by running this snippet in the console:
 	<pre><code class="language-javascript">function printTokens(o, prefix) { for (var i in o) { console.log((prefix? prefix + ' > ' : '') + i); if (o[i].inside) printTokens(o[i].inside, (prefix? prefix + ' > ' : '') + i); } };</code></pre>
@@ -135,7 +135,7 @@ <h1>How do I know which tokens I can style for every language?</h1>
 
 <section>
 	<h1>How can I use different highlighting for tokens with the same name in different languages?</h1>
-	<p>Just use a descendant selector, that includes the language class. The default <code>prism.css</code> does this, to have different colors for 
+	<p>Just use a descendant selector, that includes the language class. The default <code>prism.css</code> does this, to have different colors for
 	JavaScript strings (which are very common) and CSS strings (which are relatively rare). Here’s that code, simplified to illustrate the technique:
 	<pre><code class="language-css">
 .token.string {
@@ -159,8 +159,9 @@ <h1>How can I use different highlighting for tokens with the same name in differ
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
+<script src="components.js"></script>
 <script>
 	$$('section > h1').forEach(function (h1) {
 		$u.element.create('p', {
@@ -175,8 +176,7 @@ <h1>How can I use different highlighting for tokens with the same name in differ
 		});
 	});
 </script>
-<script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/index.html b/index.html
index c65de9d9bf..10f9fb7430 100644
--- a/index.html
+++ b/index.html
@@ -11,7 +11,7 @@
 <title>Prism</title>
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -261,10 +261,10 @@ <h1>Credits</h1>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 <script>
 (function() {
 	var languageItems = [];
diff --git a/plugins/autolinker/index.html b/plugins/autolinker/index.html
index 6053b62c02..286532d444 100644
--- a/plugins/autolinker/index.html
+++ b/plugins/autolinker/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/autolinker/prism-autolinker.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -61,10 +61,10 @@ <h2>HTML</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/autolinker/prism-autolinker.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/autoloader/index.html b/plugins/autoloader/index.html
index 3e5357e06b..dd7a55429f 100644
--- a/plugins/autoloader/index.html
+++ b/plugins/autoloader/index.html
@@ -22,7 +22,7 @@
 		content: ' [Generating... ' attr(data-progress) '%]';
 	}
 </style>
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -121,9 +121,9 @@ <h1>Examples</h1>
 
 <script src="components/prism-core.js"></script>
 <script src="plugins/autoloader/prism-autoloader.js" data-autoloader-path="components"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 <script src="vendor/promise.js"></script>
 <script src="vendor/jszip.min.js"></script>
diff --git a/plugins/command-line/index.html b/plugins/command-line/index.html
index 109138b671..9ab9dfb47e 100644
--- a/plugins/command-line/index.html
+++ b/plugins/command-line/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/command-line/prism-command-line.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -101,11 +101,11 @@ <h2>Windows PowerShell With Output</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/command-line/prism-command-line.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 <script src="components/prism-bash.js"></script>
 <script src="components/prism-powershell.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/copy-to-clipboard/index.html b/plugins/copy-to-clipboard/index.html
index c42a52620c..32056a0086 100644
--- a/plugins/copy-to-clipboard/index.html
+++ b/plugins/copy-to-clipboard/index.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="style.css" />
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 	<link rel="stylesheet" href="plugins/toolbar/prism-toolbar.css" data-noprefix />
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -40,9 +40,9 @@ <h1>How to use</h1>
 <script src="prism.js"></script>
 <script src="plugins/toolbar/prism-toolbar.js"></script>
 <script src="plugins/copy-to-clipboard/prism-copy-to-clipboard.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/custom-class/index.html b/plugins/custom-class/index.html
index ee4fade718..1d5de4fa5d 100644
--- a/plugins/custom-class/index.html
+++ b/plugins/custom-class/index.html
@@ -8,7 +8,7 @@
 <base href="../.." />
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
 </head>
@@ -18,7 +18,7 @@
 	<div class="intro" data-src="templates/header-plugins.html" data-type="text/html"></div>
 
 	<h2>Custom Class</h2>
-	<p>This plugin allows you to prefix Prism default classes (<code>.comment</code> will become <code>.namespace--comment</code>) or replace them with your defined ones (like <code>.editor__comment</code> or <code>.comment_7sh3a</code>).</p>  
+	<p>This plugin allows you to prefix Prism default classes (<code>.comment</code> will become <code>.namespace--comment</code>) or replace them with your defined ones (like <code>.editor__comment</code> or <code>.comment_7sh3a</code>).</p>
 </header>
 
 <section>
@@ -125,9 +125,9 @@ <h1>Todo</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/custom-class/prism-custom-class.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/plugins/data-uri-highlight/index.html b/plugins/data-uri-highlight/index.html
index 380be2d67e..4b37d91a6c 100644
--- a/plugins/data-uri-highlight/index.html
+++ b/plugins/data-uri-highlight/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/autolinker/prism-autolinker.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -31,7 +31,7 @@ <h1>How to use</h1>
 
 <section>
 	<h1>Example</h1>
-	
+
 	<pre><code class="language-css">div {
     border: 40px solid transparent;
     border-image: 33.334% url('data:image/svg+xml,&lt;svg xmlns="http://www.w3.org/2000/svg" width="30" height="30"> \
@@ -51,10 +51,10 @@ <h1>Example</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/data-uri-highlight/prism-data-uri-highlight.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/file-highlight/index.html b/plugins/file-highlight/index.html
index e66b9897ee..f1a8b7fb0a 100644
--- a/plugins/file-highlight/index.html
+++ b/plugins/file-highlight/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/toolbar/prism-toolbar.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -25,14 +25,14 @@ <h2>File Highlight</h2>
 
 <section class="language-markup">
 	<h1>How to use</h1>
-	
+
 	<p>Use the <code>data-src</code> attribute on empty <code>&lt;pre></code> elements, like so:</p>
-	
+
 	<pre><code>&lt;pre data-src="myfile.js">&lt;/pre></code></pre>
-	
+
 	<p>You don’t need to specify the language, it’s automatically determined by the file extension.
 	If, however, the language cannot be determined from the file extension or the file extension is incorrect, you may specify a language as well (with the usual class name way).</p>
-	
+
 	<p>Please note that the files are fetched with XMLHttpRequest. This means that if the file is on a different origin, fetching it will fail, unless CORS is enabled on that website.</p>
 
 	<p>
@@ -48,7 +48,7 @@ <h1>Examples</h1>
 
 	<p>The plugin’s JS code:</p>
 	<pre data-src="plugins/file-highlight/prism-file-highlight.js"></pre>
-	
+
 	<p>This page:</p>
 	<pre data-src="plugins/file-highlight/index.html"></pre>
 
@@ -66,10 +66,10 @@ <h1>Examples</h1>
 <script src="prism.js"></script>
 <!-- The File Highlight plugin is already included into Prism.js build -->
 <script src="plugins/toolbar/prism-toolbar.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/highlight-keywords/index.html b/plugins/highlight-keywords/index.html
index 466587346b..c18e319545 100644
--- a/plugins/highlight-keywords/index.html
+++ b/plugins/highlight-keywords/index.html
@@ -8,7 +8,7 @@
 <base href="../.." />
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 <style>
 	/*
 	 * Custom keyword styles
@@ -42,9 +42,9 @@ <h2>HTML (Markup)</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/highlight-keywords/prism-highlight-keywords.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
diff --git a/plugins/index.html b/plugins/index.html
index 7b4a48a7af..309e633035 100644
--- a/plugins/index.html
+++ b/plugins/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/line-highlight/prism-line-highlight.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -34,9 +34,9 @@ <h1>Contribute</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/line-highlight/prism-line-highlight.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/jsonp-highlight/index.html b/plugins/jsonp-highlight/index.html
index 17d71b5d15..5214b01ce8 100644
--- a/plugins/jsonp-highlight/index.html
+++ b/plugins/jsonp-highlight/index.html
@@ -8,7 +8,7 @@
 <base href="../.." />
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -165,10 +165,10 @@ <h1>Examples</h1>
 <script src="prism.js"></script>
 <script src="plugins/jsonp-highlight/prism-jsonp-highlight.js"></script>
 <script>Prism.plugins.jsonphighlight.registerAdapter(function (x) { return "using registerAdapter: " + JSON.stringify(x,null,2); })</script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/keep-markup/index.html b/plugins/keep-markup/index.html
index 41b3c5f94d..c717da2690 100644
--- a/plugins/keep-markup/index.html
+++ b/plugins/keep-markup/index.html
@@ -22,7 +22,7 @@
 		}
 	</style>
 
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -72,9 +72,9 @@ <h1>Examples</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/keep-markup/prism-keep-markup.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/line-highlight/index.html b/plugins/line-highlight/index.html
index f3b58b4b41..4fc59d93f1 100644
--- a/plugins/line-highlight/index.html
+++ b/plugins/line-highlight/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/line-highlight/prism-line-highlight.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -25,9 +25,9 @@ <h2>Line highlight</h2>
 
 <section class="language-markup">
 	<h1>How to use</h1>
-	
+
 	<p>Obviously, this only works on code blocks (<code>&lt;pre>&lt;code></code>) and not for inline code.
-	
+
 	<p>You specify the lines to be highlighted through the <code>data-line</code> attribute on the <code>&lt;pre></code> element, in the following simple format:</p>
 	<ul>
 		<li>A single number refers to the line with that number</li>
@@ -35,44 +35,44 @@ <h1>How to use</h1>
 		<li>Multiple line numbers or ranges are separated by commas.</li>
 		<li>Whitespace is allowed anywhere and will be stripped off.</li>
 	</ul>
-	
+
 	<p>Examples:</p>
 	<dl>
 		<dt>5</dt>
 		<dd>The 5th line</dd>
-		
+
 		<dt>1-5</dt>
 		<dd>Lines 1 through 5</dd>
-		
+
 		<dt>1,4</dt>
 		<dd>Line 1 and line 4</dd>
-		
+
 		<dt>1-2, 5, 9-20</dt>
 		<dd>Lines 1 through 2, line 5, lines 9 through 20</dd>
 	</dl>
-	
+
 	<p>In case you want the line numbering to be offset by a certain number (for example, you want the 1st line to be number 41 instead of 1, which is an offset of 40), you can additionally use the <code>data-line-offset</code> attribute.
-	
-	<p>You can also link to specific lines on any code snippet, by using the following as a url hash: <code>#{element-id}.{lines}</code> where 
+
+	<p>You can also link to specific lines on any code snippet, by using the following as a url hash: <code>#{element-id}.{lines}</code> where
 	<code>{element-id}</code> is the id of the <code>&lt;pre></code> element and <code>{lines}</code> is one or more lines or line ranges that follow the format
 	outlined above. For example, if there is an element with <code>id="play"</code> on the page, you can link to lines 5-6 by linking to <a href="plugins/line-highlight/#play.5-6">#play.5-6</a></p>
 </section>
 
 <section>
 	<h1>Examples</h1>
-	
+
 	<h2>Line 2</h2>
 	<pre data-line="2" data-src="plugins/line-highlight/prism-line-highlight.js" id="play"></pre>
-	
+
 	<h2>Lines 15-25</h2>
 	<pre data-line="15-25" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
-	
+
 	<h2>Line 1 and lines 3-4 and line 42</h2>
 	<pre data-line="1,3-4,42" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
-	
+
 	<h2>Line 43, starting from line 41</h2>
 	<pre data-line="43" data-line-offset="40" data-src="plugins/line-highlight/prism-line-highlight.js"></pre>
-	
+
 	<p><a href="plugins/line-highlight/#play.50-55,60">Linking example</a></p>
 </section>
 
@@ -80,9 +80,9 @@ <h2>Line 43, starting from line 41</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/line-highlight/prism-line-highlight.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/line-numbers/index.html b/plugins/line-numbers/index.html
index ac00d3c2d4..9091fa21f4 100644
--- a/plugins/line-numbers/index.html
+++ b/plugins/line-numbers/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/line-numbers/prism-line-numbers.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -62,10 +62,10 @@ <h2>Soft wrap support</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/line-numbers/prism-line-numbers.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/normalize-whitespace/index.html b/plugins/normalize-whitespace/index.html
index e1469de650..6cfa276aea 100644
--- a/plugins/normalize-whitespace/index.html
+++ b/plugins/normalize-whitespace/index.html
@@ -21,7 +21,7 @@
 		}
 	</style>
 
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -172,9 +172,9 @@ <h1>Examples</h1>
 <script src="prism.js"></script>
 <script src="plugins/normalize-whitespace/prism-normalize-whitespace.js"></script>
 <script src="plugins/keep-markup/prism-keep-markup.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/plugins/previewers/index.html b/plugins/previewers/index.html
index 55370a3314..d817d689c0 100644
--- a/plugins/previewers/index.html
+++ b/plugins/previewers/index.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="style.css" />
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 	<link rel="stylesheet" href="plugins/previewers/prism-previewers.css" data-noprefix />
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -224,10 +224,10 @@ <h2><code class="language-javascript">new Prism.plugins.Previewer(type, updater,
 <script src="components/prism-scss.js"></script>
 <script src="components/prism-stylus.js"></script>
 <script src="plugins/previewers/prism-previewers.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/remove-initial-line-feed/index.html b/plugins/remove-initial-line-feed/index.html
index 8eb942fa67..c914a67768 100644
--- a/plugins/remove-initial-line-feed/index.html
+++ b/plugins/remove-initial-line-feed/index.html
@@ -8,7 +8,7 @@
 	<base href="../.." />
 	<link rel="stylesheet" href="style.css" />
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -50,10 +50,10 @@ <h2>With the class added</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/remove-initial-line-feed/prism-remove-initial-line-feed.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/show-invisibles/index.html b/plugins/show-invisibles/index.html
index cb0ad436a4..2079998cd6 100644
--- a/plugins/show-invisibles/index.html
+++ b/plugins/show-invisibles/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/show-invisibles/prism-show-invisibles.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -25,11 +25,11 @@ <h2>Show Invisibles</h2>
 
 <section>
 	<h1>Examples</h1>
-	
+
 	<pre data-src="plugins/show-invisibles/prism-show-invisibles.js"></pre>
-	
+
 	<pre data-src="plugins/show-invisibles/prism-show-invisibles.css"></pre>
-	
+
 	<pre data-src="plugins/show-invisibles/index.html"></pre>
 </section>
 
@@ -37,9 +37,9 @@ <h1>Examples</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/show-invisibles/prism-show-invisibles.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
diff --git a/plugins/show-language/index.html b/plugins/show-language/index.html
index e79b1ccf9f..5118501946 100644
--- a/plugins/show-language/index.html
+++ b/plugins/show-language/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/toolbar/prism-toolbar.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -45,10 +45,10 @@ <h2>SVG</h2>
 <script src="prism.js"></script>
 <script src="plugins/toolbar/prism-toolbar.js"></script>
 <script src="plugins/show-language/prism-show-language.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/plugins/toolbar/index.html b/plugins/toolbar/index.html
index 5d8d63a1e7..fd908038cc 100644
--- a/plugins/toolbar/index.html
+++ b/plugins/toolbar/index.html
@@ -9,7 +9,7 @@
 	<link rel="stylesheet" href="style.css" />
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 	<link rel="stylesheet" href="plugins/toolbar/prism-toolbar.css" data-noprefix />
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -95,7 +95,7 @@ <h1>How to use</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/toolbar/prism-toolbar.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
 <script>
 	Prism.plugins.toolbar.registerButton('hello-world', {
@@ -128,7 +128,7 @@ <h1>How to use</h1>
 		return button;
 	});
 </script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/plugins/unescaped-markup/index.html b/plugins/unescaped-markup/index.html
index 442ef2aa9f..3568e1c049 100644
--- a/plugins/unescaped-markup/index.html
+++ b/plugins/unescaped-markup/index.html
@@ -10,7 +10,7 @@
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 	<link rel="stylesheet" href="plugins/unescaped-markup/prism-unescaped-markup.css" data-noprefix />
 
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 
 	<script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 	<script src="https://www.google-analytics.com/ga.js" async></script>
@@ -57,7 +57,7 @@ <h1>Examples</h1>
 		<link rel="stylesheet" href="style.css" />
 		<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 
-		<script src="prefixfree.min.js">&lt;/script>
+		<script src="scripts/prefixfree.min.js">&lt;/script>
 	</head>
 	<body class="language-markup">
 
@@ -99,9 +99,9 @@ <h1>FAQ</h1>
 
 	<script src="prism.js">&lt;/script>
 	<script src="plugins/unescaped-markup/prism-unescaped-markup.js">&lt;/script>
-	<script src="utopia.js">&lt;/script>
+	<script src="scripts/utopia.js">&lt;/script>
 	<script src="components.js">&lt;/script>
-	<script src="code.js">&lt;/script>
+	<script src="scripts/code.js">&lt;/script>
 
 	</body>
 	</html></script>
@@ -119,7 +119,7 @@ <h1>FAQ</h1>
 	<link rel="stylesheet" href="style.css" />
 	<link rel="stylesheet" href="themes/prism.css" data-noprefix />
 
-	<script src="prefixfree.min.js"></script>
+	<script src="scripts/prefixfree.min.js"></script>
 </head>
 <body class="language-markup">
 
@@ -161,9 +161,9 @@ <h1>FAQ</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/unescaped-markup/prism-unescaped-markup.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>--></code></pre>
@@ -187,9 +187,9 @@ <h1>FAQ</h1>
 
 <script src="prism.js"></script>
 <script src="plugins/unescaped-markup/prism-unescaped-markup.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/plugins/wpd/index.html b/plugins/wpd/index.html
index 9157a483f0..b0d4621dab 100644
--- a/plugins/wpd/index.html
+++ b/plugins/wpd/index.html
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
 <link rel="stylesheet" href="plugins/wpd/prism-wpd.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -60,9 +60,9 @@ <h2>SVG</h2>
 
 <script src="prism.js"></script>
 <script src="plugins/wpd/prism-wpd.js"></script>
-<script src="utopia.js"></script>
+<script src="scripts/utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/code.js b/scripts/code.js
similarity index 100%
rename from code.js
rename to scripts/code.js
diff --git a/download.js b/scripts/download.js
similarity index 100%
rename from download.js
rename to scripts/download.js
diff --git a/examples.js b/scripts/examples.js
similarity index 100%
rename from examples.js
rename to scripts/examples.js
diff --git a/prefixfree.min.js b/scripts/prefixfree.min.js
similarity index 100%
rename from prefixfree.min.js
rename to scripts/prefixfree.min.js
diff --git a/utopia.js b/scripts/utopia.js
similarity index 100%
rename from utopia.js
rename to scripts/utopia.js
diff --git a/vendor/FileSaver.min.js b/scripts/vendor/FileSaver.min.js
similarity index 100%
rename from vendor/FileSaver.min.js
rename to scripts/vendor/FileSaver.min.js
diff --git a/vendor/jszip.min.js b/scripts/vendor/jszip.min.js
similarity index 100%
rename from vendor/jszip.min.js
rename to scripts/vendor/jszip.min.js
diff --git a/vendor/promise.js b/scripts/vendor/promise.js
similarity index 100%
rename from vendor/promise.js
rename to scripts/vendor/promise.js
diff --git a/test-suite.html b/test-suite.html
index 936ed1aa68..97dd15e497 100644
--- a/test-suite.html
+++ b/test-suite.html
@@ -7,7 +7,7 @@
 <title>Running the test suite ▲ Prism</title>
 <link rel="stylesheet" href="style.css" />
 <link rel="stylesheet" href="themes/prism.css" data-noprefix />
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -159,11 +159,11 @@ <h1>Internal structure</h1>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
 <script src="components/prism-bash.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
+<script src="scripts/code.js"></script>
 
 </body>
 </html>
diff --git a/test.html b/test.html
index 063a8ea172..55afc53878 100644
--- a/test.html
+++ b/test.html
@@ -92,7 +92,7 @@
 }
 
 </style>
-<script src="prefixfree.min.js"></script>
+<script src="scripts/prefixfree.min.js"></script>
 
 <script>var _gaq = [['_setAccount', 'UA-33746269-1'], ['_trackPageview']];</script>
 <script src="https://www.google-analytics.com/ga.js" async></script>
@@ -126,11 +126,11 @@ <h2>Test drive</h2>
 
 <footer data-src="templates/footer.html" data-type="text/html"></footer>
 
+<script src="scripts/utopia.js"></script>
 <script src="prism.js"></script>
-<script src="utopia.js"></script>
 <script src="components.js"></script>
-<script src="code.js"></script>
-<script src="vendor/promise.js"></script>
+<script src="scripts/code.js"></script>
+<script src="scripts/vendor/promise.js"></script>
 
 <script>
 (function() {