Source Tree Layout Cleanup: (As decided at videolan-meeting #2)

    projects/ - contains projects that link to libvlc other than vlc and the bindings.
    extras/package - contains the packaging specific files.
    extras/deprecated - deprecated files.
    extras/buildsystem - contains non-default buildsystem stuff.
    extras/analyser - contains code analyser (such as editor specific files) specific files.

diff --git a/Makefile.am b/Makefile.am
index c9f8b7193665ae012ce540a4adb84dd4ec334ec9..dfebe77c97b0f96cba361d61b48f905979e7c6e9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,21 +8,21 @@
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
 SUBDIRS = po libs/loader libs/srtp src modules \
-               mozilla bindings activex share doc
-DIST_SUBDIRS = $(SUBDIRS) m4 ipkg
+               projects/mozilla bindings projects/activex share doc
+DIST_SUBDIRS = $(SUBDIRS) extras/buildsystem/autotools/m4 extras/package/ipkg
 
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
        INSTALL.wince \
-       vlc.exe.manifest \
+       extras/package/win32/vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
        vlc-config.in.in \
-       vlc.fedora.spec \
-       vlc.mandriva.spec \
-       vlc.altlinux.spec \
-       vlc.win32.nsi.in
+       extras/package/rpm/vlc.fedora.spec \
+       extras/package/rpm/vlc.mandriva.spec \
+       extras/package/rpm/vlc.altlinux.spec \
+       extras/package/win32/vlc.win32.nsi.in
 
 dist_noinst_SCRIPTS = bootstrap toolbox
 
@@ -54,158 +54,158 @@ AUTOMAKE_OPTIONS = \
 ###############################################################################
 
 EXTRA_DIST += \
-       extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Open.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
-       extras/MacOSX/Resources/a52.icns \
-       extras/MacOSX/Resources/aac.icns \
-       extras/MacOSX/Resources/asf.icns \
-       extras/MacOSX/Resources/asx.icns \
-       extras/MacOSX/Resources/avi.icns \
-       extras/MacOSX/Resources/bin.icns \
-       extras/MacOSX/Resources/cue.icns \
-       extras/MacOSX/Resources/dat.icns \
-       extras/MacOSX/Resources/divx.icns \
-       extras/MacOSX/Resources/dv.icns \
-       extras/MacOSX/Resources/generic.icns \
-       extras/MacOSX/Resources/m3u.icns \
-       extras/MacOSX/Resources/mov.icns \
-       extras/MacOSX/Resources/mp3.icns \
-       extras/MacOSX/Resources/mp4.icns \
-       extras/MacOSX/Resources/mpeg.icns \
-       extras/MacOSX/Resources/mpeg1.icns \
-       extras/MacOSX/Resources/mpeg2.icns \
-       extras/MacOSX/Resources/mpeg4.icns \
-       extras/MacOSX/Resources/mpg.icns \
-       extras/MacOSX/Resources/ogg.icns \
-       extras/MacOSX/Resources/ogm.icns \
-       extras/MacOSX/Resources/pls.icns \
-       extras/MacOSX/Resources/srt.icns \
-       extras/MacOSX/Resources/sub.icns \
-       extras/MacOSX/Resources/vlc.icns \
-       extras/MacOSX/Resources/vob.icns \
-       extras/MacOSX/Resources/wma.icns \
-       extras/MacOSX/Resources/wmv.icns \
-       extras/MacOSX/Resources/pause.png \
-       extras/MacOSX/Resources/pause_blue.png \
-       extras/MacOSX/Resources/play.png \
-       extras/MacOSX/Resources/play_blue.png \
-       extras/MacOSX/Resources/stop.png \
-       extras/MacOSX/Resources/stop_blue.png \
-       extras/MacOSX/Resources/display.png \
-       extras/MacOSX/Resources/display_slider.png \
-       extras/MacOSX/Resources/display_track.png \
-       extras/MacOSX/Resources/equalizerdrawer_active.png \
-       extras/MacOSX/Resources/equalizerdrawer_blue.png \
-       extras/MacOSX/Resources/fullscreen_active.png \
-       extras/MacOSX/Resources/fullscreen_blue.png \
-       extras/MacOSX/Resources/next_active.png \
-       extras/MacOSX/Resources/next_blue.png \
-       extras/MacOSX/Resources/playlistdrawer_active.png \
-       extras/MacOSX/Resources/playlistdrawer_blue.png \
-       extras/MacOSX/Resources/previous_active.png \
-       extras/MacOSX/Resources/previous_blue.png \
-       extras/MacOSX/Resources/skip_forward_active.png \
-       extras/MacOSX/Resources/skip_forward_blue.png \
-       extras/MacOSX/Resources/skip_previous_active.png \
-       extras/MacOSX/Resources/skip_previous_blue.png \
-       extras/MacOSX/Resources/volume_high.png \
-       extras/MacOSX/Resources/volume_low.png \
-       extras/MacOSX/Resources/volumeslider_blue.png \
-       extras/MacOSX/Resources/volumeslider_normal.png \
-       extras/MacOSX/Resources/volumetrack.png \
-       extras/MacOSX/Resources/about_bg.png \
-       extras/MacOSX/Resources/skip_forward_active_embedded.png \
-       extras/MacOSX/Resources/play_embedded.png \
-       extras/MacOSX/Resources/pause_embedded.png \
-       extras/MacOSX/Resources/skip_previous_active_embedded.png \
-       extras/MacOSX/Resources/pause_embedded_blue.png \
-       extras/MacOSX/Resources/play_embedded_blue.png \
-       extras/MacOSX/Resources/skip_forward_embedded_blue.png \
-       extras/MacOSX/Resources/skip_previous_embedded_blue.png \
-       extras/MacOSX/Resources/vlc.scriptSuite \
-       extras/MacOSX/Resources/vlc.scriptTerminology \
-       extras/MacOSX/Resources/README \
-       extras/MacOSX/Resources/add_embedded.png \
-       extras/MacOSX/Resources/add_embedded_blue.png \
-       extras/MacOSX/Resources/repeat_embedded.png \
-       extras/MacOSX/Resources/repeat_embedded_blue.png \
-       extras/MacOSX/Resources/repeat_single_embedded_blue.png \
-       extras/MacOSX/Resources/shuffle_embedded.png \
-       extras/MacOSX/Resources/shuffle_embedded_blue.png \
-       extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png \
-       extras/MacOSX/Resources/fs_volume_slider_knob.png \
-       extras/MacOSX/Resources/fs_volume_slider_bar.png \
-       extras/MacOSX/Resources/fs_volume_mute_highlight.png \
-       extras/MacOSX/Resources/fs_volume_mute.png \
-       extras/MacOSX/Resources/fs_volume_max_highlight.png \
-       extras/MacOSX/Resources/fs_volume_max.png \
-       extras/MacOSX/Resources/fs_time_slider_knob_highlight.png \
-       extras/MacOSX/Resources/fs_time_slider_knob.png \
-       extras/MacOSX/Resources/fs_time_slider.png \
-       extras/MacOSX/Resources/fs_stop_highlight.png \
-       extras/MacOSX/Resources/fs_stop.png \
-       extras/MacOSX/Resources/fs_skip_previous_highlight.png \
-       extras/MacOSX/Resources/fs_skip_previous.png \
-       extras/MacOSX/Resources/fs_skip_next_highlight.png \
-       extras/MacOSX/Resources/fs_skip_next.png \
-       extras/MacOSX/Resources/fs_rewind_highlight.png \
-       extras/MacOSX/Resources/fs_rewind.png \
-       extras/MacOSX/Resources/fs_play_highlight.png \
-       extras/MacOSX/Resources/fs_play.png \
-       extras/MacOSX/Resources/fs_pause_highlight.png \
-       extras/MacOSX/Resources/fs_pause.png \
-       extras/MacOSX/Resources/fs_forward_highlight.png \
-       extras/MacOSX/Resources/fs_forward.png \
-       extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png \
-       extras/MacOSX/Resources/fs_exit_fullscreen.png \
-       extras/MacOSX/Resources/fs_background.png \
-       extras/MacOSX/fullscreen_panel.svg \
-       extras/MacOSX/ub.sh \
-       extras/MacOSX/vlc.xcodeproj/project.pbxproj \
-       extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
-       extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
-       extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
-       extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
-       extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
-       extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
-       extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
-       extras/MacOSX/plugin/Info.plist \
-       extras/MacOSX/plugin/InstallerInfo.plist \
-       extras/MacOSX/plugin/InstallerDescription.plist \
-       extras/MacOSX/plugin/pbdevelopment.plist \
-       extras/MacOSX/plugin/English.lproj/InfoPlist.strings
+       extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/About.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/About.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Open.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
+       extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
+       extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
+       extras/package/macosx/Resources/English.lproj/InfoPlist.strings \
+       extras/package/macosx/Resources/a52.icns \
+       extras/package/macosx/Resources/aac.icns \
+       extras/package/macosx/Resources/asf.icns \
+       extras/package/macosx/Resources/asx.icns \
+       extras/package/macosx/Resources/avi.icns \
+       extras/package/macosx/Resources/bin.icns \
+       extras/package/macosx/Resources/cue.icns \
+       extras/package/macosx/Resources/dat.icns \
+       extras/package/macosx/Resources/divx.icns \
+       extras/package/macosx/Resources/dv.icns \
+       extras/package/macosx/Resources/generic.icns \
+       extras/package/macosx/Resources/m3u.icns \
+       extras/package/macosx/Resources/mov.icns \
+       extras/package/macosx/Resources/mp3.icns \
+       extras/package/macosx/Resources/mp4.icns \
+       extras/package/macosx/Resources/mpeg.icns \
+       extras/package/macosx/Resources/mpeg1.icns \
+       extras/package/macosx/Resources/mpeg2.icns \
+       extras/package/macosx/Resources/mpeg4.icns \
+       extras/package/macosx/Resources/mpg.icns \
+       extras/package/macosx/Resources/ogg.icns \
+       extras/package/macosx/Resources/ogm.icns \
+       extras/package/macosx/Resources/pls.icns \
+       extras/package/macosx/Resources/srt.icns \
+       extras/package/macosx/Resources/sub.icns \
+       extras/package/macosx/Resources/vlc.icns \
+       extras/package/macosx/Resources/vob.icns \
+       extras/package/macosx/Resources/wma.icns \
+       extras/package/macosx/Resources/wmv.icns \
+       extras/package/macosx/Resources/pause.png \
+       extras/package/macosx/Resources/pause_blue.png \
+       extras/package/macosx/Resources/play.png \
+       extras/package/macosx/Resources/play_blue.png \
+       extras/package/macosx/Resources/stop.png \
+       extras/package/macosx/Resources/stop_blue.png \
+       extras/package/macosx/Resources/display.png \
+       extras/package/macosx/Resources/display_slider.png \
+       extras/package/macosx/Resources/display_track.png \
+       extras/package/macosx/Resources/equalizerdrawer_active.png \
+       extras/package/macosx/Resources/equalizerdrawer_blue.png \
+       extras/package/macosx/Resources/fullscreen_active.png \
+       extras/package/macosx/Resources/fullscreen_blue.png \
+       extras/package/macosx/Resources/next_active.png \
+       extras/package/macosx/Resources/next_blue.png \
+       extras/package/macosx/Resources/playlistdrawer_active.png \
+       extras/package/macosx/Resources/playlistdrawer_blue.png \
+       extras/package/macosx/Resources/previous_active.png \
+       extras/package/macosx/Resources/previous_blue.png \
+       extras/package/macosx/Resources/skip_forward_active.png \
+       extras/package/macosx/Resources/skip_forward_blue.png \
+       extras/package/macosx/Resources/skip_previous_active.png \
+       extras/package/macosx/Resources/skip_previous_blue.png \
+       extras/package/macosx/Resources/volume_high.png \
+       extras/package/macosx/Resources/volume_low.png \
+       extras/package/macosx/Resources/volumeslider_blue.png \
+       extras/package/macosx/Resources/volumeslider_normal.png \
+       extras/package/macosx/Resources/volumetrack.png \
+       extras/package/macosx/Resources/about_bg.png \
+       extras/package/macosx/Resources/skip_forward_active_embedded.png \
+       extras/package/macosx/Resources/play_embedded.png \
+       extras/package/macosx/Resources/pause_embedded.png \
+       extras/package/macosx/Resources/skip_previous_active_embedded.png \
+       extras/package/macosx/Resources/pause_embedded_blue.png \
+       extras/package/macosx/Resources/play_embedded_blue.png \
+       extras/package/macosx/Resources/skip_forward_embedded_blue.png \
+       extras/package/macosx/Resources/skip_previous_embedded_blue.png \
+       extras/package/macosx/Resources/vlc.scriptSuite \
+       extras/package/macosx/Resources/vlc.scriptTerminology \
+       extras/package/macosx/Resources/README \
+       extras/package/macosx/Resources/add_embedded.png \
+       extras/package/macosx/Resources/add_embedded_blue.png \
+       extras/package/macosx/Resources/repeat_embedded.png \
+       extras/package/macosx/Resources/repeat_embedded_blue.png \
+       extras/package/macosx/Resources/repeat_single_embedded_blue.png \
+       extras/package/macosx/Resources/shuffle_embedded.png \
+       extras/package/macosx/Resources/shuffle_embedded_blue.png \
+       extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png \
+       extras/package/macosx/Resources/fs_volume_slider_knob.png \
+       extras/package/macosx/Resources/fs_volume_slider_bar.png \
+       extras/package/macosx/Resources/fs_volume_mute_highlight.png \
+       extras/package/macosx/Resources/fs_volume_mute.png \
+       extras/package/macosx/Resources/fs_volume_max_highlight.png \
+       extras/package/macosx/Resources/fs_volume_max.png \
+       extras/package/macosx/Resources/fs_time_slider_knob_highlight.png \
+       extras/package/macosx/Resources/fs_time_slider_knob.png \
+       extras/package/macosx/Resources/fs_time_slider.png \
+       extras/package/macosx/Resources/fs_stop_highlight.png \
+       extras/package/macosx/Resources/fs_stop.png \
+       extras/package/macosx/Resources/fs_skip_previous_highlight.png \
+       extras/package/macosx/Resources/fs_skip_previous.png \
+       extras/package/macosx/Resources/fs_skip_next_highlight.png \
+       extras/package/macosx/Resources/fs_skip_next.png \
+       extras/package/macosx/Resources/fs_rewind_highlight.png \
+       extras/package/macosx/Resources/fs_rewind.png \
+       extras/package/macosx/Resources/fs_play_highlight.png \
+       extras/package/macosx/Resources/fs_play.png \
+       extras/package/macosx/Resources/fs_pause_highlight.png \
+       extras/package/macosx/Resources/fs_pause.png \
+       extras/package/macosx/Resources/fs_forward_highlight.png \
+       extras/package/macosx/Resources/fs_forward.png \
+       extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png \
+       extras/package/macosx/Resources/fs_exit_fullscreen.png \
+       extras/package/macosx/Resources/fs_background.png \
+       extras/package/macosx/fullscreen_panel.svg \
+       extras/package/macosx/ub.sh \
+       extras/package/macosx/vlc.xcodeproj/project.pbxproj \
+       extras/package/macosx/Delete_Preferences.app/Contents/Info.plist \
+       extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo \
+       extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet \
+       extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
+       extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns \
+       extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc \
+       extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
+       extras/package/macosx/plugin/Info.plist \
+       extras/package/macosx/plugin/InstallerInfo.plist \
+       extras/package/macosx/plugin/InstallerDescription.plist \
+       extras/package/macosx/plugin/pbdevelopment.plist \
+       extras/package/macosx/plugin/English.lproj/InfoPlist.strings
 
 ###############################################################################
 # Various utilities ( editor syntax files, D-Bus controller ... )
@@ -359,8 +359,8 @@ VLC-release.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
        fi
        rm -Rf $(top_builddir)/VLC-release.app
-       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
-       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
+       cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -417,9 +417,9 @@ VLC-release.app: vlc
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+       cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
            cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
@@ -530,8 +530,8 @@ VLC.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras/MacOSX"; \
        fi
        rm -Rf $(top_builddir)/VLC.app
-       cp -R $(srcdir)/extras/MacOSX/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
-       cp -R $(srcdir)/extras/MacOSX/Resources $(top_builddir)/tmp/extras/MacOSX
+       cp -R $(srcdir)/extras/package/macosx/vlc.xcodeproj $(top_builddir)/tmp/extras/MacOSX/
+       cp -R $(srcdir)/extras/package/macosx/Resources $(top_builddir)/tmp/extras/MacOSX
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
@@ -588,9 +588,9 @@ VLC.app: vlc
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
-       cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
+       cd $(top_builddir)/tmp/extras/package/macosx && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)' && \
            cd ../../../ && \
-           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
@@ -645,7 +645,7 @@ package-win-common:
 
 # Copy relevant files
        cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
