diff --git a/Rakefile b/Rakefile
index d627b16..74df75f 100644
--- a/Rakefile
+++ b/Rakefile
@@ -132,8 +132,10 @@ task :update_plupload do
       end
 
       [
-        [ 'plupload/js/jquery.plupload.queue/**/*', 'jquery.plupload.queue' ],
-        [ 'plupload/js/jquery.ui.plupload/**/*', 'jquery.ui.plupload' ],
+        [ 'plupload/js/jquery.plupload.queue/img/*', 'img' ],
+        [ 'plupload/js/jquery.plupload.queue/*', 'jquery.plupload.queue' ],
+        [ 'plupload/js/jquery.ui.plupload/img/*', 'img' ],
+        [ 'plupload/js/jquery.ui.plupload/*', 'jquery.ui.plupload' ],
         [ 'plupload/js/*', '.' ],
       ].each do |glob, dir|
         if File.fnmatch?(glob, entry.name)
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/backgrounds.gif b/vendor-special/assets/images/plupload/img/backgrounds.gif
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/backgrounds.gif
rename to vendor-special/assets/images/plupload/img/backgrounds.gif
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/buttons-disabled.png b/vendor-special/assets/images/plupload/img/buttons-disabled.png
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/buttons-disabled.png
rename to vendor-special/assets/images/plupload/img/buttons-disabled.png
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/buttons.png b/vendor-special/assets/images/plupload/img/buttons.png
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/buttons.png
rename to vendor-special/assets/images/plupload/img/buttons.png
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/delete.gif b/vendor-special/assets/images/plupload/img/delete.gif
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/delete.gif
rename to vendor-special/assets/images/plupload/img/delete.gif
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/done.gif b/vendor-special/assets/images/plupload/img/done.gif
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/done.gif
rename to vendor-special/assets/images/plupload/img/done.gif
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/error.gif b/vendor-special/assets/images/plupload/img/error.gif
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/error.gif
rename to vendor-special/assets/images/plupload/img/error.gif
diff --git a/vendor-special/assets/images/plupload/jquery.ui.plupload/plupload-bw.png b/vendor-special/assets/images/plupload/img/plupload-bw.png
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.ui.plupload/plupload-bw.png
rename to vendor-special/assets/images/plupload/img/plupload-bw.png
diff --git a/vendor-special/assets/images/plupload/jquery.ui.plupload/plupload.png b/vendor-special/assets/images/plupload/img/plupload.png
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.ui.plupload/plupload.png
rename to vendor-special/assets/images/plupload/img/plupload.png
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/throbber.gif b/vendor-special/assets/images/plupload/img/throbber.gif
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/throbber.gif
rename to vendor-special/assets/images/plupload/img/throbber.gif
diff --git a/vendor-special/assets/images/plupload/jquery.plupload.queue/transp50.png b/vendor-special/assets/images/plupload/img/transp50.png
similarity index 100%
rename from vendor-special/assets/images/plupload/jquery.plupload.queue/transp50.png
rename to vendor-special/assets/images/plupload/img/transp50.png
diff --git a/vendor-special/assets/javascripts/plupload/jquery.plupload.queue.js b/vendor-special/assets/javascripts/plupload/jquery.plupload.queue/jquery.plupload.queue.js
similarity index 100%
rename from vendor-special/assets/javascripts/plupload/jquery.plupload.queue.js
rename to vendor-special/assets/javascripts/plupload/jquery.plupload.queue/jquery.plupload.queue.js
diff --git a/vendor-special/assets/javascripts/plupload/jquery.ui.plupload.js b/vendor-special/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js
similarity index 100%
rename from vendor-special/assets/javascripts/plupload/jquery.ui.plupload.js
rename to vendor-special/assets/javascripts/plupload/jquery.ui.plupload/jquery.ui.plupload.js