diff --git a/build/melody/minify-static b/build/melody/minify-static
index 90c88b62d..b93958a8c 100755
--- a/build/melody/minify-static
+++ b/build/melody/minify-static
@@ -31,7 +31,7 @@ cat                                 \
     mt-static/css/structure.css     \
     mt-static/css/messaging.css     \
     mt-static/css/utilities.css     \
-    mt-static/melody/styles.css     \
+    mt-static/css/melody-styles.css     \
 >| mt-static/css/main.css           \
 && ./build/minifier.pl mt-static/css/main.css
 
@@ -41,7 +41,7 @@ cat                                 \
     mt-static/css/utilities.css     \
     mt-static/css/messaging.css     \
     mt-static/css/chromeless.css    \
-    mt-static/melody/chromeless.css \
+    mt-static/css/melody-chromeless.css \
  >| mt-static/css/simple.css        \
  && ./build/minifier.pl mt-static/css/simple.css
 
diff --git a/check/check.css b/check/check.css
index 94a2b2576..abca88a33 100644
--- a/check/check.css
+++ b/check/check.css
@@ -13,7 +13,7 @@ body.has-static {
 }
 
 body.has-static #header {
-    background: #6B3081 url('$static_path/melody/melody-logo-white-banner.png') no-repeat 25px 10px;
+    background: #6B3081 url('$static_path/images/melody/melody-logo-white-banner.png') no-repeat 25px 10px;
     height: 55px;
 }
 
diff --git a/index.html b/index.html
index e90d732dd..ae09aaae9 100644
--- a/index.html
+++ b/index.html
@@ -47,7 +47,7 @@
             height: 108px;
             font-size: 24px;
             font-weight: normal;
-            background: transparent url(mt-static/melody/melody-logo.png) no-repeat scroll top center;
+            background: transparent url(mt-static/images/melody/melody-logo.png) no-repeat scroll top center;
         }
         .chromeless #content h1 span {
             visibility: hidden;
diff --git a/mt-static/melody/chromeless.css b/mt-static/css/melody-chromeless.css
similarity index 96%
rename from mt-static/melody/chromeless.css
rename to mt-static/css/melody-chromeless.css
index 80c9f625a..82dace367 100644
--- a/mt-static/melody/chromeless.css
+++ b/mt-static/css/melody-chromeless.css
@@ -7,7 +7,7 @@
     width:250px;
     height:73px;
     margin:30px auto 0 auto;
-    background:url('../melody/melody-logo-white-banner.png') no-repeat!important;
+    background:url('../images/melody/melody-logo-white-banner.png') no-repeat!important;
 }
 
 
diff --git a/mt-static/melody/quicklook.css b/mt-static/css/melody-quicklook.css
similarity index 91%
rename from mt-static/melody/quicklook.css
rename to mt-static/css/melody-quicklook.css
index 839aaa7df..2f6337bf5 100644
--- a/mt-static/melody/quicklook.css
+++ b/mt-static/css/melody-quicklook.css
@@ -36,7 +36,7 @@
   position: absolute;
   z-index: 99;
   bottom: -70px;
-  background: url("bottom-fade.png") repeat-x bottom left;
+  background: url('../images/melody/bottom-fade.png') repeat-x bottom left;
   display: block;
   width: 100%;
   height: 100px;
diff --git a/mt-static/melody/styles.css b/mt-static/css/melody-styles.css
similarity index 88%
rename from mt-static/melody/styles.css
rename to mt-static/css/melody-styles.css
index 26ab44f95..c90217084 100644
--- a/mt-static/melody/styles.css
+++ b/mt-static/css/melody-styles.css
@@ -13,7 +13,7 @@
     display: block;
     width: 150px;
     height: 41px;
-    background: url('../melody/melody-logo-white-banner.png') no-repeat;
+    background: url('../images/melody/melody-logo-white-banner.png') no-repeat;
 }
 
 /* Redesigned Plugins Screen */
@@ -48,7 +48,7 @@
 }
 #template-body-actions .fullscreen,
 #editor-content .editor-toolbar .fullscreen {
-  background-image: url('fullscreen-icon.gif');
+  background-image: url('../images/melody/fullscreen-icon.gif');
 }
 .edit-template .fullscreen #title-field #title {
   width: 890px;