-       cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
+       cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
        cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
        cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
 
@@ -741,13 +741,13 @@ package-win-common:
 
 if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/mozilla"
-       cp $(top_builddir)/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ;
+       cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/mozilla/ ;
 endif
 
 if BUILD_ACTIVEX
        mkdir -p "$(top_builddir)/vlc-$(VERSION)/activex"
-       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-$(VERSION)/activex/ ;
-       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ;
+       cp $(srcdir)/projects/activex/README.TXT  $(top_builddir)/vlc-$(VERSION)/activex/ ;
+       cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/ ;
        unix2dos $(top_builddir)/vlc-$(VERSION)/activex/* ;
 
        cp $(top_builddir)/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/ ;
@@ -940,9 +940,9 @@ package-macosx:
        cd "$(srcdir)" && mkdir -p $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
           mkdir -p $(top_builddir)/vlc-$(VERSION)/.background/ && \
           cp AUTHORS COPYING ChangeLog README THANKS NEWS $(top_builddir)/vlc-$(VERSION)/Goodies/ && \
-          cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
+          cp -R  extras/package/macosx/Delete_Preferences.app $(top_builddir)/vlc-$(VERSION)/Goodies/Delete\ VLC\ Preferences.app && \
          cp README.MacOSX.rtf $(top_builddir)/vlc-$(VERSION)/Read\ Me.rtf && \
-         cp extras/MacOSX/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ;
+         cp extras/package/macosx/Resources/about_bg.png $(top_builddir)/vlc-$(VERSION)/.background/background.png ;
 
 # Place a link to the application folder
        ln -s /Applications $(top_builddir)/vlc-$(VERSION)/Applications ;
@@ -995,12 +995,12 @@ if BUILD_MOZILLA
 # Create Installer
        rm -rf "$(top_builddir)/macosx-plugin-instdata/"; true
        mkdir -p "$(top_builddir)/macosx-plugin-instdata"
-       cp -R "$(top_builddir)/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
+       cp -R "$(top_builddir)/projects/mozilla/VLC Plugin.plugin" "$(top_builddir)/macosx-plugin-instdata"
        rm -rf "$(top_builddir)/VLC Internet Plug-In.pkg"
        PATH=/Developer/usr/bin:/Developer/Tools:$$PATH packagemaker -build -ds -p "$(top_builddir)/VLC Internet Plug-In.pkg" \
        -f "$(top_builddir)/macosx-plugin-instdata" \
-       -i "$(srcdir)/extras/MacOSX/plugin/InstallerInfo.plist" \
-       -d "$(srcdir)/extras/MacOSX/plugin/InstallerDescription.plist"; true
+       -i "$(srcdir)/extras/package/macosx/plugin/InstallerInfo.plist" \
+       -d "$(srcdir)/extras/package/macosx/plugin/InstallerDescription.plist"; true
        rm -rf "$(top_builddir)/macosx-plugin-instdata/"
 
 # Create disk image 

diff --git a/configure.ac b/configure.ac
index 5a08eb96b0fa0bb08d0248d5914f7322371d3be2..712970976b956640a2eb7627f7d46779e7989cc0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6090,20 +6090,20 @@ dnl Create vlc-config.in
 VLC_OUTPUT_VLC_CONFIG_IN
 
 AC_CONFIG_FILES([
-  vlc.win32.nsi
+  extras/package/win32/vlc.win32.nsi
   Makefile
-  activex/Makefile
-  activex/axvlc.inf
+  projects/activex/Makefile
+  projects/activex/axvlc.inf
   bindings/Makefile
   bindings/java/Makefile
   bindings/java/src/Makefile
   bindings/python/Makefile
   doc/Makefile
-  ipkg/Makefile
+  extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile
   modules/Makefile
-  mozilla/Makefile
+  projects/mozilla/Makefile
   m4/Makefile
   po/Makefile.in
   share/Makefile
@@ -6204,7 +6204,7 @@ rm -f compile
 echo '#! /bin/sh' >compile
 
 echo "PATH=$PATH LANG=C make \$@ 2>&1| \\" >> compile
-echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/make.pl' >> compile
+echo '`sed -ne "s/^top_srcdir *= *//p" < Makefile`/extras/buildsystem/autotools/make.pl' >> compile
 chmod a+x compile
 
 printf "

diff --git a/extras/Makefile b/extras/analyser/Makefile
similarity index 91%
rename from extras/Makefile
rename to extras/analyser/Makefile
index 971e50cd6f3b03454a614077f4a489a8dc0d3bc2..88383983fe909351bc729c4f71f8170bd1df48de 100644 (file)
--- a/extras/Makefile
+++ b/extras/analyser/Makefile
@@ -1,4 +1,4 @@
-BUILDDIR ?= ..
+BUILDDIR ?= ../..
 
 zsh: zsh.cpp
        g++ ${CXXFLAGS} -I${BUILDDIR} -I${BUILDDIR}/include -I../include zsh.cpp ${BUILDDIR}/src/.libs/libvlc.so -o zsh `top_builddir=${BUILDDIR} ${BUILDDIR}/vlc-config vlc builtin --cflags --libs`

diff --git a/extras/emacs.init b/extras/analyser/emacs.init
similarity index 100%
rename from extras/emacs.init
rename to extras/analyser/emacs.init

diff --git a/extras/valgrind.suppressions b/extras/analyser/valgrind.suppressions
similarity index 100%
rename from extras/valgrind.suppressions
rename to extras/analyser/valgrind.suppressions

diff --git a/extras/vlc.vim b/extras/analyser/vlc.vim
similarity index 100%
rename from extras/vlc.vim
rename to extras/analyser/vlc.vim

diff --git a/extras/zsh.cpp b/extras/analyser/zsh.cpp
similarity index 100%
rename from extras/zsh.cpp
rename to extras/analyser/zsh.cpp

diff --git a/extras/m4/autoconf260.m4 b/extras/buildsystem/autotools/m4/autoconf260.m4
similarity index 100%
rename from extras/m4/autoconf260.m4
rename to extras/buildsystem/autotools/m4/autoconf260.m4

diff --git a/extras/make.pl b/extras/buildsystem/autotools/make.pl
similarity index 100%
rename from extras/make.pl
rename to extras/buildsystem/autotools/make.pl

diff --git a/vlc.roku b/extras/deprecated/vlc.roku
similarity index 100%
rename from vlc.roku
rename to extras/deprecated/vlc.roku

diff --git a/extras/mpris.glade b/extras/misc/mpris.glade
similarity index 100%
rename from extras/mpris.glade
rename to extras/misc/mpris.glade

diff --git a/extras/mpris.py b/extras/misc/mpris.py
similarity index 100%
rename from extras/mpris.py
rename to extras/misc/mpris.py

diff --git a/ipkg/Makefile.am b/extras/package/ipkg/Makefile.am
similarity index 100%
rename from ipkg/Makefile.am
rename to extras/package/ipkg/Makefile.am

diff --git a/ipkg/control.gpe b/extras/package/ipkg/control.gpe
similarity index 100%
rename from ipkg/control.gpe
rename to extras/package/ipkg/control.gpe

