diff --git a/examples/blue.monday/demo-01-android.htm b/examples/blue.monday/demo-01-android.htm
index 512e300c..7bd6d7a6 100644
--- a/examples/blue.monday/demo-01-android.htm
+++ b/examples/blue.monday/demo-01-android.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
@@ -142,7 +142,7 @@
 	};
 
 	var options = {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3,oga",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-01-solution-flash-html.htm b/examples/blue.monday/demo-01-solution-flash-html.htm
index 82862f87..984126b8 100644
--- a/examples/blue.monday/demo-01-solution-flash-html.htm
+++ b/examples/blue.monday/demo-01-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "m4a, oga",
 		wmode: "window",
diff --git a/examples/blue.monday/demo-01-supplied-mp3.htm b/examples/blue.monday/demo-01-supplied-mp3.htm
index f1c8de87..6da60863 100644
--- a/examples/blue.monday/demo-01-supplied-mp3.htm
+++ b/examples/blue.monday/demo-01-supplied-mp3.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -19,7 +19,7 @@
 				mp3: "http://jplayer.org/audio/mp3/Miaow-07-Bubble.mp3"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-01-video-solution-flash-html.htm b/examples/blue.monday/demo-01-video-solution-flash-html.htm
index 1d9ee8eb..d3ecb821 100644
--- a/examples/blue.monday/demo-01-video-solution-flash-html.htm
+++ b/examples/blue.monday/demo-01-video-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -22,7 +22,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "webmv, ogv, m4v",
 		size: {
diff --git a/examples/blue.monday/demo-01-video-supplied-m4v.htm b/examples/blue.monday/demo-01-video-supplied-m4v.htm
index 89fe8653..a136ccff 100644
--- a/examples/blue.monday/demo-01-video-supplied-m4v.htm
+++ b/examples/blue.monday/demo-01-video-supplied-m4v.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4v",
 		size: {
 			width: "640px",
diff --git a/examples/blue.monday/demo-01-video-supplied-rtmpv.htm b/examples/blue.monday/demo-01-video-supplied-rtmpv.htm
index f597e9e2..f6a0c189 100644
--- a/examples/blue.monday/demo-01-video-supplied-rtmpv.htm
+++ b/examples/blue.monday/demo-01-video-supplied-rtmpv.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				poster: "http://www.jplayer.org/video/poster/space_alone.jpg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "rtmpv",
 		size: {
 			width: "640px",
diff --git a/examples/blue.monday/demo-01-video.htm b/examples/blue.monday/demo-01-video.htm
index f34a35ff..7fd59514 100644
--- a/examples/blue.monday/demo-01-video.htm
+++ b/examples/blue.monday/demo-01-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -22,7 +22,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		size: {
 			width: "640px",
diff --git a/examples/blue.monday/demo-01.htm b/examples/blue.monday/demo-01.htm
index edad6e28..46c3324a 100644
--- a/examples/blue.monday/demo-01.htm
+++ b/examples/blue.monday/demo-01.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-02-jPlayerPlaylist.htm b/examples/blue.monday/demo-02-jPlayerPlaylist.htm
index 636366c5..dc473764 100644
--- a/examples/blue.monday/demo-02-jPlayerPlaylist.htm
+++ b/examples/blue.monday/demo-02-jPlayerPlaylist.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -28,7 +28,7 @@
 		playlistOptions: {
 			enableRemoveControls: true
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/blue.monday/demo-02-media-solution-flash-html.htm b/examples/blue.monday/demo-02-media-solution-flash-html.htm
index 26121576..2c9dcd69 100644
--- a/examples/blue.monday/demo-02-media-solution-flash-html.htm
+++ b/examples/blue.monday/demo-02-media-solution-flash-html.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -84,7 +84,7 @@
 			poster: "http://www.jplayer.org/audio/poster/Miaow_640x360.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-02-media.htm b/examples/blue.monday/demo-02-media.htm
index dbaec0af..f84c9f44 100644
--- a/examples/blue.monday/demo-02-media.htm
+++ b/examples/blue.monday/demo-02-media.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -84,7 +84,7 @@
 			poster: "http://www.jplayer.org/audio/poster/Miaow_640x360.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/blue.monday/demo-02-multi.htm b/examples/blue.monday/demo-02-multi.htm
index d2ae06cb..6f6f3ad0 100644
--- a/examples/blue.monday/demo-02-multi.htm
+++ b/examples/blue.monday/demo-02-multi.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -43,7 +43,7 @@
 			poster: "http://www.jplayer.org/video/poster/Incredibles_Teaser_640x272.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		useStateClassSkin: true,
 		autoBlur: false,
@@ -124,7 +124,7 @@
 			oga:"http://www.jplayer.org/audio/ogg/Miaow-10-Thin-ice.ogg"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "oga, mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-02-video.htm b/examples/blue.monday/demo-02-video.htm
index f9f871cb..46fe1bb0 100644
--- a/examples/blue.monday/demo-02-video.htm
+++ b/examples/blue.monday/demo-02-video.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -43,7 +43,7 @@
 			poster: "http://www.jplayer.org/video/poster/Incredibles_Teaser_640x272.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/blue.monday/demo-02.htm b/examples/blue.monday/demo-02.htm
index db0f9cf7..532117c7 100644
--- a/examples/blue.monday/demo-02.htm
+++ b/examples/blue.monday/demo-02.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -86,7 +86,7 @@
 			oga:"http://www.jplayer.org/audio/ogg/Miaow-10-Thin-ice.ogg"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "oga, mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/blue.monday/demo-03-together.htm b/examples/blue.monday/demo-03-together.htm
index 876a5ead..3a534304 100644
--- a/examples/blue.monday/demo-03-together.htm
+++ b/examples/blue.monday/demo-03-together.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-08-Stirring-of-a-fool.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		wmode: "window",
 		globalVolume: true,
@@ -38,7 +38,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-02-Hidden.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_2",
 		wmode: "window",
@@ -57,7 +57,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_3",
 		wmode: "window",
diff --git a/examples/blue.monday/demo-03-video.htm b/examples/blue.monday/demo-03-video.htm
index 9fe8d75c..6799be78 100644
--- a/examples/blue.monday/demo-03-video.htm
+++ b/examples/blue.monday/demo-03-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -25,7 +25,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		globalVolume: true,
 		useStateClassSkin: true,
@@ -47,7 +47,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		cssSelectorAncestor: "#jp_container_2",
 		globalVolume: true,
@@ -70,7 +70,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		cssSelectorAncestor: "#jp_container_3",
 		globalVolume: true,
diff --git a/examples/blue.monday/demo-03.htm b/examples/blue.monday/demo-03.htm
index 1a6eda97..ca8097a7 100644
--- a/examples/blue.monday/demo-03.htm
+++ b/examples/blue.monday/demo-03.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
diff --git a/examples/blue.monday/demo-08.htm b/examples/blue.monday/demo-08.htm
index 122ba7ca..b51cbe48 100644
--- a/examples/blue.monday/demo-08.htm
+++ b/examples/blue.monday/demo-08.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -32,7 +32,7 @@
 				$(this).jPlayer("setMedia", stream).jPlayer("play");
 			}
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3",
 		preload: "none",
 		wmode: "window",
diff --git a/examples/blue.monday/demo-09-popcorn-video-solution-flash-html.htm b/examples/blue.monday/demo-09-popcorn-video-solution-flash-html.htm
index b65d54b9..7708b680 100644
--- a/examples/blue.monday/demo-09-popcorn-video-solution-flash-html.htm
+++ b/examples/blue.monday/demo-09-popcorn-video-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 
 <!--
 	Note that the insertion of jQuery and jPlayer above is optional.
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="../../lib/popcorn.ie8.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.player.js"></script>
-<script type="text/javascript" src="../../js/popcorn/popcorn.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/popcorn/popcorn.jplayer.min.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.subtitle.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -34,7 +34,7 @@
 			poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 		},
 		options: {
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			solution: "flash,html", // To prioritize Flash solution.
 			supplied: "webmv, ogv, m4v",
 			size: {
diff --git a/examples/blue.monday/demo-09-popcorn-video.htm b/examples/blue.monday/demo-09-popcorn-video.htm
index a3525552..905031ff 100644
--- a/examples/blue.monday/demo-09-popcorn-video.htm
+++ b/examples/blue.monday/demo-09-popcorn-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 
 <!--
 	Note that the insertion of jQuery and jPlayer above is optional.
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="../../lib/popcorn.ie8.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.player.js"></script>
-<script type="text/javascript" src="../../js/popcorn/popcorn.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/popcorn/popcorn.jplayer.min.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.subtitle.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -34,7 +34,7 @@
 			poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 		},
 		options: {
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "webmv, ogv, m4v",
 			size: {
 				width: "640px",
diff --git a/examples/blue.monday/jPlayer-tester.htm b/examples/blue.monday/jPlayer-tester.htm
index 2e4092f9..0c9ed723 100644
--- a/examples/blue.monday/jPlayer-tester.htm
+++ b/examples/blue.monday/jPlayer-tester.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/blue.monday/jplayer.blue.monday.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jquery.jplayer.inspector.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jquery.jplayer.inspector.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
@@ -16,7 +16,7 @@
 
 	$("#addHtmlFlash").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "m4v, ogv, m4a, mp3, oga",
 			errorAlerts:true,
 			warningAlerts:true
@@ -32,7 +32,7 @@
 
 	$("#addFlashHtml").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "m4v, ogv, m4a, mp3, oga",
 			solution: "flash, html",
 			errorAlerts:true,
@@ -49,11 +49,11 @@
 
 	$("#addCurrentTest").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
-			// swfPath: "../../js/jplayer/", // Check trailing slash
-			// swfPath: "../../js/jplayer/broken", // Check broken swfPath errors.
-			// swfPath: "../../js/jplayer/Jplayer.swf", // Check URLs work
-			// swfPath: "../../js/jplayer/Jplayer.SWF", // Check URLs extension case insensative (Apache did not mind the extension's case not matching and worked too.)
+			swfPath: "../../dist/jplayer",
+			// swfPath: "../../dist/jplayer/", // Check trailing slash
+			// swfPath: "../../dist/jplayer/broken", // Check broken swfPath errors.
+			// swfPath: "../../dist/jplayer/Jplayer.swf", // Check URLs work
+			// swfPath: "../../dist/jplayer/Jplayer.SWF", // Check URLs extension case insensative (Apache did not mind the extension's case not matching and worked too.)
 			// swfPath: "/", // Checks various
 			// supplied: "flv",
 			supplied: "flv,m4v,webmv",
@@ -149,7 +149,7 @@
 		play: function() {
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_2"
 	});
diff --git a/examples/other/demo-04.htm b/examples/other/demo-04.htm
index ef7920c7..b49e0c7e 100644
--- a/examples/other/demo-04.htm
+++ b/examples/other/demo-04.htm
@@ -6,7 +6,7 @@
 <title>Demo : jPlayer as a text based audio player</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <script type="text/javascript" src="jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
@@ -53,7 +53,7 @@
 		ended: function(event) {
 			my_playState.text(opt_text_selected);
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		cssSelectorAncestor: "#jp_container",
 		supplied: "mp3",
 		wmode: "window"
diff --git a/examples/other/demo-05.htm b/examples/other/demo-05.htm
index a4f262f9..e392d873 100644
--- a/examples/other/demo-05.htm
+++ b/examples/other/demo-05.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="stylesheet" href="../../skin/circle.player/circle.player.css">
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript" src="../../lib/jquery.transform2d.js"></script>
 <script type="text/javascript" src="../../lib/jquery.grab.js"></script>
 <script type="text/javascript" src="../../lib/mod.csstransforms.min.js"></script>
@@ -39,7 +39,7 @@
 		oga: "http://www.jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 	}, {
 		cssSelectorAncestor: "#cp_container_1",
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		wmode: "window",
 		keyEnabled: true
 	});
diff --git a/examples/other/demo-07.htm b/examples/other/demo-07.htm
index 0fb05c93..6cbbc92d 100644
--- a/examples/other/demo-07.htm
+++ b/examples/other/demo-07.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link rel="stylesheet" href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css">
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript" src="//code.jquery.com/ui/1.10.3/jquery-ui.js"></script>
 
 <script type="text/javascript">
@@ -59,7 +59,7 @@
 					myControl.volume.slider("value", event.jPlayer.options.volume);
 				}
 			},
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "m4a, oga",
 			cssSelectorAncestor: "#jp_container_1",
 			wmode: "window",
diff --git a/examples/pink.flag/demo-01-android.htm b/examples/pink.flag/demo-01-android.htm
index 8bb7ccb3..fc4c88cb 100644
--- a/examples/pink.flag/demo-01-android.htm
+++ b/examples/pink.flag/demo-01-android.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
@@ -142,7 +142,7 @@
 	};
 
 	var options = {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3,oga",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-01-solution-flash-html.htm b/examples/pink.flag/demo-01-solution-flash-html.htm
index 2ad568a9..00fed16a 100644
--- a/examples/pink.flag/demo-01-solution-flash-html.htm
+++ b/examples/pink.flag/demo-01-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "m4a, oga",
 		wmode: "window",
diff --git a/examples/pink.flag/demo-01-supplied-mp3.htm b/examples/pink.flag/demo-01-supplied-mp3.htm
index 8d656a03..a1c70ca7 100644
--- a/examples/pink.flag/demo-01-supplied-mp3.htm
+++ b/examples/pink.flag/demo-01-supplied-mp3.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -19,7 +19,7 @@
 				mp3: "http://jplayer.org/audio/mp3/Miaow-07-Bubble.mp3"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-01-video-solution-flash-html.htm b/examples/pink.flag/demo-01-video-solution-flash-html.htm
index 26d4fca6..82c9fc41 100644
--- a/examples/pink.flag/demo-01-video-solution-flash-html.htm
+++ b/examples/pink.flag/demo-01-video-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -22,7 +22,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "webmv, ogv, m4v",
 		size: {
diff --git a/examples/pink.flag/demo-01-video-supplied-m4v.htm b/examples/pink.flag/demo-01-video-supplied-m4v.htm
index 985925cb..0dbe6758 100644
--- a/examples/pink.flag/demo-01-video-supplied-m4v.htm
+++ b/examples/pink.flag/demo-01-video-supplied-m4v.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4v",
 		size: {
 			width: "640px",
diff --git a/examples/pink.flag/demo-01-video-supplied-rtmpv.htm b/examples/pink.flag/demo-01-video-supplied-rtmpv.htm
index d7b91dad..d5643087 100644
--- a/examples/pink.flag/demo-01-video-supplied-rtmpv.htm
+++ b/examples/pink.flag/demo-01-video-supplied-rtmpv.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				poster: "http://www.jplayer.org/video/poster/space_alone.jpg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "rtmpv",
 		size: {
 			width: "640px",
diff --git a/examples/pink.flag/demo-01-video.htm b/examples/pink.flag/demo-01-video.htm
index db6cf025..3e2ac845 100644
--- a/examples/pink.flag/demo-01-video.htm
+++ b/examples/pink.flag/demo-01-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -22,7 +22,7 @@
 				poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		size: {
 			width: "640px",
diff --git a/examples/pink.flag/demo-01.htm b/examples/pink.flag/demo-01.htm
index 16c729ea..4f09c8d2 100644
--- a/examples/pink.flag/demo-01.htm
+++ b/examples/pink.flag/demo-01.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-02-jPlayerPlaylist.htm b/examples/pink.flag/demo-02-jPlayerPlaylist.htm
index e49c27ba..87d3d938 100644
--- a/examples/pink.flag/demo-02-jPlayerPlaylist.htm
+++ b/examples/pink.flag/demo-02-jPlayerPlaylist.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -28,7 +28,7 @@
 		playlistOptions: {
 			enableRemoveControls: true
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/pink.flag/demo-02-media-solution-flash-html.htm b/examples/pink.flag/demo-02-media-solution-flash-html.htm
index 23b4f3f1..ff47c3ef 100644
--- a/examples/pink.flag/demo-02-media-solution-flash-html.htm
+++ b/examples/pink.flag/demo-02-media-solution-flash-html.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -84,7 +84,7 @@
 			poster: "http://www.jplayer.org/audio/poster/Miaow_640x360.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		solution: "flash, html",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-02-media.htm b/examples/pink.flag/demo-02-media.htm
index 3a2cdf27..201a841c 100644
--- a/examples/pink.flag/demo-02-media.htm
+++ b/examples/pink.flag/demo-02-media.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -84,7 +84,7 @@
 			poster: "http://www.jplayer.org/audio/poster/Miaow_640x360.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v, oga, mp3",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/pink.flag/demo-02-multi.htm b/examples/pink.flag/demo-02-multi.htm
index df51452f..b2e6ef33 100644
--- a/examples/pink.flag/demo-02-multi.htm
+++ b/examples/pink.flag/demo-02-multi.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -43,7 +43,7 @@
 			poster: "http://www.jplayer.org/video/poster/Incredibles_Teaser_640x272.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		useStateClassSkin: true,
 		autoBlur: false,
@@ -124,7 +124,7 @@
 			oga:"http://www.jplayer.org/audio/ogg/Miaow-10-Thin-ice.ogg"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "oga, mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-02-video.htm b/examples/pink.flag/demo-02-video.htm
index 84d200d0..00247b4b 100644
--- a/examples/pink.flag/demo-02-video.htm
+++ b/examples/pink.flag/demo-02-video.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -43,7 +43,7 @@
 			poster: "http://www.jplayer.org/video/poster/Incredibles_Teaser_640x272.png"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		useStateClassSkin: true,
 		autoBlur: false,
diff --git a/examples/pink.flag/demo-02.htm b/examples/pink.flag/demo-02.htm
index 3ec0979f..3adbd4c0 100644
--- a/examples/pink.flag/demo-02.htm
+++ b/examples/pink.flag/demo-02.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jplayer.playlist.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jplayer.playlist.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -86,7 +86,7 @@
 			oga:"http://www.jplayer.org/audio/ogg/Miaow-10-Thin-ice.ogg"
 		}
 	], {
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "oga, mp3",
 		wmode: "window",
 		useStateClassSkin: true,
diff --git a/examples/pink.flag/demo-03-together.htm b/examples/pink.flag/demo-03-together.htm
index 59d948cc..03bcd83d 100644
--- a/examples/pink.flag/demo-03-together.htm
+++ b/examples/pink.flag/demo-03-together.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -20,7 +20,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-08-Stirring-of-a-fool.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		wmode: "window",
 		globalVolume: true,
@@ -38,7 +38,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-02-Hidden.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_2",
 		wmode: "window",
@@ -57,7 +57,7 @@
 				oga: "http://www.jplayer.org/audio/ogg/Miaow-07-Bubble.ogg"
 			});
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_3",
 		wmode: "window",
diff --git a/examples/pink.flag/demo-03-video.htm b/examples/pink.flag/demo-03-video.htm
index d8a4089c..9812b1e5 100644
--- a/examples/pink.flag/demo-03-video.htm
+++ b/examples/pink.flag/demo-03-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -25,7 +25,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		globalVolume: true,
 		useStateClassSkin: true,
@@ -47,7 +47,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		cssSelectorAncestor: "#jp_container_2",
 		globalVolume: true,
@@ -70,7 +70,7 @@
 		play: function() { // To avoid multiple jPlayers playing together.
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "webmv, ogv, m4v",
 		cssSelectorAncestor: "#jp_container_3",
 		globalVolume: true,
diff --git a/examples/pink.flag/demo-03.htm b/examples/pink.flag/demo-03.htm
index b541dd4b..5fb03667 100644
--- a/examples/pink.flag/demo-03.htm
+++ b/examples/pink.flag/demo-03.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
diff --git a/examples/pink.flag/demo-08.htm b/examples/pink.flag/demo-08.htm
index 6f6cfff5..dfc88345 100644
--- a/examples/pink.flag/demo-08.htm
+++ b/examples/pink.flag/demo-08.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function(){
@@ -32,7 +32,7 @@
 				$(this).jPlayer("setMedia", stream).jPlayer("play");
 			}
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "mp3",
 		preload: "none",
 		wmode: "window",
diff --git a/examples/pink.flag/demo-09-popcorn-video-solution-flash-html.htm b/examples/pink.flag/demo-09-popcorn-video-solution-flash-html.htm
index dfbfbf08..b63ef3ad 100644
--- a/examples/pink.flag/demo-09-popcorn-video-solution-flash-html.htm
+++ b/examples/pink.flag/demo-09-popcorn-video-solution-flash-html.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 
 <!--
 	Note that the insertion of jQuery and jPlayer above is optional.
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="../../lib/popcorn.ie8.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.player.js"></script>
-<script type="text/javascript" src="../../js/popcorn/popcorn.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/popcorn/popcorn.jplayer.min.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.subtitle.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -34,7 +34,7 @@
 			poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 		},
 		options: {
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			solution: "flash,html", // To prioritize Flash solution.
 			supplied: "webmv, ogv, m4v",
 			size: {
diff --git a/examples/pink.flag/demo-09-popcorn-video.htm b/examples/pink.flag/demo-09-popcorn-video.htm
index bb852350..5f8c1d2f 100644
--- a/examples/pink.flag/demo-09-popcorn-video.htm
+++ b/examples/pink.flag/demo-09-popcorn-video.htm
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
 
 <!--
 	Note that the insertion of jQuery and jPlayer above is optional.
@@ -18,7 +18,7 @@
 <script type="text/javascript" src="../../lib/popcorn.ie8.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.player.js"></script>
-<script type="text/javascript" src="../../js/popcorn/popcorn.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/popcorn/popcorn.jplayer.min.js"></script>
 <script type="text/javascript" src="../../lib/popcorn.subtitle.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -34,7 +34,7 @@
 			poster: "http://www.jplayer.org/video/poster/Big_Buck_Bunny_Trailer_480x270.png"
 		},
 		options: {
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "webmv, ogv, m4v",
 			size: {
 				width: "640px",
diff --git a/examples/pink.flag/jPlayer-tester.htm b/examples/pink.flag/jPlayer-tester.htm
index 3b4559de..6f4044bb 100644
--- a/examples/pink.flag/jPlayer-tester.htm
+++ b/examples/pink.flag/jPlayer-tester.htm
@@ -7,8 +7,8 @@
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <link href="../../skin/pink.flag/jplayer.pink.flag.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="../../lib/jquery.min.js"></script>
-<script type="text/javascript" src="../../js/jplayer/jquery.jplayer.min.js"></script>
-<script type="text/javascript" src="../../js/add-on/jquery.jplayer.inspector.min.js"></script>
+<script type="text/javascript" src="../../dist/jplayer/jquery.jplayer.min.js"></script>
+<script type="text/javascript" src="../../dist/add-on/jquery.jplayer.inspector.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 
@@ -16,7 +16,7 @@
 
 	$("#addHtmlFlash").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "m4v, ogv, m4a, mp3, oga",
 			errorAlerts:true,
 			warningAlerts:true
@@ -32,7 +32,7 @@
 
 	$("#addFlashHtml").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
+			swfPath: "../../dist/jplayer",
 			supplied: "m4v, ogv, m4a, mp3, oga",
 			solution: "flash, html",
 			errorAlerts:true,
@@ -49,11 +49,11 @@
 
 	$("#addCurrentTest").click( function() {
 		$("#jquery_jplayer").jPlayer({
-			swfPath: "../../js/jplayer",
-			// swfPath: "../../js/jplayer/", // Check trailing slash
-			// swfPath: "../../js/jplayer/broken", // Check broken swfPath errors.
-			// swfPath: "../../js/jplayer/Jplayer.swf", // Check URLs work
-			// swfPath: "../../js/jplayer/Jplayer.SWF", // Check URLs extension case insensative (Apache did not mind the extension's case not matching and worked too.)
+			swfPath: "../../dist/jplayer",
+			// swfPath: "../../dist/jplayer/", // Check trailing slash
+			// swfPath: "../../dist/jplayer/broken", // Check broken swfPath errors.
+			// swfPath: "../../dist/jplayer/Jplayer.swf", // Check URLs work
+			// swfPath: "../../dist/jplayer/Jplayer.SWF", // Check URLs extension case insensative (Apache did not mind the extension's case not matching and worked too.)
 			// swfPath: "/", // Checks various
 			// supplied: "flv",
 			supplied: "flv,m4v,webmv",
@@ -149,7 +149,7 @@
 		play: function() {
 			$(this).jPlayer("pauseOthers");
 		},
-		swfPath: "../../js/jplayer",
+		swfPath: "../../dist/jplayer",
 		supplied: "m4a, oga",
 		cssSelectorAncestor: "#jp_container_2"
 	});