diff --git a/jquery.fileupload-ui.css b/css/jquery.fileupload-ui.css
similarity index 95%
rename from jquery.fileupload-ui.css
rename to css/jquery.fileupload-ui.css
index 4292ef520..4587189aa 100644
--- a/jquery.fileupload-ui.css
+++ b/css/jquery.fileupload-ui.css
@@ -36,6 +36,6 @@
   width: 200px;
 }
 .progress-animated .bar {
-  background: url(progressbar.gif);
+  background: url(../progressbar.gif);
   filter: none;
 }
diff --git a/progressbar.gif b/img/progressbar.gif
similarity index 100%
rename from progressbar.gif
rename to img/progressbar.gif
diff --git a/index.html b/index.html
index c059b15f6..a6f96ea6b 100644
--- a/index.html
+++ b/index.html
@@ -16,12 +16,18 @@
 <meta charset="utf-8">
 <title>jQuery File Upload Demo</title>
 <meta name="description" content="File Upload widget with multiple file selection, drag&amp;drop support, progress bar and preview images for jQuery. Supports cross-domain, chunked and resumable file uploads. Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.">
+<!-- Bootstrap CSS Toolkit styles -->
 <link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap.min.css">
 <style>body{padding-top:60px;}</style>
+<!-- Bootstrap styles for responsive website layout, supporting different screen sizes -->
 <link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-responsive.min.css">
+<!-- Bootstrap CSS adjustments for IE6 -->
 <!--[if lt IE 7]><link rel="stylesheet" href="http://blueimp.github.com/cdn/css/bootstrap-ie6.min.css"><![endif]-->
+<!-- Bootstrap Image Gallery styles -->
 <link rel="stylesheet" href="http://blueimp.github.com/Bootstrap-Image-Gallery/bootstrap-image-gallery.min.css">
-<link rel="stylesheet" href="jquery.fileupload-ui.css">
+<!-- CSS to style the file input field as button and adjust the Bootstrap progress bars -->
+<link rel="stylesheet" href="css/jquery.fileupload-ui.css">
+<!-- Shim to make HTML5 elements usable in older Internet Explorer versions -->
 <!--[if lt IE 9]><script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
 </head>
 <body>
@@ -58,9 +64,12 @@ <h1>jQuery File Upload Demo</h1>
         Works with any server-side platform (Google App Engine, PHP, Python, Ruby on Rails, Java, etc.) that supports standard HTML form file uploads.</p>
     </blockquote>
     <br>
-    <form id="fileupload" action="php/index.php" method="POST" enctype="multipart/form-data">
+    <!-- The file upload form used as target for the file upload widget -->
+    <form id="fileupload" action="server/php/" method="POST" enctype="multipart/form-data">
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="row fileupload-buttonbar">
             <div class="span6">
+                <!-- The fileinput-button span is used to style the file input field as button -->
                 <span class="btn btn-success fileinput-button">
                     <span><i class="icon-plus icon-white"></i> Add files...</span>
                     <input type="file" name="files[]" multiple>
@@ -77,12 +86,14 @@ <h1>jQuery File Upload Demo</h1>
                 <input type="checkbox" class="toggle">
             </div>
             <div class="span6">
+                <!-- The global progress bar -->
                 <div class="progress progress-success progress-striped active fade">
                     <div class="bar" style="width:0%;"></div>
                 </div>
             </div>
         </div>
         <br>
+        <!-- The table listing the files available for upload/download -->
         <table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
     </form>
     <br>
@@ -112,6 +123,7 @@ <h3 class="modal-title"></h3>
         <a class="btn modal-download" target="_blank"><i class="icon-download"></i> Download</a>
     </div>
 </div>
+<!-- Error messages for the upload/download templates -->
 <script>
 var fileUploadErrors = {
     maxFileSize: 'File is too big',
@@ -122,6 +134,7 @@ <h3 class="modal-title"></h3>
     emptyResult: 'Empty file upload result'
 };
 </script>
+<!-- The template to display files available for upload -->
 <script id="template-upload" type="text/html">
 {% for (var i=0, files=o.files, l=files.length, file=files[0]; i<l; file=files[++i]) { %}
     <tr class="template-upload fade">
@@ -150,6 +163,7 @@ <h3 class="modal-title"></h3>
     </tr>
 {% } %}
 </script>