diff --git a/ipkg/control.h3600 b/extras/package/ipkg/control.h3600
similarity index 100%
rename from ipkg/control.h3600
rename to extras/package/ipkg/control.h3600

diff --git a/ipkg/control.opie b/extras/package/ipkg/control.opie
similarity index 100%
rename from ipkg/control.opie
rename to extras/package/ipkg/control.opie

diff --git a/ipkg/control.zaurus b/extras/package/ipkg/control.zaurus
similarity index 100%
rename from ipkg/control.zaurus
rename to extras/package/ipkg/control.zaurus

diff --git a/ipkg/patch b/extras/package/ipkg/patch
similarity index 100%
rename from ipkg/patch
rename to extras/package/ipkg/patch

diff --git a/ipkg/postinst.gpe b/extras/package/ipkg/postinst.gpe
similarity index 100%
rename from ipkg/postinst.gpe
rename to extras/package/ipkg/postinst.gpe

diff --git a/ipkg/postinst.opie b/extras/package/ipkg/postinst.opie
similarity index 100%
rename from ipkg/postinst.opie
rename to extras/package/ipkg/postinst.opie

diff --git a/ipkg/postinst.zaurus b/extras/package/ipkg/postinst.zaurus
similarity index 100%
rename from ipkg/postinst.zaurus
rename to extras/package/ipkg/postinst.zaurus

diff --git a/ipkg/postrm.gpe b/extras/package/ipkg/postrm.gpe
similarity index 100%
rename from ipkg/postrm.gpe
rename to extras/package/ipkg/postrm.gpe

diff --git a/ipkg/postrm.opie b/extras/package/ipkg/postrm.opie
similarity index 100%
rename from ipkg/postrm.opie
rename to extras/package/ipkg/postrm.opie

diff --git a/ipkg/postrm.zaurus b/extras/package/ipkg/postrm.zaurus
similarity index 100%
rename from ipkg/postrm.zaurus
rename to extras/package/ipkg/postrm.zaurus

diff --git a/ipkg/rules.gpe b/extras/package/ipkg/rules.gpe
similarity index 100%
rename from ipkg/rules.gpe
rename to extras/package/ipkg/rules.gpe

diff --git a/ipkg/rules.h3600 b/extras/package/ipkg/rules.h3600
similarity index 100%
rename from ipkg/rules.h3600
rename to extras/package/ipkg/rules.h3600

diff --git a/ipkg/rules.opie b/extras/package/ipkg/rules.opie
similarity index 100%
rename from ipkg/rules.opie
rename to extras/package/ipkg/rules.opie

diff --git a/ipkg/rules.zaurus b/extras/package/ipkg/rules.zaurus
similarity index 100%
rename from ipkg/rules.zaurus
rename to extras/package/ipkg/rules.zaurus

diff --git a/ipkg/vlc.desktop b/extras/package/ipkg/vlc.desktop
similarity index 100%
rename from ipkg/vlc.desktop
rename to extras/package/ipkg/vlc.desktop

diff --git a/ipkg/vlc.gpe b/extras/package/ipkg/vlc.gpe
similarity index 100%
rename from ipkg/vlc.gpe
rename to extras/package/ipkg/vlc.gpe

diff --git a/ipkg/vlc.opie b/extras/package/ipkg/vlc.opie
similarity index 100%
rename from ipkg/vlc.opie
rename to extras/package/ipkg/vlc.opie

diff --git a/ipkg/vlc.zaurus b/extras/package/ipkg/vlc.zaurus
similarity index 100%
rename from ipkg/vlc.zaurus
rename to extras/package/ipkg/vlc.zaurus

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/Info.plist b/extras/package/macosx/Delete_Preferences.app/Contents/Info.plist
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/Info.plist
rename to extras/package/macosx/Delete_Preferences.app/Contents/Info.plist

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet b/extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet
rename to extras/package/macosx/Delete_Preferences.app/Contents/MacOS/applet

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo b/extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo
rename to extras/package/macosx/Delete_Preferences.app/Contents/PkgInfo

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt
rename to extras/package/macosx/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns
rename to extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.icns

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc
rename to extras/package/macosx/Delete_Preferences.app/Contents/Resources/applet.rsrc

diff --git a/extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf b/extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
similarity index 100%
rename from extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf
rename to extras/package/macosx/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/Controller.h b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/Controller.h
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.h

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/Controller.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/Controller.m
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/Controller.m

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/classes.nib

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/info.nib

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/English.lproj/MainMenu.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/FlashVideoDownloader_Prefix.pch

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.h

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/GradientBackgroundView.m

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/Info.plist b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/Info.plist
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/Info.plist
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/Info.plist

diff --git a/extras/MacOSX/Framework/Examples/FlashVideoDownloader/main.m b/extras/package/macosx/Framework/Examples/FlashVideoDownloader/main.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/FlashVideoDownloader/main.m
rename to extras/package/macosx/Framework/Examples/FlashVideoDownloader/main.m

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/Controller.h b/extras/package/macosx/Framework/Examples/iPodConverter/Controller.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/Controller.h
rename to extras/package/macosx/Framework/Examples/iPodConverter/Controller.h

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/Controller.m b/extras/package/macosx/Framework/Examples/iPodConverter/Controller.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/Controller.m
rename to extras/package/macosx/Framework/Examples/iPodConverter/Controller.m

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings
rename to extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib
rename to extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/classes.nib

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib
rename to extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/info.nib

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib
rename to extras/package/macosx/Framework/Examples/iPodConverter/English.lproj/MainMenu.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/GradientBackgroundView.h b/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/GradientBackgroundView.h
rename to extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.h

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/GradientBackgroundView.m b/extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/GradientBackgroundView.m
rename to extras/package/macosx/Framework/Examples/iPodConverter/GradientBackgroundView.m

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/Info.plist b/extras/package/macosx/Framework/Examples/iPodConverter/Info.plist
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/Info.plist
rename to extras/package/macosx/Framework/Examples/iPodConverter/Info.plist

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/MovieReceiver.h b/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/MovieReceiver.h
rename to extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.h

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/MovieReceiver.m b/extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/MovieReceiver.m
rename to extras/package/macosx/Framework/Examples/iPodConverter/MovieReceiver.m

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj
rename to extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch b/extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch
rename to extras/package/macosx/Framework/Examples/iPodConverter/iPodConverter_Prefix.pch

diff --git a/extras/MacOSX/Framework/Examples/iPodConverter/main.m b/extras/package/macosx/Framework/Examples/iPodConverter/main.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/iPodConverter/main.m
rename to extras/package/macosx/Framework/Examples/iPodConverter/main.m

diff --git a/extras/MacOSX/Framework/Examples/test/Controller.h b/extras/package/macosx/Framework/Examples/test/Controller.h
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/Controller.h
rename to extras/package/macosx/Framework/Examples/test/Controller.h

diff --git a/extras/MacOSX/Framework/Examples/test/Controller.m b/extras/package/macosx/Framework/Examples/test/Controller.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/Controller.m
rename to extras/package/macosx/Framework/Examples/test/Controller.m

diff --git a/extras/MacOSX/Framework/Examples/test/English.lproj/InfoPlist.strings b/extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/English.lproj/InfoPlist.strings
rename to extras/package/macosx/Framework/Examples/test/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib
rename to extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/classes.nib

diff --git a/extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib
rename to extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/info.nib

diff --git a/extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib
rename to extras/package/macosx/Framework/Examples/test/English.lproj/MainMenu.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Framework/Examples/test/Info.plist b/extras/package/macosx/Framework/Examples/test/Info.plist
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/Info.plist
rename to extras/package/macosx/Framework/Examples/test/Info.plist

diff --git a/extras/MacOSX/Framework/Examples/test/main.m b/extras/package/macosx/Framework/Examples/test/main.m
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/main.m
rename to extras/package/macosx/Framework/Examples/test/main.m

diff --git a/extras/MacOSX/Framework/Examples/test/test.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/Examples/test/test.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/test.xcodeproj/project.pbxproj
rename to extras/package/macosx/Framework/Examples/test/test.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/Framework/Examples/test/test_Prefix.pch b/extras/package/macosx/Framework/Examples/test/test_Prefix.pch
similarity index 100%
rename from extras/MacOSX/Framework/Examples/test/test_Prefix.pch
rename to extras/package/macosx/Framework/Examples/test/test_Prefix.pch

diff --git a/extras/MacOSX/Framework/Headers/Internal/VLCEventManager.h b/extras/package/macosx/Framework/Headers/Internal/VLCEventManager.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Internal/VLCEventManager.h
rename to extras/package/macosx/Framework/Headers/Internal/VLCEventManager.h

diff --git a/extras/MacOSX/Framework/Headers/Internal/VLCLibVLCBridging.h b/extras/package/macosx/Framework/Headers/Internal/VLCLibVLCBridging.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Internal/VLCLibVLCBridging.h
rename to extras/package/macosx/Framework/Headers/Internal/VLCLibVLCBridging.h

diff --git a/extras/MacOSX/Framework/Headers/Internal/VLCVideoCommon.h b/extras/package/macosx/Framework/Headers/Internal/VLCVideoCommon.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Internal/VLCVideoCommon.h
rename to extras/package/macosx/Framework/Headers/Internal/VLCVideoCommon.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCAudio.h b/extras/package/macosx/Framework/Headers/Public/VLCAudio.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCAudio.h
rename to extras/package/macosx/Framework/Headers/Public/VLCAudio.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCKit.h b/extras/package/macosx/Framework/Headers/Public/VLCKit.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCKit.h
rename to extras/package/macosx/Framework/Headers/Public/VLCKit.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCLibrary.h b/extras/package/macosx/Framework/Headers/Public/VLCLibrary.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCLibrary.h
rename to extras/package/macosx/Framework/Headers/Public/VLCLibrary.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMedia.h b/extras/package/macosx/Framework/Headers/Public/VLCMedia.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMedia.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMedia.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMediaDiscoverer.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaDiscoverer.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMediaDiscoverer.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMediaDiscoverer.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMediaLibrary.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaLibrary.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMediaLibrary.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMediaLibrary.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMediaList.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaList.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMediaList.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMediaList.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMediaListAspect.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaListAspect.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMediaListAspect.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMediaListAspect.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCMediaPlayer.h b/extras/package/macosx/Framework/Headers/Public/VLCMediaPlayer.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCMediaPlayer.h
rename to extras/package/macosx/Framework/Headers/Public/VLCMediaPlayer.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCPlaylistDataSource.h b/extras/package/macosx/Framework/Headers/Public/VLCPlaylistDataSource.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCPlaylistDataSource.h
rename to extras/package/macosx/Framework/Headers/Public/VLCPlaylistDataSource.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCServicesDiscoverer.h b/extras/package/macosx/Framework/Headers/Public/VLCServicesDiscoverer.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCServicesDiscoverer.h
rename to extras/package/macosx/Framework/Headers/Public/VLCServicesDiscoverer.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCStreamOutput.h b/extras/package/macosx/Framework/Headers/Public/VLCStreamOutput.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCStreamOutput.h
rename to extras/package/macosx/Framework/Headers/Public/VLCStreamOutput.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCStreamSession.h b/extras/package/macosx/Framework/Headers/Public/VLCStreamSession.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCStreamSession.h
rename to extras/package/macosx/Framework/Headers/Public/VLCStreamSession.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCTime.h b/extras/package/macosx/Framework/Headers/Public/VLCTime.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCTime.h
rename to extras/package/macosx/Framework/Headers/Public/VLCTime.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCVideoLayer.h b/extras/package/macosx/Framework/Headers/Public/VLCVideoLayer.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCVideoLayer.h
rename to extras/package/macosx/Framework/Headers/Public/VLCVideoLayer.h

diff --git a/extras/MacOSX/Framework/Headers/Public/VLCVideoView.h b/extras/package/macosx/Framework/Headers/Public/VLCVideoView.h
similarity index 100%
rename from extras/MacOSX/Framework/Headers/Public/VLCVideoView.h
rename to extras/package/macosx/Framework/Headers/Public/VLCVideoView.h

