diff --git a/modules/jplayer/Jplayer.swf b/modules/jquery-jplayer/Jplayer.swf
similarity index 100%
rename from modules/jplayer/Jplayer.swf
rename to modules/jquery-jplayer/Jplayer.swf
diff --git a/modules/jplayer/jplayer.midnight.black.interface.png b/modules/jquery-jplayer/jplayer.midnight.black.interface.png
similarity index 100%
rename from modules/jplayer/jplayer.midnight.black.interface.png
rename to modules/jquery-jplayer/jplayer.midnight.black.interface.png
diff --git a/modules/jplayer/jplayer.midnight.black.playlist.png b/modules/jquery-jplayer/jplayer.midnight.black.playlist.png
similarity index 100%
rename from modules/jplayer/jplayer.midnight.black.playlist.png
rename to modules/jquery-jplayer/jplayer.midnight.black.playlist.png
diff --git a/modules/jplayer/jplayer.midnight.black.png b/modules/jquery-jplayer/jplayer.midnight.black.png
similarity index 100%
rename from modules/jplayer/jplayer.midnight.black.png
rename to modules/jquery-jplayer/jplayer.midnight.black.png
diff --git a/modules/jplayer/jplayer.midnight.black.seeking.gif b/modules/jquery-jplayer/jplayer.midnight.black.seeking.gif
similarity index 100%
rename from modules/jplayer/jplayer.midnight.black.seeking.gif
rename to modules/jquery-jplayer/jplayer.midnight.black.seeking.gif
diff --git a/modules/jplayer/jplayer.midnight.black.video.play.png b/modules/jquery-jplayer/jplayer.midnight.black.video.play.png
similarity index 100%
rename from modules/jplayer/jplayer.midnight.black.video.play.png
rename to modules/jquery-jplayer/jplayer.midnight.black.video.play.png
diff --git a/modules/jplayer/jplayer.playlist.min.js b/modules/jquery-jplayer/jplayer.playlist.min.js
similarity index 100%
rename from modules/jplayer/jplayer.playlist.min.js
rename to modules/jquery-jplayer/jplayer.playlist.min.js
diff --git a/modules/jplayer/jquery.jplayer.min.js b/modules/jquery-jplayer/jquery.jplayer.min.js
similarity index 100%
rename from modules/jplayer/jquery.jplayer.min.js
rename to modules/jquery-jplayer/jquery.jplayer.min.js
diff --git a/modules/jquery/animated-overlay.gif b/modules/jquery-ui/animated-overlay.gif
similarity index 100%
rename from modules/jquery/animated-overlay.gif
rename to modules/jquery-ui/animated-overlay.gif
diff --git a/modules/jquery/images/animated-overlay.gif b/modules/jquery-ui/images/animated-overlay.gif
similarity index 100%
rename from modules/jquery/images/animated-overlay.gif
rename to modules/jquery-ui/images/animated-overlay.gif
diff --git a/modules/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png b/modules/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from modules/jquery/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to modules/jquery-ui/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/modules/jquery/images/ui-bg_flat_75_ffffff_40x100.png b/modules/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from modules/jquery/images/ui-bg_flat_75_ffffff_40x100.png
rename to modules/jquery-ui/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/modules/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png b/modules/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from modules/jquery/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to modules/jquery-ui/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/modules/jquery/images/ui-bg_glass_65_ffffff_1x400.png b/modules/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from modules/jquery/images/ui-bg_glass_65_ffffff_1x400.png
rename to modules/jquery-ui/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/modules/jquery/images/ui-bg_glass_75_dadada_1x400.png b/modules/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from modules/jquery/images/ui-bg_glass_75_dadada_1x400.png
rename to modules/jquery-ui/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/modules/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png b/modules/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from modules/jquery/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to modules/jquery-ui/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/modules/jquery/images/ui-bg_glass_95_fef1ec_1x400.png b/modules/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from modules/jquery/images/ui-bg_glass_95_fef1ec_1x400.png
rename to modules/jquery-ui/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/modules/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/modules/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from modules/jquery/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to modules/jquery-ui/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/modules/jquery/images/ui-icons_222222_256x240.png b/modules/jquery-ui/images/ui-icons_222222_256x240.png
similarity index 100%
rename from modules/jquery/images/ui-icons_222222_256x240.png
rename to modules/jquery-ui/images/ui-icons_222222_256x240.png
diff --git a/modules/jquery/images/ui-icons_2e83ff_256x240.png b/modules/jquery-ui/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from modules/jquery/images/ui-icons_2e83ff_256x240.png
rename to modules/jquery-ui/images/ui-icons_2e83ff_256x240.png
diff --git a/modules/jquery/images/ui-icons_454545_256x240.png b/modules/jquery-ui/images/ui-icons_454545_256x240.png
similarity index 100%
rename from modules/jquery/images/ui-icons_454545_256x240.png
rename to modules/jquery-ui/images/ui-icons_454545_256x240.png
diff --git a/modules/jquery/images/ui-icons_888888_256x240.png b/modules/jquery-ui/images/ui-icons_888888_256x240.png
similarity index 100%
rename from modules/jquery/images/ui-icons_888888_256x240.png
rename to modules/jquery-ui/images/ui-icons_888888_256x240.png
diff --git a/modules/jquery/images/ui-icons_cd0a0a_256x240.png b/modules/jquery-ui/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from modules/jquery/images/ui-icons_cd0a0a_256x240.png
rename to modules/jquery-ui/images/ui-icons_cd0a0a_256x240.png
diff --git a/modules/jquery/jquery-ui.min.css b/modules/jquery-ui/jquery-ui.min.css
similarity index 100%
rename from modules/jquery/jquery-ui.min.css
rename to modules/jquery-ui/jquery-ui.min.css
diff --git a/modules/jquery/jquery-ui.min.js b/modules/jquery-ui/jquery-ui.min.js
similarity index 100%
rename from modules/jquery/jquery-ui.min.js
rename to modules/jquery-ui/jquery-ui.min.js
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 947a8a4b..7da1fa4f 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -40,10 +40,10 @@ if (AmpConfig::get('use_rss')) { ?>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo AmpConfig::get('site_charset'); ?>" />
 <title><?php echo scrub_out(AmpConfig::get('site_title')); ?> - <?php echo $location['title']; ?></title>
 <?php require_once AmpConfig::get('prefix') . '/templates/stylesheets.inc.php'; ?>
-<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery/jquery-ui.min.css" type="text/css" media="screen" />
+<link rel="stylesheet" href="<?php echo $web_path; ?>/modules/jquery-ui/jquery-ui.min.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="<?php echo $web_path; ?>/modules/tag-it/jquery.tagit.css" type="text/css" media="screen" />
 <script src="<?php echo $web_path; ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
-<script src="<?php echo $web_path; ?>/modules/jquery/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
+<script src="<?php echo $web_path; ?>/modules/jquery-ui/jquery-ui.min.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo $web_path; ?>/modules/prettyPhoto/js/jquery.prettyPhoto.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo $web_path; ?>/modules/tag-it/tag-it.min.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo $web_path; ?>/modules/noty/packaged/jquery.noty.packaged.min.js" language="javascript" type="text/javascript"></script>
diff --git a/templates/jplayer.midnight.black-iframed.css b/templates/jplayer.midnight.black-iframed.css
index a08f1f6b..899c5ade 100644
--- a/templates/jplayer.midnight.black-iframed.css
+++ b/templates/jplayer.midnight.black-iframed.css
@@ -109,7 +109,7 @@ div.jp-video-full div.jp-interface {
 
 div.jp-interface {
 	position: relative;
-	/*background: #191919 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
+	/*background: #191919 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
     background-color: rgb(25, 25, 25);
 	width: 100%;
 	z-index: 9999;
@@ -190,7 +190,7 @@ a.jp-pause {
 }
 
 a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
-	background: url("../modules/jplayer/jplayer.midnight.black.png") no-repeat;
+	background: url("../modules/jquery-jplayer/jplayer.midnight.black.png") no-repeat;
 }
 
 a.jp-play {
@@ -457,7 +457,7 @@ div.jp-title {
 	font-weight: bold;
 	text-align: center;
 	color: #FFF;
-	background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x
+	background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x
 }
 
 div.playing_info {
@@ -563,7 +563,7 @@ div.jp-title li {
 div.jp-playlist li {
 	padding: 6px 15px;
 	border-bottom: 1px solid #121212;
-	/*background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x;*/
+	/*background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x;*/
 	text-shadow: 0 1px 0 rgba(0,0,0,0.3);
 }
 
@@ -649,11 +649,11 @@ a.jp-video-play-icon {
 	left: 50%;
 	top: 50%;
 
-	background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
+	background: url("../modules/jquery-jplayer/jquery-jplayer.midnight.black.video.play.png") 0 0 no-repeat;
 	text-indent: -9999px;
 }
 div.jp-video-play:hover a.jp-video-play-icon {
-	background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
+	background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
 }
 
 
@@ -782,7 +782,7 @@ a.jp-shuffle-off:hover {
 .jp-no-solution {
 	padding: 5px;
 	font-size: .67em;
-	background: #121112 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;
+	background: #121112 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;
 	border-top: 1px solid #191919;
 	color: #CCC;
 	display: none;
diff --git a/templates/jplayer.midnight.black.css b/templates/jplayer.midnight.black.css
index eea93b8a..fb70f176 100644
--- a/templates/jplayer.midnight.black.css
+++ b/templates/jplayer.midnight.black.css
@@ -98,7 +98,7 @@ div.jp-video-full div.jp-interface {
 
 div.jp-interface {
 	position: relative;
-	/*background: #191919 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
+	/*background: #191919 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;*/
     background-color: rgb(25, 25, 25);
 	width: 100%;
 }
@@ -178,7 +178,7 @@ a.jp-pause {
 }
 
 a.jp-play, a.jp-play:hover, a.jp-pause, a.jp-pause:hover, a.jp-stop, a.jp-stop:hover, a.jp-previous, a.jp-previous:hover, a.jp-next, a.jp-next:hover, div.jp-seek-bar, div.jp-play-bar, a.jp-mute, a.jp-mute:hover, a.jp-unmute, a.jp-unmute:hover, a.jp-volume-max, a.jp-volume-max:hover, div.jp-volume-bar, div.jp-audio, div.jp-volume-bar, div.jp-volume-bar-value, a.jp-full-screen, a.jp-full-screen:hover, a.jp-restore-screen, a.jp-restore-screen:hover, a.jp-repeat, a.jp-repeat:hover, a.jp-repeat-off, a.jp-repeat-off:hover, a.jp-shuffle, a.jp-shuffle:hover, a.jp-shuffle-off, a.jp-shuffle-off:hover {
-	background: url("../modules/jplayer/jplayer.midnight.black.png") no-repeat;
+	background: url("../modules/jquery-jplayer/jplayer.midnight.black.png") no-repeat;
 }
 
 a.jp-play {
@@ -443,7 +443,7 @@ div.jp-title {
 	font-weight: bold;
 	text-align: center;
 	color: #FFF;
-	background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x
+	background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x
 }
 
 div.playing_info {
@@ -493,7 +493,7 @@ div.jp-title li {
 div.jp-playlist li {
 	padding: 6px 15px;
 	border-bottom: 1px solid #121212;
-	background: #343433 url("../modules/jplayer/jplayer.midnight.black.playlist.png") repeat-x;
+	background: #343433 url("../modules/jquery-jplayer/jplayer.midnight.black.playlist.png") repeat-x;
 	text-shadow: 0 1px 0 rgba(0,0,0,0.3);
 }
 
@@ -579,11 +579,11 @@ a.jp-video-play-icon {
 	left: 50%;
 	top: 50%;
 
-	background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
+	background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 0 no-repeat;
 	text-indent: -9999px;
 }
 div.jp-video-play:hover a.jp-video-play-icon {
-	background: url("../modules/jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
+	background: url("../modules/jquery-jplayer/jplayer.midnight.black.video.play.png") 0 -100px no-repeat;
 }
 
 
@@ -712,7 +712,7 @@ a.jp-shuffle-off:hover {
 .jp-no-solution {
 	padding: 5px;
 	font-size: .67em;
-	background: #121112 url("../modules/jplayer/jplayer.midnight.black.interface.png") repeat-x;
+	background: #121112 url("../modules/jquery-jplayer/jplayer.midnight.black.interface.png") repeat-x;
 	border-top: 1px solid #191919;
 	color: #CCC;
 	display: none;
diff --git a/templates/show_html5_player.inc.php b/templates/show_html5_player.inc.php
index bea116ad..4dbea434 100644
--- a/templates/show_html5_player.inc.php
+++ b/templates/show_html5_player.inc.php
@@ -15,8 +15,8 @@ if (!$iframed || $is_share) {
 ?>
 <script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.min.js" language="javascript" type="text/javascript"></script>
 <script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery/jquery.cookie.js" language="javascript" type="text/javascript"></script>
-<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/jquery.jplayer.min.js" language="javascript" type="text/javascript"></script>
-<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/jplayer.playlist.min.js" language="javascript" type="text/javascript"></script>
+<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/jquery.jplayer.min.js" language="javascript" type="text/javascript"></script>
+<script src="<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/jplayer.playlist.min.js" language="javascript" type="text/javascript"></script>
 <?php
 if ($iframed) {
 ?>
@@ -57,7 +57,7 @@ var timeoffset = 0;
                 removeTime: 'fast',
                 shuffleTime: 'slow'
             },
-            swfPath: "<?php echo AmpConfig::get('web_path'); ?>/modules/jplayer/",
+            swfPath: "<?php echo AmpConfig::get('web_path'); ?>/modules/jquery-jplayer/",
             audioFullScreen: true,
             smoothPlayBar: true,
             keyEnabled: true,