diff --git a/mt-static/melody/mt.dialog.css b/mt-static/css/melody.dialog.css
similarity index 88%
rename from mt-static/melody/mt.dialog.css
rename to mt-static/css/melody.dialog.css
index 28e70e824..f9aace162 100644
--- a/mt-static/melody/mt.dialog.css
+++ b/mt-static/css/melody.dialog.css
@@ -14,7 +14,7 @@
 }
 
 .ui-dialog-inner {
-	background: url('../../../images/content.jpg') repeat-x;
+	background: url('../images/content.jpg') repeat-x;
     border-collapse:separate;
     position:relative;
     left:0;
@@ -50,7 +50,7 @@
 .mt.ui-dialog .ui-dialog-titlebar-close {
 	width: 16px;
 	height: 16px;
-	background: url(i/dialog-titlebar-close.png) no-repeat;
+	background: url(../jquery/themes/flora/i/dialog-titlebar-close.png) no-repeat;
 	position:absolute;
 	top: 20px;
 	right: 10px;
@@ -64,7 +64,7 @@
 
 .mt .ui-dialog .ui-dialog-titlebar-close-hover,
 .mt.ui-dialog .ui-dialog-titlebar-close-hover {
-	background: url(i/dialog-titlebar-close-hover.png) no-repeat;
+	background: url(../jquery/themes/flora/i/dialog-titlebar-close-hover.png) no-repeat;
 }
 
 .mt .ui-dialog .ui-dialog-title,
@@ -104,7 +104,7 @@
 .mt .ui-dialog .ui-dialog-buttonpane button,
 .mt.ui-dialog .ui-dialog-buttonpane button {
     margin: 6px 6px 16px 6px;
-    background: #333 url('../../../images/buttons/button.gif') no-repeat 0 center;
+    background: #333 url('../images/buttons/button.gif') no-repeat 0 center;
 	border: none;
 	border-top: 1px solid #d4d4d4;
 	font-weight: bold;
@@ -118,7 +118,7 @@
 
 .mt .ui-dialog .ui-dialog-buttonpane button:first-child,
 .mt.ui-dialog .ui-dialog-buttonpane button:first-child {
-    background-image: url('../../../images/buttons/button-primary.gif');
+    background-image: url('../images/buttons/button-primary.gif');
 }
 
 /* Dialog handle styles */
@@ -151,14 +151,14 @@
 
 /* Overlays */
 .ui-widget-overlay { 
-  background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
+  background: #aaaaaa url(jquery/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
   opacity: .6;
   filter:Alpha(Opacity=30); 
 }
 .ui-widget-shadow { 
   margin: -8px 0 0 -8px; 
   padding: 8px; 
-  background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
+  background: #aaaaaa url(jquery/images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; 
   opacity: .3;
   filter:Alpha(Opacity=30);
   -moz-border-radius: 8px;
diff --git a/mt-static/css/structure.css b/mt-static/css/structure.css
index 720f394e5..70f0b9bc2 100644
--- a/mt-static/css/structure.css
+++ b/mt-static/css/structure.css
@@ -184,10 +184,10 @@ body.system #header {background: #6B3081 url('../images/header-inner.gif') repea
     display: block;
     width: 150px;
     height: 40px;
-    background: url('../melody/melody-logo-white-banner.png') no-repeat;
+    background: url('../images/melody/melody-logo-white-banner.png') no-repeat;
 }
 .system #brand a {
-    background-image: url('../melody/melody-logo-white-banner.png');
+    background-image: url('../images/melody/melody-logo-white-banner.png');
 }
 #brand span {
     position: relative;
@@ -5115,7 +5115,7 @@ background: #C9E1EE;
     margin: 0 4px 0 0;
     padding: 0;
     color: #000;
-    background: url(../../codepress/images/toggle.gif) left top no-repeat;
+    background: url(../codepress/images/toggle.gif) left top no-repeat;
     text-indent: 1000em;
     min-width: 0;
     -moz-user-select: none !important;
diff --git a/mt-static/melody/bottom-fade.png b/mt-static/images/melody/bottom-fade.png
similarity index 100%
rename from mt-static/melody/bottom-fade.png
rename to mt-static/images/melody/bottom-fade.png
diff --git a/mt-static/melody/fullscreen-icon.gif b/mt-static/images/melody/fullscreen-icon.gif
similarity index 100%
rename from mt-static/melody/fullscreen-icon.gif
rename to mt-static/images/melody/fullscreen-icon.gif
diff --git a/mt-static/melody/icon-comment.png b/mt-static/images/melody/icon-comment.png
similarity index 100%
rename from mt-static/melody/icon-comment.png
rename to mt-static/images/melody/icon-comment.png
diff --git a/mt-static/melody/icon-error.gif b/mt-static/images/melody/icon-error.gif
similarity index 100%
rename from mt-static/melody/icon-error.gif
rename to mt-static/images/melody/icon-error.gif
diff --git a/mt-static/melody/melody-logo-transparent-w.png b/mt-static/images/melody/melody-logo-transparent-w.png
similarity index 100%
rename from mt-static/melody/melody-logo-transparent-w.png
rename to mt-static/images/melody/melody-logo-transparent-w.png
diff --git a/mt-static/melody/melody-logo-white-banner.png b/mt-static/images/melody/melody-logo-white-banner.png
similarity index 100%
rename from mt-static/melody/melody-logo-white-banner.png
rename to mt-static/images/melody/melody-logo-white-banner.png
diff --git a/mt-static/melody/melody-logo.png b/mt-static/images/melody/melody-logo.png
similarity index 100%
rename from mt-static/melody/melody-logo.png
rename to mt-static/images/melody/melody-logo.png
diff --git a/mt-static/js/melody/list_entry.js b/mt-static/js/melody/list_entry.js
index d212f0539..8c2d85fe5 100644
--- a/mt-static/js/melody/list_entry.js
+++ b/mt-static/js/melody/list_entry.js
@@ -71,7 +71,7 @@ function ajax_publish( id ) {
         url: url,
         dataType: 'json',
         error: function (xhr, status, error) {
-            link.css('background','url('+StaticURI+'melody/icon-error.gif) no-repeat center -1px');
+            link.css('background','url('+StaticURI+'images/melody/icon-error.gif) no-repeat center -1px');
             jQuery('.listing tr.obj-'+id).removeClass('publishing').addClass('has_errors');
         },
         success: function (data, status, xhr) {
@@ -87,7 +87,7 @@ function ajax_publish( id ) {
                     link.css('background','url('+StaticURI+'images/nav-icon-rebuild.gif) no-repeat center 0px');
                 });
             } else {
-                link.css('background','url('+StaticURI+'melody/icon-error.gif) no-repeat center -1px');
+                link.css('background','url('+StaticURI+'images/melody/icon-error.gif) no-repeat center -1px');
                 link.qtip({
                     content: data.errstr,
                     position: {
diff --git a/tmpl/cms/include/css_js_common.tmpl b/tmpl/cms/include/css_js_common.tmpl
index c2ef51329..182c049b7 100644
--- a/tmpl/cms/include/css_js_common.tmpl
+++ b/tmpl/cms/include/css_js_common.tmpl
@@ -20,7 +20,7 @@
       <mt:var name="linked_stylesheet" relpath="css/jquery/jquery.ui.all.css">
   <mt:unless name="optimize_ui">
       <mt:var name="linked_stylesheet" relpath="styles.css">
-      <mt:var name="linked_stylesheet" relpath="melody/styles.css">
+      <mt:var name="linked_stylesheet" relpath="css/melody-styles.css">
   <mt:else>
       <mt:var name="linked_stylesheet" relpath="css/main.css">
   </mt:unless>
diff --git a/tmpl/cms/list_entry.tmpl b/tmpl/cms/list_entry.tmpl
index 34b12cf14..dbf1a9171 100644
--- a/tmpl/cms/list_entry.tmpl
+++ b/tmpl/cms/list_entry.tmpl
@@ -71,12 +71,12 @@
 </mt:unless>
 
 <mt:setvarblock name="html_head" append="1">
-<link rel="stylesheet" href="<mt:var name="static_uri">melody/mt.dialog.css" type="text/css">
+<link rel="stylesheet" href="<mt:var name="static_uri">css/melody.dialog.css" type="text/css">
 <mt:ignore>----- No longer needed because we load jquery.ui.all.css in header
     <link rel="stylesheet" href="<mt:var name="static_uri">css/jquery/jquery.ui.core.css" type="text/css">
     <link rel="stylesheet" href="<mt:var name="static_uri">css/jquery/jquery.ui.dialog.css" type="text/css">
 </mt:Ignore>
-<link rel="stylesheet" href="<mt:var name="static_uri">melody/quicklook.css" type="text/css">
+<link rel="stylesheet" href="<mt:var name="static_uri">css/melody-quicklook.css" type="text/css">
 </mt:setvarblock>
 
 
diff --git a/tmpl/include/chromeless_header.tmpl b/tmpl/include/chromeless_header.tmpl
index d88a31d99..d9b44e2c2 100644
--- a/tmpl/include/chromeless_header.tmpl
+++ b/tmpl/include/chromeless_header.tmpl
@@ -12,7 +12,7 @@
                     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/utilities.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
                     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/messaging.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
                     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/chromeless.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
-                    <link rel="stylesheet" href="<$mt:var name="static_uri"$>melody/chromeless.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
+                    <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/melody-chromeless.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
                 <mt:else>
                     <link rel="stylesheet" href="<$mt:var name="static_uri"$>css/simple.css?v=<mt:var name="mt_version_id" escape="url">" type="text/css" />
                 </mt:unless>