diff --git a/extras/MacOSX/Framework/Makefile b/extras/package/macosx/Framework/Makefile
similarity index 100%
rename from extras/MacOSX/Framework/Makefile
rename to extras/package/macosx/Framework/Makefile

diff --git a/extras/MacOSX/Framework/Pre-Compile.sh b/extras/package/macosx/Framework/Pre-Compile.sh
similarity index 100%
rename from extras/MacOSX/Framework/Pre-Compile.sh
rename to extras/package/macosx/Framework/Pre-Compile.sh

diff --git a/extras/MacOSX/Framework/Resources/Info.plist b/extras/package/macosx/Framework/Resources/Info.plist
similarity index 100%
rename from extras/MacOSX/Framework/Resources/Info.plist
rename to extras/package/macosx/Framework/Resources/Info.plist

diff --git a/extras/MacOSX/Framework/Resources/version.plist b/extras/package/macosx/Framework/Resources/version.plist
similarity index 100%
rename from extras/MacOSX/Framework/Resources/version.plist
rename to extras/package/macosx/Framework/Resources/version.plist

diff --git a/extras/MacOSX/Framework/Sources/VLCAudio.m b/extras/package/macosx/Framework/Sources/VLCAudio.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCAudio.m
rename to extras/package/macosx/Framework/Sources/VLCAudio.m

diff --git a/extras/MacOSX/Framework/Sources/VLCEventManager.m b/extras/package/macosx/Framework/Sources/VLCEventManager.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCEventManager.m
rename to extras/package/macosx/Framework/Sources/VLCEventManager.m

diff --git a/extras/MacOSX/Framework/Sources/VLCLibrary.m b/extras/package/macosx/Framework/Sources/VLCLibrary.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCLibrary.m
rename to extras/package/macosx/Framework/Sources/VLCLibrary.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMedia.m b/extras/package/macosx/Framework/Sources/VLCMedia.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMedia.m
rename to extras/package/macosx/Framework/Sources/VLCMedia.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMediaDiscoverer.m b/extras/package/macosx/Framework/Sources/VLCMediaDiscoverer.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMediaDiscoverer.m
rename to extras/package/macosx/Framework/Sources/VLCMediaDiscoverer.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMediaLibrary.m b/extras/package/macosx/Framework/Sources/VLCMediaLibrary.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMediaLibrary.m
rename to extras/package/macosx/Framework/Sources/VLCMediaLibrary.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMediaList.m b/extras/package/macosx/Framework/Sources/VLCMediaList.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMediaList.m
rename to extras/package/macosx/Framework/Sources/VLCMediaList.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMediaListAspect.m b/extras/package/macosx/Framework/Sources/VLCMediaListAspect.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMediaListAspect.m
rename to extras/package/macosx/Framework/Sources/VLCMediaListAspect.m

diff --git a/extras/MacOSX/Framework/Sources/VLCMediaPlayer.m b/extras/package/macosx/Framework/Sources/VLCMediaPlayer.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCMediaPlayer.m
rename to extras/package/macosx/Framework/Sources/VLCMediaPlayer.m

diff --git a/extras/MacOSX/Framework/Sources/VLCPlaylistDataSource.m b/extras/package/macosx/Framework/Sources/VLCPlaylistDataSource.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCPlaylistDataSource.m
rename to extras/package/macosx/Framework/Sources/VLCPlaylistDataSource.m

diff --git a/extras/MacOSX/Framework/Sources/VLCServicesDiscoverer.m b/extras/package/macosx/Framework/Sources/VLCServicesDiscoverer.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCServicesDiscoverer.m
rename to extras/package/macosx/Framework/Sources/VLCServicesDiscoverer.m

diff --git a/extras/MacOSX/Framework/Sources/VLCStreamOutput.m b/extras/package/macosx/Framework/Sources/VLCStreamOutput.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCStreamOutput.m
rename to extras/package/macosx/Framework/Sources/VLCStreamOutput.m

diff --git a/extras/MacOSX/Framework/Sources/VLCStreamSession.m b/extras/package/macosx/Framework/Sources/VLCStreamSession.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCStreamSession.m
rename to extras/package/macosx/Framework/Sources/VLCStreamSession.m

diff --git a/extras/MacOSX/Framework/Sources/VLCTime.m b/extras/package/macosx/Framework/Sources/VLCTime.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCTime.m
rename to extras/package/macosx/Framework/Sources/VLCTime.m

diff --git a/extras/MacOSX/Framework/Sources/VLCVideoCommon.m b/extras/package/macosx/Framework/Sources/VLCVideoCommon.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCVideoCommon.m
rename to extras/package/macosx/Framework/Sources/VLCVideoCommon.m

diff --git a/extras/MacOSX/Framework/Sources/VLCVideoLayer.m b/extras/package/macosx/Framework/Sources/VLCVideoLayer.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCVideoLayer.m
rename to extras/package/macosx/Framework/Sources/VLCVideoLayer.m

diff --git a/extras/MacOSX/Framework/Sources/VLCVideoView.m b/extras/package/macosx/Framework/Sources/VLCVideoView.m
similarity index 100%
rename from extras/MacOSX/Framework/Sources/VLCVideoView.m
rename to extras/package/macosx/Framework/Sources/VLCVideoView.m

diff --git a/extras/MacOSX/Framework/VLCKit.xcodeproj/project.pbxproj b/extras/package/macosx/Framework/VLCKit.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/Framework/VLCKit.xcodeproj/project.pbxproj
rename to extras/package/macosx/Framework/VLCKit.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/Framework/VLC_Prefix.pch b/extras/package/macosx/Framework/VLC_Prefix.pch
similarity index 100%
rename from extras/MacOSX/Framework/VLC_Prefix.pch
rename to extras/package/macosx/Framework/VLC_Prefix.pch

diff --git a/extras/MacOSX/Resources/English.lproj/About.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/About.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/About.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/About.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/About.nib/info.nib b/extras/package/macosx/Resources/English.lproj/About.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/About.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/About.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/About.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Bookmarks.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Bookmarks.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Bookmarks.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Bookmarks.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Bookmarks.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/InfoPlist.strings b/extras/package/macosx/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/InfoPlist.strings
rename to extras/package/macosx/Resources/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Interaction.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Interaction.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Interaction.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib b/extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/MainMenu.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/MainMenu.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/MainMenu.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Open.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Open.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Open.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Open.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Open.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Open.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Preferences.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Preferences.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Preferences.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Update.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Update.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Update.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Update.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib b/extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib
rename to extras/package/macosx/Resources/English.lproj/Wizard.nib/classes.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib b/extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib
rename to extras/package/macosx/Resources/English.lproj/Wizard.nib/info.nib

diff --git a/extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib b/extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib
rename to extras/package/macosx/Resources/English.lproj/Wizard.nib/keyedobjects.nib

diff --git a/extras/MacOSX/Resources/README b/extras/package/macosx/Resources/README
similarity index 100%
rename from extras/MacOSX/Resources/README
rename to extras/package/macosx/Resources/README

diff --git a/extras/MacOSX/Resources/a52.icns b/extras/package/macosx/Resources/a52.icns
similarity index 100%
rename from extras/MacOSX/Resources/a52.icns
rename to extras/package/macosx/Resources/a52.icns

diff --git a/extras/MacOSX/Resources/aac.icns b/extras/package/macosx/Resources/aac.icns
similarity index 100%
rename from extras/MacOSX/Resources/aac.icns
rename to extras/package/macosx/Resources/aac.icns

diff --git a/extras/MacOSX/Resources/about_bg.png b/extras/package/macosx/Resources/about_bg.png
similarity index 100%
rename from extras/MacOSX/Resources/about_bg.png
rename to extras/package/macosx/Resources/about_bg.png

diff --git a/extras/MacOSX/Resources/add_embedded.png b/extras/package/macosx/Resources/add_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/add_embedded.png
rename to extras/package/macosx/Resources/add_embedded.png

diff --git a/extras/MacOSX/Resources/add_embedded_blue.png b/extras/package/macosx/Resources/add_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/add_embedded_blue.png
rename to extras/package/macosx/Resources/add_embedded_blue.png

diff --git a/extras/MacOSX/Resources/add_embedded_graphite.png b/extras/package/macosx/Resources/add_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/add_embedded_graphite.png
rename to extras/package/macosx/Resources/add_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/asf.icns b/extras/package/macosx/Resources/asf.icns
similarity index 100%
rename from extras/MacOSX/Resources/asf.icns
rename to extras/package/macosx/Resources/asf.icns

diff --git a/extras/MacOSX/Resources/asx.icns b/extras/package/macosx/Resources/asx.icns
similarity index 100%
rename from extras/MacOSX/Resources/asx.icns
rename to extras/package/macosx/Resources/asx.icns

diff --git a/extras/MacOSX/Resources/avi.icns b/extras/package/macosx/Resources/avi.icns
similarity index 100%
rename from extras/MacOSX/Resources/avi.icns
rename to extras/package/macosx/Resources/avi.icns

diff --git a/extras/MacOSX/Resources/bin.icns b/extras/package/macosx/Resources/bin.icns
similarity index 100%
rename from extras/MacOSX/Resources/bin.icns
rename to extras/package/macosx/Resources/bin.icns

diff --git a/extras/MacOSX/Resources/cue.icns b/extras/package/macosx/Resources/cue.icns
similarity index 100%
rename from extras/MacOSX/Resources/cue.icns
rename to extras/package/macosx/Resources/cue.icns

diff --git a/extras/MacOSX/Resources/dat.icns b/extras/package/macosx/Resources/dat.icns
similarity index 100%
rename from extras/MacOSX/Resources/dat.icns
rename to extras/package/macosx/Resources/dat.icns

diff --git a/extras/MacOSX/Resources/display.png b/extras/package/macosx/Resources/display.png
similarity index 100%
rename from extras/MacOSX/Resources/display.png
rename to extras/package/macosx/Resources/display.png

diff --git a/extras/MacOSX/Resources/display_slider.png b/extras/package/macosx/Resources/display_slider.png
similarity index 100%
rename from extras/MacOSX/Resources/display_slider.png
rename to extras/package/macosx/Resources/display_slider.png

diff --git a/extras/MacOSX/Resources/display_track.png b/extras/package/macosx/Resources/display_track.png
similarity index 100%
rename from extras/MacOSX/Resources/display_track.png
rename to extras/package/macosx/Resources/display_track.png

diff --git a/extras/MacOSX/Resources/divx.icns b/extras/package/macosx/Resources/divx.icns
similarity index 100%
rename from extras/MacOSX/Resources/divx.icns
rename to extras/package/macosx/Resources/divx.icns

diff --git a/extras/MacOSX/Resources/dv.icns b/extras/package/macosx/Resources/dv.icns
similarity index 100%
rename from extras/MacOSX/Resources/dv.icns
rename to extras/package/macosx/Resources/dv.icns

diff --git a/extras/MacOSX/Resources/embedded_vout.png b/extras/package/macosx/Resources/embedded_vout.png
similarity index 100%
rename from extras/MacOSX/Resources/embedded_vout.png
rename to extras/package/macosx/Resources/embedded_vout.png

diff --git a/extras/MacOSX/Resources/equalizerdrawer_active.png b/extras/package/macosx/Resources/equalizerdrawer_active.png
similarity index 100%
rename from extras/MacOSX/Resources/equalizerdrawer_active.png
rename to extras/package/macosx/Resources/equalizerdrawer_active.png

diff --git a/extras/MacOSX/Resources/equalizerdrawer_blue.png b/extras/package/macosx/Resources/equalizerdrawer_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/equalizerdrawer_blue.png
rename to extras/package/macosx/Resources/equalizerdrawer_blue.png

diff --git a/extras/MacOSX/Resources/equalizerdrawer_graphite.png b/extras/package/macosx/Resources/equalizerdrawer_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/equalizerdrawer_graphite.png
rename to extras/package/macosx/Resources/equalizerdrawer_graphite.png

