diff --git a/.DS_Store b/.DS_Store
index 085e803..ffbfb50 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/assets/LICENSE.txt b/FLOWPLAYER_LICENSE.txt
similarity index 100%
rename from assets/LICENSE.txt
rename to FLOWPLAYER_LICENSE.txt
diff --git a/assets/README.txt b/README.txt
similarity index 100%
rename from assets/README.txt
rename to README.txt
diff --git a/lib/flowplayer/railties/generator/install_generator.rb b/lib/flowplayer/railties/generator/install_generator.rb
index 639e766..3c902dd 100644
--- a/lib/flowplayer/railties/generator/install_generator.rb
+++ b/lib/flowplayer/railties/generator/install_generator.rb
@@ -2,21 +2,21 @@ module Flowplayer
   module Generator
     class InstallGenerator < Rails::Generators::Base
       namespace 'flowplayer'
-      source_root File.expand_path("../../../../../assets", __FILE__)
+      source_root File.expand_path("../../../../../vendor/assets/", __FILE__)
       argument :install_type, :type => :string, :banner => "commercial", :required => false, :default => ''
       
       def install_flowplayer
-        copy_file 'flowplayer-3.2.4.min.js', Rails.root.join('public', 'javascripts', 'flowplayer.min.js')
+        copy_file 'javascripts/flowplayer-3.2.4.min.js', Rails.root.join('public', 'javascripts', 'flowplayer.min.js')
       end
       
       def install_swfs
         if install_type == 'commercial'
-          copy_file 'flowplayer.commercial-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
+          copy_file 'flash/flowplayer.commercial-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
         else
-          copy_file 'flowplayer-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
-          copy_file 'LICENSE.txt', Rails.root.join('FLOWPLAYER_LICENSE.txt')
+          copy_file 'flash/flowplayer-3.2.5.swf', Rails.root.join('public', 'flowplayer.swf')
+          copy_file '../../FLOWPLAYER_LICENSE.txt', Rails.root.join('FLOWPLAYER_LICENSE.txt')
         end
-        copy_file 'flowplayer.controls-3.2.3.swf', Rails.root.join('public', 'flowplayer.controls.swf')
+        copy_file 'flash/flowplayer.controls-3.2.3.swf', Rails.root.join('public', 'flowplayer.controls.swf')
       end
       
     end
diff --git a/vendor/.DS_Store b/vendor/.DS_Store
new file mode 100644
index 0000000..c328838
Binary files /dev/null and b/vendor/.DS_Store differ
diff --git a/vendor/assets/.DS_Store b/vendor/assets/.DS_Store
new file mode 100644
index 0000000..9d4bd7b
Binary files /dev/null and b/vendor/assets/.DS_Store differ
diff --git a/assets/flowplayer-3.2.5.swf b/vendor/assets/flash/flowplayer-3.2.5.swf
similarity index 100%
rename from assets/flowplayer-3.2.5.swf
rename to vendor/assets/flash/flowplayer-3.2.5.swf
diff --git a/assets/flowplayer.commercial-3.2.5.swf b/vendor/assets/flash/flowplayer.commercial-3.2.5.swf
similarity index 100%
rename from assets/flowplayer.commercial-3.2.5.swf
rename to vendor/assets/flash/flowplayer.commercial-3.2.5.swf
diff --git a/assets/flowplayer.controls-3.2.3.swf b/vendor/assets/flash/flowplayer.controls-3.2.3.swf
similarity index 100%
rename from assets/flowplayer.controls-3.2.3.swf
rename to vendor/assets/flash/flowplayer.controls-3.2.3.swf
diff --git a/assets/.DS_Store b/vendor/assets/javascripts/.DS_Store
similarity index 100%
rename from assets/.DS_Store
rename to vendor/assets/javascripts/.DS_Store
diff --git a/assets/flowplayer-3.2.4.min.js b/vendor/assets/javascripts/flowplayer-3.2.4.min.js
similarity index 100%
rename from assets/flowplayer-3.2.4.min.js
rename to vendor/assets/javascripts/flowplayer-3.2.4.min.js
diff --git a/vendor/assets/javascripts/flowplayer.js b/vendor/assets/javascripts/flowplayer.js
new file mode 100644
index 0000000..8730684
--- /dev/null
+++ b/vendor/assets/javascripts/flowplayer.js
@@ -0,0 +1 @@
+//= require flowplayer-3.2.4.min
\ No newline at end of file