+<!-- The template to display files available for download -->
 <script id="template-download" type="text/html">
 {% for (var i=0, files=o.files, l=files.length, file=files[0]; i<l; file=files[++i]) { %}
     <tr class="template-download fade">
@@ -179,7 +193,7 @@ <h3 class="modal-title"></h3>
 </script>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
 <!-- The jQuery UI widget factory, can be omitted if jQuery UI is already included -->
-<script src="vendor/jquery.ui.widget.js"></script>
+<script src="js/vendor/jquery.ui.widget.js"></script>
 <!-- The Templates and Load Image plugins are included for the FileUpload user interface -->
 <script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>
 <script src="http://blueimp.github.com/JavaScript-Load-Image/load-image.min.js"></script>
@@ -187,11 +201,14 @@ <h3 class="modal-title"></h3>
 <script src="http://blueimp.github.com/cdn/js/bootstrap.min.js"></script>
 <script src="http://blueimp.github.com/Bootstrap-Image-Gallery/bootstrap-image-gallery.min.js"></script>
 <!-- The Iframe Transport is required for browsers without support for XHR file uploads -->
-<script src="jquery.iframe-transport.js"></script>
-<script src="jquery.fileupload.js"></script>
-<script src="jquery.fileupload-ui.js"></script>
-<script src="application.js"></script>
+<script src="js/jquery.iframe-transport.js"></script>
+<!-- The basic File Upload plugin -->
+<script src="js/jquery.fileupload.js"></script>
+<!-- The File Upload user interface plugin -->
+<script src="js/jquery.fileupload-ui.js"></script>
+<!-- The main application script -->
+<script src="js/main.js"></script>
 <!-- The XDomainRequest Transport is included for cross-domain file deletion for IE8+ -->
-<!--[if gte IE 8]><script src="cors/jquery.xdr-transport.js"></script><![endif]-->
+<!--[if gte IE 8]><script src="js/cors/jquery.xdr-transport.js"></script><![endif]-->
 </body> 
 </html>
diff --git a/cors/jquery.postmessage-transport.js b/js/cors/jquery.postmessage-transport.js
similarity index 100%
rename from cors/jquery.postmessage-transport.js
rename to js/cors/jquery.postmessage-transport.js
diff --git a/cors/jquery.xdr-transport.js b/js/cors/jquery.xdr-transport.js
similarity index 100%
rename from cors/jquery.xdr-transport.js
rename to js/cors/jquery.xdr-transport.js
diff --git a/jquery.fileupload-ui.js b/js/jquery.fileupload-ui.js
similarity index 100%
rename from jquery.fileupload-ui.js
rename to js/jquery.fileupload-ui.js
diff --git a/jquery.fileupload.js b/js/jquery.fileupload.js
similarity index 100%
rename from jquery.fileupload.js
rename to js/jquery.fileupload.js
diff --git a/jquery.iframe-transport.js b/js/jquery.iframe-transport.js
similarity index 100%
rename from jquery.iframe-transport.js
rename to js/jquery.iframe-transport.js
diff --git a/application.js b/js/main.js
similarity index 100%
rename from application.js
rename to js/main.js
diff --git a/vendor/jquery.ui.widget.js b/js/vendor/jquery.ui.widget.js
similarity index 100%
rename from vendor/jquery.ui.widget.js
rename to js/vendor/jquery.ui.widget.js
diff --git a/gae-go/app.yaml b/server/gae-go/app.yaml
similarity index 100%
rename from gae-go/app.yaml
rename to server/gae-go/app.yaml
diff --git a/gae-go/app/main.go b/server/gae-go/app/main.go
similarity index 100%
rename from gae-go/app/main.go
rename to server/gae-go/app/main.go
diff --git a/gae-go/resize/resize.go b/server/gae-go/resize/resize.go
similarity index 100%
rename from gae-go/resize/resize.go
rename to server/gae-go/resize/resize.go
diff --git a/gae-go/static/favicon.ico b/server/gae-go/static/favicon.ico
similarity index 100%
rename from gae-go/static/favicon.ico
rename to server/gae-go/static/favicon.ico
diff --git a/gae-go/static/robots.txt b/server/gae-go/static/robots.txt
similarity index 100%
rename from gae-go/static/robots.txt
rename to server/gae-go/static/robots.txt
diff --git a/gae-python/app.yaml b/server/gae-python/app.yaml
similarity index 100%
rename from gae-python/app.yaml
rename to server/gae-python/app.yaml
diff --git a/gae-python/main.py b/server/gae-python/main.py
similarity index 100%
rename from gae-python/main.py
rename to server/gae-python/main.py
diff --git a/gae-python/static/favicon.ico b/server/gae-python/static/favicon.ico
similarity index 100%
rename from gae-python/static/favicon.ico
rename to server/gae-python/static/favicon.ico
diff --git a/gae-python/static/robots.txt b/server/gae-python/static/robots.txt
similarity index 100%
rename from gae-python/static/robots.txt
rename to server/gae-python/static/robots.txt
diff --git a/php/files/.htaccess b/server/php/files/.htaccess
similarity index 100%
rename from php/files/.htaccess
rename to server/php/files/.htaccess
diff --git a/php/index.php b/server/php/index.php
similarity index 100%
rename from php/index.php
rename to server/php/index.php
diff --git a/php/thumbnails/.htaccess b/server/php/thumbnails/.htaccess
similarity index 100%
rename from php/thumbnails/.htaccess
rename to server/php/thumbnails/.htaccess
diff --git a/php/upload.class.php b/server/php/upload.class.php
similarity index 100%
rename from php/upload.class.php
rename to server/php/upload.class.php
diff --git a/test/index.html b/test/index.html
index e39df9c96..d7119f0e6 100644
--- a/test/index.html
+++ b/test/index.html
@@ -24,9 +24,12 @@ <h2 id="qunit-banner"></h2>
 <h2 id="qunit-userAgent"></h2>
 <ol id="qunit-tests"></ol>
 <div id="qunit-fixture">
-    <form id="fileupload" action="../php/index.php" method="POST" enctype="multipart/form-data">
+    <!-- The file upload form used as target for the file upload widget -->
+    <form id="fileupload" action="../server/php/" method="POST" enctype="multipart/form-data">
+        <!-- The fileupload-buttonbar contains buttons to add/delete files and start/cancel the upload -->
         <div class="row fileupload-buttonbar">
             <div class="span6">
+                <!-- The fileinput-button span is used to style the file input field as button -->
                 <span class="btn btn-success fileinput-button">
                     <span><i class="icon-plus icon-white"></i> Add files...</span>
                     <input type="file" name="files[]" multiple>
@@ -43,15 +46,18 @@ <h2 id="qunit-userAgent"></h2>
                 <input type="checkbox" class="toggle">
             </div>
             <div class="span6">
+                <!-- The global progress bar -->
                 <div class="progress progress-success progress-striped active fade">
                     <div class="bar" style="width:0%;"></div>
                 </div>
             </div>
         </div>
         <br>
+        <!-- The table listing the files available for upload/download -->
         <table class="table table-striped"><tbody class="files" data-toggle="modal-gallery" data-target="#modal-gallery"></tbody></table>
     </form>
 </div>
+<!-- Error messages for the upload/download templates -->
 <script>
 var fileUploadErrors = {
     maxFileSize: 'File is too big',
@@ -62,6 +68,7 @@ <h2 id="qunit-userAgent"></h2>
     emptyResult: 'Empty file upload result'
 };
 </script>
+<!-- The template to display files available for upload -->
 <script id="template-upload" type="text/html">
 {% for (var i=0, files=o.files, l=files.length, file=files[0]; i<l; file=files[++i]) { %}
     <tr class="template-upload fade">
@@ -90,6 +97,7 @@ <h2 id="qunit-userAgent"></h2>
     </tr>
 {% } %}
 </script>
+<!-- The template to display files available for download -->
 <script id="template-download" type="text/html">
 {% for (var i=0, files=o.files, l=files.length, file=files[0]; i<l; file=files[++i]) { %}
     <tr class="template-download fade">
@@ -118,12 +126,12 @@ <h2 id="qunit-userAgent"></h2>
 {% } %}
 </script>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-<script src="../vendor/jquery.ui.widget.js"></script>
+<script src="../js/vendor/jquery.ui.widget.js"></script>
 <script src="http://blueimp.github.com/JavaScript-Templates/tmpl.min.js"></script>
 <script src="http://blueimp.github.com/JavaScript-Load-Image/load-image.min.js"></script>
-<script src="../jquery.iframe-transport.js"></script>
-<script src="../jquery.fileupload.js"></script>
-<script src="../jquery.fileupload-ui.js"></script>
+<script src="../js/jquery.iframe-transport.js"></script>
+<script src="../js/jquery.fileupload.js"></script>
+<script src="../js/jquery.fileupload-ui.js"></script>
 <script src="http://code.jquery.com/qunit/git/qunit.js"></script>
 <script src="test.js"></script>
 </body> 