diff --git a/extras/MacOSX/Resources/fs_background.png b/extras/package/macosx/Resources/fs_background.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_background.png
rename to extras/package/macosx/Resources/fs_background.png

diff --git a/extras/MacOSX/Resources/fs_exit_fullscreen.png b/extras/package/macosx/Resources/fs_exit_fullscreen.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_exit_fullscreen.png
rename to extras/package/macosx/Resources/fs_exit_fullscreen.png

diff --git a/extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png b/extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_exit_fullscreen_highlight.png
rename to extras/package/macosx/Resources/fs_exit_fullscreen_highlight.png

diff --git a/extras/MacOSX/Resources/fs_forward.png b/extras/package/macosx/Resources/fs_forward.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_forward.png
rename to extras/package/macosx/Resources/fs_forward.png

diff --git a/extras/MacOSX/Resources/fs_forward_highlight.png b/extras/package/macosx/Resources/fs_forward_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_forward_highlight.png
rename to extras/package/macosx/Resources/fs_forward_highlight.png

diff --git a/extras/MacOSX/Resources/fs_pause.png b/extras/package/macosx/Resources/fs_pause.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_pause.png
rename to extras/package/macosx/Resources/fs_pause.png

diff --git a/extras/MacOSX/Resources/fs_pause_highlight.png b/extras/package/macosx/Resources/fs_pause_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_pause_highlight.png
rename to extras/package/macosx/Resources/fs_pause_highlight.png

diff --git a/extras/MacOSX/Resources/fs_play.png b/extras/package/macosx/Resources/fs_play.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_play.png
rename to extras/package/macosx/Resources/fs_play.png

diff --git a/extras/MacOSX/Resources/fs_play_highlight.png b/extras/package/macosx/Resources/fs_play_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_play_highlight.png
rename to extras/package/macosx/Resources/fs_play_highlight.png

diff --git a/extras/MacOSX/Resources/fs_rewind.png b/extras/package/macosx/Resources/fs_rewind.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_rewind.png
rename to extras/package/macosx/Resources/fs_rewind.png

diff --git a/extras/MacOSX/Resources/fs_rewind_highlight.png b/extras/package/macosx/Resources/fs_rewind_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_rewind_highlight.png
rename to extras/package/macosx/Resources/fs_rewind_highlight.png

diff --git a/extras/MacOSX/Resources/fs_skip_next.png b/extras/package/macosx/Resources/fs_skip_next.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_skip_next.png
rename to extras/package/macosx/Resources/fs_skip_next.png

diff --git a/extras/MacOSX/Resources/fs_skip_next_highlight.png b/extras/package/macosx/Resources/fs_skip_next_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_skip_next_highlight.png
rename to extras/package/macosx/Resources/fs_skip_next_highlight.png

diff --git a/extras/MacOSX/Resources/fs_skip_previous.png b/extras/package/macosx/Resources/fs_skip_previous.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_skip_previous.png
rename to extras/package/macosx/Resources/fs_skip_previous.png

diff --git a/extras/MacOSX/Resources/fs_skip_previous_highlight.png b/extras/package/macosx/Resources/fs_skip_previous_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_skip_previous_highlight.png
rename to extras/package/macosx/Resources/fs_skip_previous_highlight.png

diff --git a/extras/MacOSX/Resources/fs_stop.png b/extras/package/macosx/Resources/fs_stop.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_stop.png
rename to extras/package/macosx/Resources/fs_stop.png

diff --git a/extras/MacOSX/Resources/fs_stop_highlight.png b/extras/package/macosx/Resources/fs_stop_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_stop_highlight.png
rename to extras/package/macosx/Resources/fs_stop_highlight.png

diff --git a/extras/MacOSX/Resources/fs_time_slider.png b/extras/package/macosx/Resources/fs_time_slider.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_time_slider.png
rename to extras/package/macosx/Resources/fs_time_slider.png

diff --git a/extras/MacOSX/Resources/fs_time_slider_knob.png b/extras/package/macosx/Resources/fs_time_slider_knob.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_time_slider_knob.png
rename to extras/package/macosx/Resources/fs_time_slider_knob.png

diff --git a/extras/MacOSX/Resources/fs_time_slider_knob_highlight.png b/extras/package/macosx/Resources/fs_time_slider_knob_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_time_slider_knob_highlight.png
rename to extras/package/macosx/Resources/fs_time_slider_knob_highlight.png

diff --git a/extras/MacOSX/Resources/fs_volume_max.png b/extras/package/macosx/Resources/fs_volume_max.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_max.png
rename to extras/package/macosx/Resources/fs_volume_max.png

diff --git a/extras/MacOSX/Resources/fs_volume_max_highlight.png b/extras/package/macosx/Resources/fs_volume_max_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_max_highlight.png
rename to extras/package/macosx/Resources/fs_volume_max_highlight.png

diff --git a/extras/MacOSX/Resources/fs_volume_mute.png b/extras/package/macosx/Resources/fs_volume_mute.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_mute.png
rename to extras/package/macosx/Resources/fs_volume_mute.png

diff --git a/extras/MacOSX/Resources/fs_volume_mute_highlight.png b/extras/package/macosx/Resources/fs_volume_mute_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_mute_highlight.png
rename to extras/package/macosx/Resources/fs_volume_mute_highlight.png

diff --git a/extras/MacOSX/Resources/fs_volume_slider_bar.png b/extras/package/macosx/Resources/fs_volume_slider_bar.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_slider_bar.png
rename to extras/package/macosx/Resources/fs_volume_slider_bar.png

diff --git a/extras/MacOSX/Resources/fs_volume_slider_knob.png b/extras/package/macosx/Resources/fs_volume_slider_knob.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_slider_knob.png
rename to extras/package/macosx/Resources/fs_volume_slider_knob.png

diff --git a/extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png b/extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png
similarity index 100%
rename from extras/MacOSX/Resources/fs_volume_slider_knob_highlight.png
rename to extras/package/macosx/Resources/fs_volume_slider_knob_highlight.png

diff --git a/extras/MacOSX/Resources/fullscreen_active.png b/extras/package/macosx/Resources/fullscreen_active.png
similarity index 100%
rename from extras/MacOSX/Resources/fullscreen_active.png
rename to extras/package/macosx/Resources/fullscreen_active.png

diff --git a/extras/MacOSX/Resources/fullscreen_blue.png b/extras/package/macosx/Resources/fullscreen_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/fullscreen_blue.png
rename to extras/package/macosx/Resources/fullscreen_blue.png

diff --git a/extras/MacOSX/Resources/fullscreen_graphite.png b/extras/package/macosx/Resources/fullscreen_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/fullscreen_graphite.png
rename to extras/package/macosx/Resources/fullscreen_graphite.png

diff --git a/extras/MacOSX/Resources/generic.icns b/extras/package/macosx/Resources/generic.icns
similarity index 100%
rename from extras/MacOSX/Resources/generic.icns
rename to extras/package/macosx/Resources/generic.icns

diff --git a/extras/MacOSX/Resources/m3u.icns b/extras/package/macosx/Resources/m3u.icns
similarity index 100%
rename from extras/MacOSX/Resources/m3u.icns
rename to extras/package/macosx/Resources/m3u.icns

diff --git a/extras/MacOSX/Resources/mov.icns b/extras/package/macosx/Resources/mov.icns
similarity index 100%
rename from extras/MacOSX/Resources/mov.icns
rename to extras/package/macosx/Resources/mov.icns

diff --git a/extras/MacOSX/Resources/mp3.icns b/extras/package/macosx/Resources/mp3.icns
similarity index 100%
rename from extras/MacOSX/Resources/mp3.icns
rename to extras/package/macosx/Resources/mp3.icns

diff --git a/extras/MacOSX/Resources/mp4.icns b/extras/package/macosx/Resources/mp4.icns
similarity index 100%
rename from extras/MacOSX/Resources/mp4.icns
rename to extras/package/macosx/Resources/mp4.icns

diff --git a/extras/MacOSX/Resources/mpeg.icns b/extras/package/macosx/Resources/mpeg.icns
similarity index 100%
rename from extras/MacOSX/Resources/mpeg.icns
rename to extras/package/macosx/Resources/mpeg.icns

diff --git a/extras/MacOSX/Resources/mpeg1.icns b/extras/package/macosx/Resources/mpeg1.icns
similarity index 100%
rename from extras/MacOSX/Resources/mpeg1.icns
rename to extras/package/macosx/Resources/mpeg1.icns

diff --git a/extras/MacOSX/Resources/mpeg2.icns b/extras/package/macosx/Resources/mpeg2.icns
similarity index 100%
rename from extras/MacOSX/Resources/mpeg2.icns
rename to extras/package/macosx/Resources/mpeg2.icns

diff --git a/extras/MacOSX/Resources/mpeg4.icns b/extras/package/macosx/Resources/mpeg4.icns
similarity index 100%
rename from extras/MacOSX/Resources/mpeg4.icns
rename to extras/package/macosx/Resources/mpeg4.icns

diff --git a/extras/MacOSX/Resources/mpg.icns b/extras/package/macosx/Resources/mpg.icns
similarity index 100%
rename from extras/MacOSX/Resources/mpg.icns
rename to extras/package/macosx/Resources/mpg.icns

diff --git a/extras/MacOSX/Resources/next_active.png b/extras/package/macosx/Resources/next_active.png
similarity index 100%
rename from extras/MacOSX/Resources/next_active.png
rename to extras/package/macosx/Resources/next_active.png

diff --git a/extras/MacOSX/Resources/next_blue.png b/extras/package/macosx/Resources/next_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/next_blue.png
rename to extras/package/macosx/Resources/next_blue.png

diff --git a/extras/MacOSX/Resources/next_graphite.png b/extras/package/macosx/Resources/next_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/next_graphite.png
rename to extras/package/macosx/Resources/next_graphite.png

diff --git a/extras/MacOSX/Resources/ogg.icns b/extras/package/macosx/Resources/ogg.icns
similarity index 100%
rename from extras/MacOSX/Resources/ogg.icns
rename to extras/package/macosx/Resources/ogg.icns

diff --git a/extras/MacOSX/Resources/ogm.icns b/extras/package/macosx/Resources/ogm.icns
similarity index 100%
rename from extras/MacOSX/Resources/ogm.icns
rename to extras/package/macosx/Resources/ogm.icns

diff --git a/extras/MacOSX/Resources/pause.png b/extras/package/macosx/Resources/pause.png
similarity index 100%
rename from extras/MacOSX/Resources/pause.png
rename to extras/package/macosx/Resources/pause.png

diff --git a/extras/MacOSX/Resources/pause_blue.png b/extras/package/macosx/Resources/pause_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/pause_blue.png
rename to extras/package/macosx/Resources/pause_blue.png

diff --git a/extras/MacOSX/Resources/pause_embedded.png b/extras/package/macosx/Resources/pause_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/pause_embedded.png
rename to extras/package/macosx/Resources/pause_embedded.png

diff --git a/extras/MacOSX/Resources/pause_embedded_blue.png b/extras/package/macosx/Resources/pause_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/pause_embedded_blue.png
rename to extras/package/macosx/Resources/pause_embedded_blue.png

diff --git a/extras/MacOSX/Resources/pause_embedded_graphite.png b/extras/package/macosx/Resources/pause_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/pause_embedded_graphite.png
rename to extras/package/macosx/Resources/pause_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/pause_graphite.png b/extras/package/macosx/Resources/pause_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/pause_graphite.png
rename to extras/package/macosx/Resources/pause_graphite.png

diff --git a/extras/MacOSX/Resources/play.png b/extras/package/macosx/Resources/play.png
similarity index 100%
rename from extras/MacOSX/Resources/play.png
rename to extras/package/macosx/Resources/play.png

diff --git a/extras/MacOSX/Resources/play_blue.png b/extras/package/macosx/Resources/play_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/play_blue.png
rename to extras/package/macosx/Resources/play_blue.png

diff --git a/extras/MacOSX/Resources/play_embedded.png b/extras/package/macosx/Resources/play_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/play_embedded.png
rename to extras/package/macosx/Resources/play_embedded.png

diff --git a/extras/MacOSX/Resources/play_embedded_blue.png b/extras/package/macosx/Resources/play_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/play_embedded_blue.png
rename to extras/package/macosx/Resources/play_embedded_blue.png

diff --git a/extras/MacOSX/Resources/play_embedded_graphite.png b/extras/package/macosx/Resources/play_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/play_embedded_graphite.png
rename to extras/package/macosx/Resources/play_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/play_graphite.png b/extras/package/macosx/Resources/play_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/play_graphite.png
rename to extras/package/macosx/Resources/play_graphite.png

diff --git a/extras/MacOSX/Resources/playlistdrawer_active.png b/extras/package/macosx/Resources/playlistdrawer_active.png
similarity index 100%
rename from extras/MacOSX/Resources/playlistdrawer_active.png
rename to extras/package/macosx/Resources/playlistdrawer_active.png

diff --git a/extras/MacOSX/Resources/playlistdrawer_blue.png b/extras/package/macosx/Resources/playlistdrawer_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/playlistdrawer_blue.png
rename to extras/package/macosx/Resources/playlistdrawer_blue.png

diff --git a/extras/MacOSX/Resources/playlistdrawer_graphite.png b/extras/package/macosx/Resources/playlistdrawer_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/playlistdrawer_graphite.png
rename to extras/package/macosx/Resources/playlistdrawer_graphite.png

diff --git a/extras/MacOSX/Resources/pls.icns b/extras/package/macosx/Resources/pls.icns
similarity index 100%
rename from extras/MacOSX/Resources/pls.icns
rename to extras/package/macosx/Resources/pls.icns

diff --git a/extras/MacOSX/Resources/previous_active.png b/extras/package/macosx/Resources/previous_active.png
similarity index 100%
rename from extras/MacOSX/Resources/previous_active.png
rename to extras/package/macosx/Resources/previous_active.png

diff --git a/extras/MacOSX/Resources/previous_blue.png b/extras/package/macosx/Resources/previous_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/previous_blue.png
rename to extras/package/macosx/Resources/previous_blue.png

diff --git a/extras/MacOSX/Resources/previous_graphite.png b/extras/package/macosx/Resources/previous_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/previous_graphite.png
rename to extras/package/macosx/Resources/previous_graphite.png

diff --git a/extras/MacOSX/Resources/repeat_embedded.png b/extras/package/macosx/Resources/repeat_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/repeat_embedded.png
rename to extras/package/macosx/Resources/repeat_embedded.png

diff --git a/extras/MacOSX/Resources/repeat_embedded_blue.png b/extras/package/macosx/Resources/repeat_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/repeat_embedded_blue.png
rename to extras/package/macosx/Resources/repeat_embedded_blue.png

diff --git a/extras/MacOSX/Resources/repeat_embedded_graphite.png b/extras/package/macosx/Resources/repeat_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/repeat_embedded_graphite.png
rename to extras/package/macosx/Resources/repeat_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/repeat_single_embedded_blue.png b/extras/package/macosx/Resources/repeat_single_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/repeat_single_embedded_blue.png
rename to extras/package/macosx/Resources/repeat_single_embedded_blue.png

diff --git a/extras/MacOSX/Resources/repeat_single_embedded_graphite.png b/extras/package/macosx/Resources/repeat_single_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/repeat_single_embedded_graphite.png
rename to extras/package/macosx/Resources/repeat_single_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/shuffle_embedded.png b/extras/package/macosx/Resources/shuffle_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/shuffle_embedded.png
rename to extras/package/macosx/Resources/shuffle_embedded.png

diff --git a/extras/MacOSX/Resources/shuffle_embedded_blue.png b/extras/package/macosx/Resources/shuffle_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/shuffle_embedded_blue.png
rename to extras/package/macosx/Resources/shuffle_embedded_blue.png

diff --git a/extras/MacOSX/Resources/shuffle_embedded_graphite.png b/extras/package/macosx/Resources/shuffle_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/shuffle_embedded_graphite.png
rename to extras/package/macosx/Resources/shuffle_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/skip_forward_active.png b/extras/package/macosx/Resources/skip_forward_active.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_active.png
rename to extras/package/macosx/Resources/skip_forward_active.png

diff --git a/extras/MacOSX/Resources/skip_forward_active_embedded.png b/extras/package/macosx/Resources/skip_forward_active_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_active_embedded.png
rename to extras/package/macosx/Resources/skip_forward_active_embedded.png

diff --git a/extras/MacOSX/Resources/skip_forward_blue.png b/extras/package/macosx/Resources/skip_forward_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_blue.png
rename to extras/package/macosx/Resources/skip_forward_blue.png

diff --git a/extras/MacOSX/Resources/skip_forward_embedded_blue.png b/extras/package/macosx/Resources/skip_forward_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_embedded_blue.png
rename to extras/package/macosx/Resources/skip_forward_embedded_blue.png

diff --git a/extras/MacOSX/Resources/skip_forward_embedded_graphite.png b/extras/package/macosx/Resources/skip_forward_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_embedded_graphite.png
rename to extras/package/macosx/Resources/skip_forward_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/skip_forward_graphite.png b/extras/package/macosx/Resources/skip_forward_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_forward_graphite.png
rename to extras/package/macosx/Resources/skip_forward_graphite.png

diff --git a/extras/MacOSX/Resources/skip_previous_active.png b/extras/package/macosx/Resources/skip_previous_active.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_active.png
rename to extras/package/macosx/Resources/skip_previous_active.png

diff --git a/extras/MacOSX/Resources/skip_previous_active_embedded.png b/extras/package/macosx/Resources/skip_previous_active_embedded.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_active_embedded.png
rename to extras/package/macosx/Resources/skip_previous_active_embedded.png

diff --git a/extras/MacOSX/Resources/skip_previous_blue.png b/extras/package/macosx/Resources/skip_previous_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_blue.png
rename to extras/package/macosx/Resources/skip_previous_blue.png

diff --git a/extras/MacOSX/Resources/skip_previous_embedded_blue.png b/extras/package/macosx/Resources/skip_previous_embedded_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_embedded_blue.png
rename to extras/package/macosx/Resources/skip_previous_embedded_blue.png

diff --git a/extras/MacOSX/Resources/skip_previous_embedded_graphite.png b/extras/package/macosx/Resources/skip_previous_embedded_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_embedded_graphite.png
rename to extras/package/macosx/Resources/skip_previous_embedded_graphite.png

diff --git a/extras/MacOSX/Resources/skip_previous_graphite.png b/extras/package/macosx/Resources/skip_previous_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/skip_previous_graphite.png
rename to extras/package/macosx/Resources/skip_previous_graphite.png

diff --git a/extras/MacOSX/Resources/spref_cone_Audio_64.png b/extras/package/macosx/Resources/spref_cone_Audio_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Audio_64.png
rename to extras/package/macosx/Resources/spref_cone_Audio_64.png

diff --git a/extras/MacOSX/Resources/spref_cone_Hotkeys_64.png b/extras/package/macosx/Resources/spref_cone_Hotkeys_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Hotkeys_64.png
rename to extras/package/macosx/Resources/spref_cone_Hotkeys_64.png

diff --git a/extras/MacOSX/Resources/spref_cone_Input_64.png b/extras/package/macosx/Resources/spref_cone_Input_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Input_64.png
rename to extras/package/macosx/Resources/spref_cone_Input_64.png

diff --git a/extras/MacOSX/Resources/spref_cone_Interface_64.png b/extras/package/macosx/Resources/spref_cone_Interface_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Interface_64.png
rename to extras/package/macosx/Resources/spref_cone_Interface_64.png

diff --git a/extras/MacOSX/Resources/spref_cone_Subtitles_64.png b/extras/package/macosx/Resources/spref_cone_Subtitles_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Subtitles_64.png
rename to extras/package/macosx/Resources/spref_cone_Subtitles_64.png

diff --git a/extras/MacOSX/Resources/spref_cone_Video_64.png b/extras/package/macosx/Resources/spref_cone_Video_64.png
similarity index 100%
rename from extras/MacOSX/Resources/spref_cone_Video_64.png
rename to extras/package/macosx/Resources/spref_cone_Video_64.png

diff --git a/extras/MacOSX/Resources/srt.icns b/extras/package/macosx/Resources/srt.icns
similarity index 100%
rename from extras/MacOSX/Resources/srt.icns
rename to extras/package/macosx/Resources/srt.icns

diff --git a/extras/MacOSX/Resources/stop.png b/extras/package/macosx/Resources/stop.png
similarity index 100%
rename from extras/MacOSX/Resources/stop.png
rename to extras/package/macosx/Resources/stop.png

diff --git a/extras/MacOSX/Resources/stop_blue.png b/extras/package/macosx/Resources/stop_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/stop_blue.png
rename to extras/package/macosx/Resources/stop_blue.png

diff --git a/extras/MacOSX/Resources/stop_graphite.png b/extras/package/macosx/Resources/stop_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/stop_graphite.png
rename to extras/package/macosx/Resources/stop_graphite.png

diff --git a/extras/MacOSX/Resources/sub.icns b/extras/package/macosx/Resources/sub.icns
similarity index 100%
rename from extras/MacOSX/Resources/sub.icns
rename to extras/package/macosx/Resources/sub.icns

diff --git a/extras/MacOSX/Resources/vlc.icns b/extras/package/macosx/Resources/vlc.icns
similarity index 100%
rename from extras/MacOSX/Resources/vlc.icns
rename to extras/package/macosx/Resources/vlc.icns

diff --git a/extras/MacOSX/Resources/vlc.scriptSuite b/extras/package/macosx/Resources/vlc.scriptSuite
similarity index 100%
rename from extras/MacOSX/Resources/vlc.scriptSuite
rename to extras/package/macosx/Resources/vlc.scriptSuite

diff --git a/extras/MacOSX/Resources/vlc.scriptTerminology b/extras/package/macosx/Resources/vlc.scriptTerminology
similarity index 100%
rename from extras/MacOSX/Resources/vlc.scriptTerminology
rename to extras/package/macosx/Resources/vlc.scriptTerminology

diff --git a/extras/MacOSX/Resources/vob.icns b/extras/package/macosx/Resources/vob.icns
similarity index 100%
rename from extras/MacOSX/Resources/vob.icns
rename to extras/package/macosx/Resources/vob.icns

diff --git a/extras/MacOSX/Resources/volume_high.png b/extras/package/macosx/Resources/volume_high.png
similarity index 100%
rename from extras/MacOSX/Resources/volume_high.png
rename to extras/package/macosx/Resources/volume_high.png

diff --git a/extras/MacOSX/Resources/volume_low.png b/extras/package/macosx/Resources/volume_low.png
similarity index 100%
rename from extras/MacOSX/Resources/volume_low.png
rename to extras/package/macosx/Resources/volume_low.png

diff --git a/extras/MacOSX/Resources/volumeslider_blue.png b/extras/package/macosx/Resources/volumeslider_blue.png
similarity index 100%
rename from extras/MacOSX/Resources/volumeslider_blue.png
rename to extras/package/macosx/Resources/volumeslider_blue.png

diff --git a/extras/MacOSX/Resources/volumeslider_graphite.png b/extras/package/macosx/Resources/volumeslider_graphite.png
similarity index 100%
rename from extras/MacOSX/Resources/volumeslider_graphite.png
rename to extras/package/macosx/Resources/volumeslider_graphite.png

diff --git a/extras/MacOSX/Resources/volumeslider_normal.png b/extras/package/macosx/Resources/volumeslider_normal.png
similarity index 100%
rename from extras/MacOSX/Resources/volumeslider_normal.png
rename to extras/package/macosx/Resources/volumeslider_normal.png

diff --git a/extras/MacOSX/Resources/volumetrack.png b/extras/package/macosx/Resources/volumetrack.png
similarity index 100%
rename from extras/MacOSX/Resources/volumetrack.png
rename to extras/package/macosx/Resources/volumetrack.png

diff --git a/extras/MacOSX/Resources/wma.icns b/extras/package/macosx/Resources/wma.icns
similarity index 100%
rename from extras/MacOSX/Resources/wma.icns
rename to extras/package/macosx/Resources/wma.icns

diff --git a/extras/MacOSX/Resources/wmv.icns b/extras/package/macosx/Resources/wmv.icns
similarity index 100%
rename from extras/MacOSX/Resources/wmv.icns
rename to extras/package/macosx/Resources/wmv.icns

diff --git a/extras/MacOSX/VLC_app/English.lproj/InfoPlist.strings b/extras/package/macosx/VLC_app/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/VLC_app/English.lproj/InfoPlist.strings
rename to extras/package/macosx/VLC_app/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/classes.nib b/extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/classes.nib
similarity index 100%
rename from extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/classes.nib
rename to extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/classes.nib

diff --git a/extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/info.nib b/extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/info.nib
similarity index 100%
rename from extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/info.nib
rename to extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/info.nib

diff --git a/extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/keyedobjects.nib b/extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from extras/MacOSX/VLC_app/English.lproj/MainMenu.nib/keyedobjects.nib
rename to extras/package/macosx/VLC_app/English.lproj/MainMenu.nib/keyedobjects.nib

diff --git a/extras/MacOSX/VLC_app/English.lproj/MainWindow.xib b/extras/package/macosx/VLC_app/English.lproj/MainWindow.xib
similarity index 100%
rename from extras/MacOSX/VLC_app/English.lproj/MainWindow.xib
rename to extras/package/macosx/VLC_app/English.lproj/MainWindow.xib

diff --git a/extras/MacOSX/VLC_app/Icons/applications-internet.png b/extras/package/macosx/VLC_app/Icons/applications-internet.png
similarity index 100%
rename from extras/MacOSX/VLC_app/Icons/applications-internet.png
rename to extras/package/macosx/VLC_app/Icons/applications-internet.png

diff --git a/extras/MacOSX/VLC_app/Icons/dialog-error.png b/extras/package/macosx/VLC_app/Icons/dialog-error.png
similarity index 100%
rename from extras/MacOSX/VLC_app/Icons/dialog-error.png
rename to extras/package/macosx/VLC_app/Icons/dialog-error.png

diff --git a/extras/MacOSX/VLC_app/Info.plist b/extras/package/macosx/VLC_app/Info.plist
similarity index 100%
rename from extras/MacOSX/VLC_app/Info.plist
rename to extras/package/macosx/VLC_app/Info.plist

diff --git a/extras/MacOSX/VLC_app/Sources/ImageAndTextCell.h b/extras/package/macosx/VLC_app/Sources/ImageAndTextCell.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/ImageAndTextCell.h
rename to extras/package/macosx/VLC_app/Sources/ImageAndTextCell.h

diff --git a/extras/MacOSX/VLC_app/Sources/ImageAndTextCell.m b/extras/package/macosx/VLC_app/Sources/ImageAndTextCell.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/ImageAndTextCell.m
rename to extras/package/macosx/VLC_app/Sources/ImageAndTextCell.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCAppAdditions.h b/extras/package/macosx/VLC_app/Sources/VLCAppAdditions.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCAppAdditions.h
rename to extras/package/macosx/VLC_app/Sources/VLCAppAdditions.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCAppAdditions.m b/extras/package/macosx/VLC_app/Sources/VLCAppAdditions.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCAppAdditions.m
rename to extras/package/macosx/VLC_app/Sources/VLCAppAdditions.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCAppBindings.h b/extras/package/macosx/VLC_app/Sources/VLCAppBindings.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCAppBindings.h
rename to extras/package/macosx/VLC_app/Sources/VLCAppBindings.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCAppBindings.m b/extras/package/macosx/VLC_app/Sources/VLCAppBindings.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCAppBindings.m
rename to extras/package/macosx/VLC_app/Sources/VLCAppBindings.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCBrowsableVideoView.h b/extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCBrowsableVideoView.h
rename to extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCBrowsableVideoView.m b/extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCBrowsableVideoView.m
rename to extras/package/macosx/VLC_app/Sources/VLCBrowsableVideoView.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCController.h b/extras/package/macosx/VLC_app/Sources/VLCController.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCController.h
rename to extras/package/macosx/VLC_app/Sources/VLCController.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCController.m b/extras/package/macosx/VLC_app/Sources/VLCController.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCController.m
rename to extras/package/macosx/VLC_app/Sources/VLCController.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCExceptionHandler.h b/extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCExceptionHandler.h
rename to extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCExceptionHandler.m b/extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCExceptionHandler.m
rename to extras/package/macosx/VLC_app/Sources/VLCExceptionHandler.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCFullScreenControllerWindow.h b/extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCFullScreenControllerWindow.h
rename to extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCFullScreenControllerWindow.m b/extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCFullScreenControllerWindow.m
rename to extras/package/macosx/VLC_app/Sources/VLCFullScreenControllerWindow.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCMainWindow.h b/extras/package/macosx/VLC_app/Sources/VLCMainWindow.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCMainWindow.h
rename to extras/package/macosx/VLC_app/Sources/VLCMainWindow.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCMainWindow.m b/extras/package/macosx/VLC_app/Sources/VLCMainWindow.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCMainWindow.m
rename to extras/package/macosx/VLC_app/Sources/VLCMainWindow.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCMediaArrayController.h b/extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCMediaArrayController.h
rename to extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCMediaArrayController.m b/extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCMediaArrayController.m
rename to extras/package/macosx/VLC_app/Sources/VLCMediaArrayController.m

diff --git a/extras/MacOSX/VLC_app/Sources/VLCValueTransformer.h b/extras/package/macosx/VLC_app/Sources/VLCValueTransformer.h
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCValueTransformer.h
rename to extras/package/macosx/VLC_app/Sources/VLCValueTransformer.h

diff --git a/extras/MacOSX/VLC_app/Sources/VLCValueTransformer.m b/extras/package/macosx/VLC_app/Sources/VLCValueTransformer.m
similarity index 100%
rename from extras/MacOSX/VLC_app/Sources/VLCValueTransformer.m
rename to extras/package/macosx/VLC_app/Sources/VLCValueTransformer.m

diff --git a/extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC_app/VLC.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/VLC_app/VLC.xcodeproj/project.pbxproj
rename to extras/package/macosx/VLC_app/VLC.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/VLC_app/VLC_Prefix.pch b/extras/package/macosx/VLC_app/VLC_Prefix.pch
similarity index 100%
rename from extras/MacOSX/VLC_app/VLC_Prefix.pch
rename to extras/package/macosx/VLC_app/VLC_Prefix.pch

diff --git a/extras/MacOSX/VLC_app/main.m b/extras/package/macosx/VLC_app/main.m
similarity index 100%
rename from extras/MacOSX/VLC_app/main.m
rename to extras/package/macosx/VLC_app/main.m

diff --git a/extras/MacOSX/eyetvplugin/English.lproj/InfoPlist.strings b/extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/eyetvplugin/English.lproj/InfoPlist.strings
rename to extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/eyetvplugin/EyeTVPluginDefs.h b/extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h
similarity index 100%
rename from extras/MacOSX/eyetvplugin/EyeTVPluginDefs.h
rename to extras/package/macosx/eyetvplugin/EyeTVPluginDefs.h

diff --git a/extras/MacOSX/eyetvplugin/Info.plist b/extras/package/macosx/eyetvplugin/Info.plist
similarity index 100%
rename from extras/MacOSX/eyetvplugin/Info.plist
rename to extras/package/macosx/eyetvplugin/Info.plist

diff --git a/extras/MacOSX/eyetvplugin/eyetvplugin.c b/extras/package/macosx/eyetvplugin/eyetvplugin.c
similarity index 100%
rename from extras/MacOSX/eyetvplugin/eyetvplugin.c
rename to extras/package/macosx/eyetvplugin/eyetvplugin.c

diff --git a/extras/MacOSX/eyetvplugin/eyetvplugin.h b/extras/package/macosx/eyetvplugin/eyetvplugin.h
similarity index 100%
rename from extras/MacOSX/eyetvplugin/eyetvplugin.h
rename to extras/package/macosx/eyetvplugin/eyetvplugin.h

diff --git a/extras/MacOSX/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj b/extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj
rename to extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj

diff --git a/extras/MacOSX/fullscreen_panel.svg b/extras/package/macosx/fullscreen_panel.svg
similarity index 100%
rename from extras/MacOSX/fullscreen_panel.svg
rename to extras/package/macosx/fullscreen_panel.svg

diff --git a/extras/MacOSX/plugin/English.lproj/InfoPlist.strings b/extras/package/macosx/plugin/English.lproj/InfoPlist.strings
similarity index 100%
rename from extras/MacOSX/plugin/English.lproj/InfoPlist.strings
rename to extras/package/macosx/plugin/English.lproj/InfoPlist.strings

diff --git a/extras/MacOSX/plugin/Info.plist b/extras/package/macosx/plugin/Info.plist
similarity index 100%
rename from extras/MacOSX/plugin/Info.plist
rename to extras/package/macosx/plugin/Info.plist

diff --git a/extras/MacOSX/plugin/InstallerDescription.plist b/extras/package/macosx/plugin/InstallerDescription.plist
similarity index 100%
rename from extras/MacOSX/plugin/InstallerDescription.plist
rename to extras/package/macosx/plugin/InstallerDescription.plist

diff --git a/extras/MacOSX/plugin/InstallerInfo.plist b/extras/package/macosx/plugin/InstallerInfo.plist
similarity index 100%
rename from extras/MacOSX/plugin/InstallerInfo.plist
rename to extras/package/macosx/plugin/InstallerInfo.plist

diff --git a/extras/MacOSX/plugin/pbdevelopment.plist b/extras/package/macosx/plugin/pbdevelopment.plist
similarity index 100%
rename from extras/MacOSX/plugin/pbdevelopment.plist
rename to extras/package/macosx/plugin/pbdevelopment.plist

diff --git a/extras/MacOSX/ub.sh b/extras/package/macosx/ub.sh
similarity index 100%
rename from extras/MacOSX/ub.sh
rename to extras/package/macosx/ub.sh

diff --git a/extras/MacOSX/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
similarity index 100%
rename from extras/MacOSX/vlc.xcodeproj/project.pbxproj
rename to extras/package/macosx/vlc.xcodeproj/project.pbxproj

diff --git a/vlc.altlinux.spec b/extras/package/rpm/vlc.altlinux.spec
similarity index 100%
rename from vlc.altlinux.spec
rename to extras/package/rpm/vlc.altlinux.spec

diff --git a/vlc.fedora.spec b/extras/package/rpm/vlc.fedora.spec
similarity index 100%
rename from vlc.fedora.spec
rename to extras/package/rpm/vlc.fedora.spec

diff --git a/vlc.mandriva.spec b/extras/package/rpm/vlc.mandriva.spec
similarity index 100%
rename from vlc.mandriva.spec
rename to extras/package/rpm/vlc.mandriva.spec

diff --git a/vlc.suse.spec b/extras/package/rpm/vlc.suse.spec
similarity index 100%
rename from vlc.suse.spec
rename to extras/package/rpm/vlc.suse.spec

diff --git a/vlc.exe.manifest b/extras/package/win32/vlc.exe.manifest
similarity index 100%
rename from vlc.exe.manifest
rename to extras/package/win32/vlc.exe.manifest

diff --git a/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
similarity index 100%
rename from vlc.win32.nsi.in
rename to extras/package/win32/vlc.win32.nsi.in

diff --git a/activex/Makefile.am b/projects/activex/Makefile.am
similarity index 100%
rename from activex/Makefile.am
rename to projects/activex/Makefile.am

diff --git a/activex/README.TXT b/projects/activex/README.TXT
similarity index 100%
rename from activex/README.TXT
rename to projects/activex/README.TXT

diff --git a/activex/axvlc.def b/projects/activex/axvlc.def
similarity index 100%
rename from activex/axvlc.def
rename to projects/activex/axvlc.def

diff --git a/activex/axvlc.idl b/projects/activex/axvlc.idl
similarity index 100%
rename from activex/axvlc.idl
rename to projects/activex/axvlc.idl

diff --git a/activex/axvlc.inf.in b/projects/activex/axvlc.inf.in
similarity index 100%
rename from activex/axvlc.inf.in
rename to projects/activex/axvlc.inf.in

diff --git a/activex/axvlc.tlb b/projects/activex/axvlc.tlb
similarity index 100%
rename from activex/axvlc.tlb
rename to projects/activex/axvlc.tlb

diff --git a/activex/axvlc_idl.c b/projects/activex/axvlc_idl.c
similarity index 100%
rename from activex/axvlc_idl.c
rename to projects/activex/axvlc_idl.c

diff --git a/activex/axvlc_idl.h b/projects/activex/axvlc_idl.h
similarity index 100%
rename from activex/axvlc_idl.h
rename to projects/activex/axvlc_idl.h

diff --git a/activex/axvlc_rc.rc b/projects/activex/axvlc_rc.rc
similarity index 100%
rename from activex/axvlc_rc.rc
rename to projects/activex/axvlc_rc.rc

diff --git a/activex/connectioncontainer.cpp b/projects/activex/connectioncontainer.cpp
similarity index 100%
rename from activex/connectioncontainer.cpp
rename to projects/activex/connectioncontainer.cpp

diff --git a/activex/connectioncontainer.h b/projects/activex/connectioncontainer.h
similarity index 100%
rename from activex/connectioncontainer.h
rename to projects/activex/connectioncontainer.h

diff --git a/activex/dataobject.cpp b/projects/activex/dataobject.cpp
similarity index 100%
rename from activex/dataobject.cpp
rename to projects/activex/dataobject.cpp

diff --git a/activex/dataobject.h b/projects/activex/dataobject.h
similarity index 100%
rename from activex/dataobject.h
rename to projects/activex/dataobject.h

diff --git a/activex/guiddef.h b/projects/activex/guiddef.h
similarity index 100%
rename from activex/guiddef.h
rename to projects/activex/guiddef.h

diff --git a/activex/inplace.bmp b/projects/activex/inplace.bmp
similarity index 100%
rename from activex/inplace.bmp
rename to projects/activex/inplace.bmp

diff --git a/activex/main.cpp b/projects/activex/main.cpp
similarity index 100%
rename from activex/main.cpp
rename to projects/activex/main.cpp

diff --git a/activex/objectsafety.cpp b/projects/activex/objectsafety.cpp
similarity index 100%
rename from activex/objectsafety.cpp
rename to projects/activex/objectsafety.cpp

diff --git a/activex/objectsafety.h b/projects/activex/objectsafety.h
similarity index 100%
rename from activex/objectsafety.h
rename to projects/activex/objectsafety.h

diff --git a/activex/olecontrol.cpp b/projects/activex/olecontrol.cpp
similarity index 100%
rename from activex/olecontrol.cpp
rename to projects/activex/olecontrol.cpp

diff --git a/activex/olecontrol.h b/projects/activex/olecontrol.h
similarity index 100%
rename from activex/olecontrol.h
rename to projects/activex/olecontrol.h

diff --git a/activex/oleinplaceactiveobject.cpp b/projects/activex/oleinplaceactiveobject.cpp
similarity index 100%
rename from activex/oleinplaceactiveobject.cpp
rename to projects/activex/oleinplaceactiveobject.cpp

diff --git a/activex/oleinplaceactiveobject.h b/projects/activex/oleinplaceactiveobject.h
similarity index 100%
rename from activex/oleinplaceactiveobject.h
rename to projects/activex/oleinplaceactiveobject.h

diff --git a/activex/oleinplaceobject.cpp b/projects/activex/oleinplaceobject.cpp
similarity index 100%
rename from activex/oleinplaceobject.cpp
rename to projects/activex/oleinplaceobject.cpp

diff --git a/activex/oleinplaceobject.h b/projects/activex/oleinplaceobject.h
similarity index 100%
rename from activex/oleinplaceobject.h
rename to projects/activex/oleinplaceobject.h

diff --git a/activex/oleobject.cpp b/projects/activex/oleobject.cpp
similarity index 100%
rename from activex/oleobject.cpp
rename to projects/activex/oleobject.cpp

diff --git a/activex/oleobject.h b/projects/activex/oleobject.h
similarity index 100%
rename from activex/oleobject.h
rename to projects/activex/oleobject.h

diff --git a/activex/persistpropbag.cpp b/projects/activex/persistpropbag.cpp
similarity index 100%
rename from activex/persistpropbag.cpp
rename to projects/activex/persistpropbag.cpp

diff --git a/activex/persistpropbag.h b/projects/activex/persistpropbag.h
similarity index 100%
rename from activex/persistpropbag.h
rename to projects/activex/persistpropbag.h

diff --git a/activex/persiststorage.cpp b/projects/activex/persiststorage.cpp
similarity index 100%
rename from activex/persiststorage.cpp
rename to projects/activex/persiststorage.cpp

diff --git a/activex/persiststorage.h b/projects/activex/persiststorage.h
similarity index 100%
rename from activex/persiststorage.h
rename to projects/activex/persiststorage.h

diff --git a/activex/persiststreaminit.cpp b/projects/activex/persiststreaminit.cpp
similarity index 100%
rename from activex/persiststreaminit.cpp
rename to projects/activex/persiststreaminit.cpp

diff --git a/activex/persiststreaminit.h b/projects/activex/persiststreaminit.h
similarity index 100%
rename from activex/persiststreaminit.h
rename to projects/activex/persiststreaminit.h

diff --git a/activex/plugin.cpp b/projects/activex/plugin.cpp
similarity index 100%
rename from activex/plugin.cpp
rename to projects/activex/plugin.cpp

diff --git a/activex/plugin.h b/projects/activex/plugin.h
similarity index 100%
rename from activex/plugin.h
rename to projects/activex/plugin.h

diff --git a/activex/provideclassinfo.cpp b/projects/activex/provideclassinfo.cpp
similarity index 100%
rename from activex/provideclassinfo.cpp
rename to projects/activex/provideclassinfo.cpp

diff --git a/activex/provideclassinfo.h b/projects/activex/provideclassinfo.h
similarity index 100%
rename from activex/provideclassinfo.h
rename to projects/activex/provideclassinfo.h

diff --git a/activex/supporterrorinfo.cpp b/projects/activex/supporterrorinfo.cpp
similarity index 100%
rename from activex/supporterrorinfo.cpp
rename to projects/activex/supporterrorinfo.cpp

diff --git a/activex/supporterrorinfo.h b/projects/activex/supporterrorinfo.h
similarity index 100%
rename from activex/supporterrorinfo.h
rename to projects/activex/supporterrorinfo.h

diff --git a/activex/test.html b/projects/activex/test.html
similarity index 100%
rename from activex/test.html
rename to projects/activex/test.html

diff --git a/activex/utils.cpp b/projects/activex/utils.cpp
similarity index 100%
rename from activex/utils.cpp
rename to projects/activex/utils.cpp

diff --git a/activex/utils.h b/projects/activex/utils.h
similarity index 100%
rename from activex/utils.h
rename to projects/activex/utils.h

diff --git a/activex/viewobject.cpp b/projects/activex/viewobject.cpp
similarity index 100%
rename from activex/viewobject.cpp
rename to projects/activex/viewobject.cpp

diff --git a/activex/viewobject.h b/projects/activex/viewobject.h
similarity index 100%
rename from activex/viewobject.h
rename to projects/activex/viewobject.h

diff --git a/activex/vlc16x16.bmp b/projects/activex/vlc16x16.bmp
similarity index 100%
rename from activex/vlc16x16.bmp
rename to projects/activex/vlc16x16.bmp

diff --git a/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp
similarity index 100%
rename from activex/vlccontrol.cpp
rename to projects/activex/vlccontrol.cpp

diff --git a/activex/vlccontrol.h b/projects/activex/vlccontrol.h
similarity index 100%
rename from activex/vlccontrol.h
rename to projects/activex/vlccontrol.h

diff --git a/activex/vlccontrol2.cpp b/projects/activex/vlccontrol2.cpp
similarity index 100%
rename from activex/vlccontrol2.cpp
rename to projects/activex/vlccontrol2.cpp

diff --git a/activex/vlccontrol2.h b/projects/activex/vlccontrol2.h
similarity index 100%
rename from activex/vlccontrol2.h
rename to projects/activex/vlccontrol2.h

diff --git a/mozilla/Makefile.am b/projects/mozilla/Makefile.am
similarity index 100%
rename from mozilla/Makefile.am
rename to projects/mozilla/Makefile.am

diff --git a/mozilla/control/npolibvlc.cpp b/projects/mozilla/control/npolibvlc.cpp
similarity index 100%
rename from mozilla/control/npolibvlc.cpp
rename to projects/mozilla/control/npolibvlc.cpp

diff --git a/mozilla/control/npolibvlc.h b/projects/mozilla/control/npolibvlc.h
similarity index 100%
rename from mozilla/control/npolibvlc.h
rename to projects/mozilla/control/npolibvlc.h

diff --git a/mozilla/control/nporuntime.cpp b/projects/mozilla/control/nporuntime.cpp
similarity index 100%
rename from mozilla/control/nporuntime.cpp
rename to projects/mozilla/control/nporuntime.cpp

diff --git a/mozilla/control/nporuntime.h b/projects/mozilla/control/nporuntime.h
similarity index 100%
rename from mozilla/control/nporuntime.h
rename to projects/mozilla/control/nporuntime.h

diff --git a/mozilla/control/npovlc.cpp b/projects/mozilla/control/npovlc.cpp
similarity index 100%
rename from mozilla/control/npovlc.cpp
rename to projects/mozilla/control/npovlc.cpp

diff --git a/mozilla/control/npovlc.h b/projects/mozilla/control/npovlc.h
similarity index 100%
rename from mozilla/control/npovlc.h
rename to projects/mozilla/control/npovlc.h

diff --git a/mozilla/install.js b/projects/mozilla/install.js
similarity index 100%
rename from mozilla/install.js
rename to projects/mozilla/install.js

diff --git a/mozilla/npvlc_rc.rc b/projects/mozilla/npvlc_rc.rc
similarity index 100%
rename from mozilla/npvlc_rc.rc
rename to projects/mozilla/npvlc_rc.rc

diff --git a/mozilla/support/classinfo.h b/projects/mozilla/support/classinfo.h
similarity index 100%
rename from mozilla/support/classinfo.h
rename to projects/mozilla/support/classinfo.h

diff --git a/mozilla/support/npmac.cpp b/projects/mozilla/support/npmac.cpp
similarity index 100%
rename from mozilla/support/npmac.cpp
rename to projects/mozilla/support/npmac.cpp

diff --git a/mozilla/support/npunix.c b/projects/mozilla/support/npunix.c
similarity index 100%
rename from mozilla/support/npunix.c
rename to projects/mozilla/support/npunix.c

diff --git a/mozilla/support/npwin.cpp b/projects/mozilla/support/npwin.cpp
similarity index 100%
rename from mozilla/support/npwin.cpp
rename to projects/mozilla/support/npwin.cpp

diff --git a/mozilla/test.html b/projects/mozilla/test.html
similarity index 100%
rename from mozilla/test.html
rename to projects/mozilla/test.html

diff --git a/mozilla/vlc.r b/projects/mozilla/vlc.r
similarity index 100%
rename from mozilla/vlc.r
rename to projects/mozilla/vlc.r

diff --git a/mozilla/vlcplugin.cpp b/projects/mozilla/vlcplugin.cpp
similarity index 100%
rename from mozilla/vlcplugin.cpp
rename to projects/mozilla/vlcplugin.cpp

diff --git a/mozilla/vlcplugin.h b/projects/mozilla/vlcplugin.h
similarity index 100%
rename from mozilla/vlcplugin.h
rename to projects/mozilla/vlcplugin.h

diff --git a/mozilla/vlcshell.cpp b/projects/mozilla/vlcshell.cpp
similarity index 100%
rename from mozilla/vlcshell.cpp
rename to projects/mozilla/vlcshell.cpp