diff --git a/libmpcodecs/ad.c b/audio/decode/ad.c
similarity index 100%
rename from libmpcodecs/ad.c
rename to audio/decode/ad.c
diff --git a/libmpcodecs/ad.h b/audio/decode/ad.h
similarity index 100%
rename from libmpcodecs/ad.h
rename to audio/decode/ad.h
diff --git a/libmpcodecs/ad_dvdpcm.c b/audio/decode/ad_dvdpcm.c
similarity index 100%
rename from libmpcodecs/ad_dvdpcm.c
rename to audio/decode/ad_dvdpcm.c
diff --git a/libmpcodecs/ad_internal.h b/audio/decode/ad_internal.h
similarity index 100%
rename from libmpcodecs/ad_internal.h
rename to audio/decode/ad_internal.h
diff --git a/libmpcodecs/ad_ffmpeg.c b/audio/decode/ad_lavc.c
similarity index 100%
rename from libmpcodecs/ad_ffmpeg.c
rename to audio/decode/ad_lavc.c
diff --git a/libmpcodecs/ad_mpg123.c b/audio/decode/ad_mpg123.c
similarity index 100%
rename from libmpcodecs/ad_mpg123.c
rename to audio/decode/ad_mpg123.c
diff --git a/libmpcodecs/ad_pcm.c b/audio/decode/ad_pcm.c
similarity index 100%
rename from libmpcodecs/ad_pcm.c
rename to audio/decode/ad_pcm.c
diff --git a/libmpcodecs/ad_spdif.c b/audio/decode/ad_spdif.c
similarity index 100%
rename from libmpcodecs/ad_spdif.c
rename to audio/decode/ad_spdif.c
diff --git a/libmpcodecs/dec_audio.c b/audio/decode/dec_audio.c
similarity index 100%
rename from libmpcodecs/dec_audio.c
rename to audio/decode/dec_audio.c
diff --git a/libmpcodecs/dec_audio.h b/audio/decode/dec_audio.h
similarity index 100%
rename from libmpcodecs/dec_audio.h
rename to audio/decode/dec_audio.h
diff --git a/libaf/af.c b/audio/filter/af.c
similarity index 100%
rename from libaf/af.c
rename to audio/filter/af.c
diff --git a/libaf/af.h b/audio/filter/af.h
similarity index 100%
rename from libaf/af.h
rename to audio/filter/af.h
diff --git a/libaf/af_bs2b.c b/audio/filter/af_bs2b.c
similarity index 100%
rename from libaf/af_bs2b.c
rename to audio/filter/af_bs2b.c
diff --git a/libaf/af_center.c b/audio/filter/af_center.c
similarity index 100%
rename from libaf/af_center.c
rename to audio/filter/af_center.c
diff --git a/libaf/af_channels.c b/audio/filter/af_channels.c
similarity index 100%
rename from libaf/af_channels.c
rename to audio/filter/af_channels.c
diff --git a/libaf/af_delay.c b/audio/filter/af_delay.c
similarity index 100%
rename from libaf/af_delay.c
rename to audio/filter/af_delay.c
diff --git a/libaf/af_dummy.c b/audio/filter/af_dummy.c
similarity index 100%
rename from libaf/af_dummy.c
rename to audio/filter/af_dummy.c
diff --git a/libaf/af_equalizer.c b/audio/filter/af_equalizer.c
similarity index 100%
rename from libaf/af_equalizer.c
rename to audio/filter/af_equalizer.c
diff --git a/libaf/af_export.c b/audio/filter/af_export.c
similarity index 100%
rename from libaf/af_export.c
rename to audio/filter/af_export.c
diff --git a/libaf/af_extrastereo.c b/audio/filter/af_extrastereo.c
similarity index 100%
rename from libaf/af_extrastereo.c
rename to audio/filter/af_extrastereo.c
diff --git a/libaf/af_format.c b/audio/filter/af_format.c
similarity index 100%
rename from libaf/af_format.c
rename to audio/filter/af_format.c
diff --git a/libaf/af_format_alaw.h b/audio/filter/af_format_alaw.h
similarity index 100%
rename from libaf/af_format_alaw.h
rename to audio/filter/af_format_alaw.h
diff --git a/libaf/af_format_ulaw.h b/audio/filter/af_format_ulaw.h
similarity index 100%
rename from libaf/af_format_ulaw.h
rename to audio/filter/af_format_ulaw.h
diff --git a/libaf/af_hrtf.c b/audio/filter/af_hrtf.c
similarity index 100%
rename from libaf/af_hrtf.c
rename to audio/filter/af_hrtf.c
diff --git a/libaf/af_hrtf.h b/audio/filter/af_hrtf.h
similarity index 100%
rename from libaf/af_hrtf.h
rename to audio/filter/af_hrtf.h
diff --git a/libaf/af_karaoke.c b/audio/filter/af_karaoke.c
similarity index 100%
rename from libaf/af_karaoke.c
rename to audio/filter/af_karaoke.c
diff --git a/libaf/af_ladspa.c b/audio/filter/af_ladspa.c
similarity index 100%
rename from libaf/af_ladspa.c
rename to audio/filter/af_ladspa.c
diff --git a/libaf/af_lavcac3enc.c b/audio/filter/af_lavcac3enc.c
similarity index 100%
rename from libaf/af_lavcac3enc.c
rename to audio/filter/af_lavcac3enc.c
diff --git a/libaf/af_lavcresample.c b/audio/filter/af_lavcresample.c
similarity index 100%
rename from libaf/af_lavcresample.c
rename to audio/filter/af_lavcresample.c
diff --git a/libaf/af_pan.c b/audio/filter/af_pan.c
similarity index 100%
rename from libaf/af_pan.c
rename to audio/filter/af_pan.c
diff --git a/libaf/af_resample.c b/audio/filter/af_resample.c
similarity index 100%
rename from libaf/af_resample.c
rename to audio/filter/af_resample.c
diff --git a/libaf/af_resample_template.c b/audio/filter/af_resample_template.c
similarity index 100%
rename from libaf/af_resample_template.c
rename to audio/filter/af_resample_template.c
diff --git a/libaf/af_scaletempo.c b/audio/filter/af_scaletempo.c
similarity index 100%
rename from libaf/af_scaletempo.c
rename to audio/filter/af_scaletempo.c
diff --git a/libaf/af_sinesuppress.c b/audio/filter/af_sinesuppress.c
similarity index 100%
rename from libaf/af_sinesuppress.c
rename to audio/filter/af_sinesuppress.c
diff --git a/libaf/af_sub.c b/audio/filter/af_sub.c
similarity index 100%
rename from libaf/af_sub.c
rename to audio/filter/af_sub.c
diff --git a/libaf/af_surround.c b/audio/filter/af_surround.c
similarity index 100%
rename from libaf/af_surround.c
rename to audio/filter/af_surround.c
diff --git a/libaf/af_sweep.c b/audio/filter/af_sweep.c
similarity index 100%
rename from libaf/af_sweep.c
rename to audio/filter/af_sweep.c
diff --git a/libaf/af_tools.c b/audio/filter/af_tools.c
similarity index 100%
rename from libaf/af_tools.c
rename to audio/filter/af_tools.c
diff --git a/libaf/af_volnorm.c b/audio/filter/af_volnorm.c
similarity index 100%
rename from libaf/af_volnorm.c
rename to audio/filter/af_volnorm.c
diff --git a/libaf/af_volume.c b/audio/filter/af_volume.c
similarity index 100%
rename from libaf/af_volume.c
rename to audio/filter/af_volume.c
diff --git a/libaf/control.h b/audio/filter/control.h
similarity index 100%
rename from libaf/control.h
rename to audio/filter/control.h
diff --git a/libaf/dsp.h b/audio/filter/dsp.h
similarity index 100%
rename from libaf/dsp.h
rename to audio/filter/dsp.h
diff --git a/libaf/equalizer.h b/audio/filter/equalizer.h
similarity index 100%
rename from libaf/equalizer.h
rename to audio/filter/equalizer.h
diff --git a/libaf/filter.c b/audio/filter/filter.c
similarity index 100%
rename from libaf/filter.c
rename to audio/filter/filter.c
diff --git a/libaf/filter.h b/audio/filter/filter.h
similarity index 100%
rename from libaf/filter.h
rename to audio/filter/filter.h
diff --git a/libaf/window.c b/audio/filter/window.c
similarity index 100%
rename from libaf/window.c
rename to audio/filter/window.c
diff --git a/libaf/window.h b/audio/filter/window.h
similarity index 100%
rename from libaf/window.h
rename to audio/filter/window.h
diff --git a/libaf/format.c b/audio/format.c
similarity index 100%
rename from libaf/format.c
rename to audio/format.c
diff --git a/libaf/format.h b/audio/format.h
similarity index 100%
rename from libaf/format.h
rename to audio/format.h
diff --git a/mixer.c b/audio/mixer.c
similarity index 100%
rename from mixer.c
rename to audio/mixer.c
diff --git a/mixer.h b/audio/mixer.h
similarity index 100%
rename from mixer.h
rename to audio/mixer.h
diff --git a/libao2/audio_out.c b/audio/out/ao.c
similarity index 100%
rename from libao2/audio_out.c
rename to audio/out/ao.c
diff --git a/libao2/audio_out.h b/audio/out/ao.h
similarity index 100%
rename from libao2/audio_out.h
rename to audio/out/ao.h
diff --git a/libao2/ao_alsa.c b/audio/out/ao_alsa.c
similarity index 100%
rename from libao2/ao_alsa.c
rename to audio/out/ao_alsa.c
diff --git a/libao2/ao_coreaudio.c b/audio/out/ao_coreaudio.c
similarity index 100%
rename from libao2/ao_coreaudio.c
rename to audio/out/ao_coreaudio.c
diff --git a/libao2/ao_dsound.c b/audio/out/ao_dsound.c
similarity index 100%
rename from libao2/ao_dsound.c
rename to audio/out/ao_dsound.c
diff --git a/libao2/ao_jack.c b/audio/out/ao_jack.c
similarity index 100%
rename from libao2/ao_jack.c
rename to audio/out/ao_jack.c
diff --git a/libao2/ao_lavc.c b/audio/out/ao_lavc.c
similarity index 100%
rename from libao2/ao_lavc.c
rename to audio/out/ao_lavc.c
diff --git a/libao2/ao_null.c b/audio/out/ao_null.c
similarity index 100%
rename from libao2/ao_null.c
rename to audio/out/ao_null.c
diff --git a/libao2/ao_openal.c b/audio/out/ao_openal.c
similarity index 100%
rename from libao2/ao_openal.c
rename to audio/out/ao_openal.c
diff --git a/libao2/ao_oss.c b/audio/out/ao_oss.c
similarity index 100%
rename from libao2/ao_oss.c
rename to audio/out/ao_oss.c
diff --git a/libao2/ao_pcm.c b/audio/out/ao_pcm.c
similarity index 100%
rename from libao2/ao_pcm.c
rename to audio/out/ao_pcm.c
diff --git a/libao2/ao_portaudio.c b/audio/out/ao_portaudio.c
similarity index 100%
rename from libao2/ao_portaudio.c
rename to audio/out/ao_portaudio.c
diff --git a/libao2/ao_pulse.c b/audio/out/ao_pulse.c
similarity index 100%
rename from libao2/ao_pulse.c
rename to audio/out/ao_pulse.c
diff --git a/libao2/ao_rsound.c b/audio/out/ao_rsound.c
similarity index 100%
rename from libao2/ao_rsound.c
rename to audio/out/ao_rsound.c
diff --git a/libao2/audio_out_internal.h b/audio/out/audio_out_internal.h
similarity index 100%
rename from libao2/audio_out_internal.h
rename to audio/out/audio_out_internal.h
diff --git a/libaf/reorder_ch.c b/audio/reorder_ch.c
similarity index 100%
rename from libaf/reorder_ch.c
rename to audio/reorder_ch.c
diff --git a/libaf/reorder_ch.h b/audio/reorder_ch.h
similarity index 100%
rename from libaf/reorder_ch.h
rename to audio/reorder_ch.h
diff --git a/libav_compat.h b/compat/libav.h
similarity index 100%
rename from libav_compat.h
rename to compat/libav.h
diff --git a/mangle.h b/compat/mangle.h
similarity index 100%
rename from mangle.h
rename to compat/mangle.h
diff --git a/mpbswap.h b/compat/mpbswap.h
similarity index 100%
rename from mpbswap.h
rename to compat/mpbswap.h
diff --git a/ffmpeg_files/x86_cpu.h b/compat/x86_cpu.h
similarity index 100%
rename from ffmpeg_files/x86_cpu.h
rename to compat/x86_cpu.h
diff --git a/asxparser.c b/core/asxparser.c
similarity index 100%
rename from asxparser.c
rename to core/asxparser.c
diff --git a/asxparser.h b/core/asxparser.h
similarity index 100%
rename from asxparser.h
rename to core/asxparser.h
diff --git a/av_log.c b/core/av_log.c
similarity index 100%
rename from av_log.c
rename to core/av_log.c
diff --git a/av_log.h b/core/av_log.h
similarity index 100%
rename from av_log.h
rename to core/av_log.h
diff --git a/av_opts.c b/core/av_opts.c
similarity index 100%
rename from av_opts.c
rename to core/av_opts.c
diff --git a/av_opts.h b/core/av_opts.h
similarity index 100%
rename from av_opts.h
rename to core/av_opts.h
diff --git a/bstr.c b/core/bstr.c
similarity index 100%
rename from bstr.c
rename to core/bstr.c
diff --git a/bstr.h b/core/bstr.h
similarity index 100%
rename from bstr.h
rename to core/bstr.h
diff --git a/cfg-mplayer.h b/core/cfg-mplayer.h
similarity index 100%
rename from cfg-mplayer.h
rename to core/cfg-mplayer.h
diff --git a/codec-cfg.c b/core/codec-cfg.c
similarity index 100%
rename from codec-cfg.c
rename to core/codec-cfg.c
diff --git a/codec-cfg.h b/core/codec-cfg.h
similarity index 100%
rename from codec-cfg.h
rename to core/codec-cfg.h
diff --git a/command.c b/core/command.c
similarity index 100%
rename from command.c
rename to core/command.c
diff --git a/command.h b/core/command.h
similarity index 100%
rename from command.h
rename to core/command.h
diff --git a/cpudetect.c b/core/cpudetect.c
similarity index 100%
rename from cpudetect.c
rename to core/cpudetect.c
diff --git a/cpudetect.h b/core/cpudetect.h
similarity index 100%
rename from cpudetect.h
rename to core/cpudetect.h
diff --git a/defaultopts.c b/core/defaultopts.c
similarity index 100%
rename from defaultopts.c
rename to core/defaultopts.c
diff --git a/defaultopts.h b/core/defaultopts.h
similarity index 100%
rename from defaultopts.h
rename to core/defaultopts.h
diff --git a/encode.h b/core/encode.h
similarity index 100%
rename from encode.h
rename to core/encode.h
diff --git a/encode_lavc.c b/core/encode_lavc.c
similarity index 100%
rename from encode_lavc.c
rename to core/encode_lavc.c
diff --git a/encode_lavc.h b/core/encode_lavc.h
similarity index 100%
rename from encode_lavc.h
rename to core/encode_lavc.h
diff --git a/input/appleir.c b/core/input/appleir.c
similarity index 100%
rename from input/appleir.c
rename to core/input/appleir.c
diff --git a/input/ar.c b/core/input/ar.c
similarity index 100%
rename from input/ar.c
rename to core/input/ar.c
diff --git a/input/ar.h b/core/input/ar.h
similarity index 100%
rename from input/ar.h
rename to core/input/ar.h
diff --git a/input/input.c b/core/input/input.c
similarity index 100%
rename from input/input.c
rename to core/input/input.c
diff --git a/input/input.h b/core/input/input.h
similarity index 100%
rename from input/input.h
rename to core/input/input.h
diff --git a/input/joystick.c b/core/input/joystick.c
similarity index 100%
rename from input/joystick.c
rename to core/input/joystick.c
diff --git a/input/joystick.h b/core/input/joystick.h
similarity index 100%
rename from input/joystick.h
rename to core/input/joystick.h
diff --git a/input/keycodes.h b/core/input/keycodes.h
similarity index 100%
rename from input/keycodes.h
rename to core/input/keycodes.h
diff --git a/input/lirc.c b/core/input/lirc.c
similarity index 100%
rename from input/lirc.c
rename to core/input/lirc.c
diff --git a/input/lirc.h b/core/input/lirc.h
similarity index 100%
rename from input/lirc.h
rename to core/input/lirc.h
diff --git a/m_config.c b/core/m_config.c
similarity index 100%
rename from m_config.c
rename to core/m_config.c
diff --git a/m_config.h b/core/m_config.h
similarity index 100%
rename from m_config.h
rename to core/m_config.h
diff --git a/m_option.c b/core/m_option.c
similarity index 100%
rename from m_option.c
rename to core/m_option.c
diff --git a/m_option.h b/core/m_option.h
similarity index 100%
rename from m_option.h
rename to core/m_option.h
diff --git a/m_property.c b/core/m_property.c
similarity index 100%
rename from m_property.c
rename to core/m_property.c
diff --git a/m_property.h b/core/m_property.h
similarity index 100%
rename from m_property.h
rename to core/m_property.h
diff --git a/m_struct.c b/core/m_struct.c
similarity index 100%
rename from m_struct.c
rename to core/m_struct.c
diff --git a/m_struct.h b/core/m_struct.h
similarity index 100%
rename from m_struct.h
rename to core/m_struct.h
diff --git a/mpcommon.c b/core/mp_common.c
similarity index 100%
rename from mpcommon.c
rename to core/mp_common.c
diff --git a/mpcommon.h b/core/mp_common.h
similarity index 100%
rename from mpcommon.h
rename to core/mp_common.h
diff --git a/mp_core.h b/core/mp_core.h
similarity index 100%
rename from mp_core.h
rename to core/mp_core.h
diff --git a/mp_fifo.c b/core/mp_fifo.c
similarity index 100%
rename from mp_fifo.c
rename to core/mp_fifo.c
diff --git a/mp_fifo.h b/core/mp_fifo.h
similarity index 100%
rename from mp_fifo.h
rename to core/mp_fifo.h
diff --git a/mp_msg.c b/core/mp_msg.c
similarity index 100%
rename from mp_msg.c
rename to core/mp_msg.c
diff --git a/mp_msg.h b/core/mp_msg.h
similarity index 100%
rename from mp_msg.h
rename to core/mp_msg.h
diff --git a/mp_osd.h b/core/mp_osd.h
similarity index 100%
rename from mp_osd.h
rename to core/mp_osd.h
diff --git a/libmpcodecs/mpc_info.h b/core/mpc_info.h
similarity index 100%
rename from libmpcodecs/mpc_info.h
rename to core/mpc_info.h
diff --git a/mplayer.c b/core/mplayer.c
similarity index 100%
rename from mplayer.c
rename to core/mplayer.c
diff --git a/mplayer.h b/core/mplayer.h
similarity index 100%
rename from mplayer.h
rename to core/mplayer.h
diff --git a/options.h b/core/options.h
similarity index 100%
rename from options.h
rename to core/options.h
diff --git a/parser-cfg.c b/core/parser-cfg.c
similarity index 100%
rename from parser-cfg.c
rename to core/parser-cfg.c
diff --git a/parser-cfg.h b/core/parser-cfg.h
similarity index 100%
rename from parser-cfg.h
rename to core/parser-cfg.h
diff --git a/parser-mpcmd.c b/core/parser-mpcmd.c
similarity index 100%
rename from parser-mpcmd.c
rename to core/parser-mpcmd.c
diff --git a/parser-mpcmd.h b/core/parser-mpcmd.h
similarity index 100%
rename from parser-mpcmd.h
rename to core/parser-mpcmd.h
diff --git a/path.c b/core/path.c
similarity index 100%
rename from path.c
rename to core/path.c
diff --git a/path.h b/core/path.h
similarity index 100%
rename from path.h
rename to core/path.h
diff --git a/playlist.c b/core/playlist.c
similarity index 100%
rename from playlist.c
rename to core/playlist.c
diff --git a/playlist.h b/core/playlist.h
similarity index 100%
rename from playlist.h
rename to core/playlist.h
diff --git a/playlist_parser.c b/core/playlist_parser.c
similarity index 100%
rename from playlist_parser.c
rename to core/playlist_parser.c
diff --git a/playlist_parser.h b/core/playlist_parser.h
similarity index 100%
rename from playlist_parser.h
rename to core/playlist_parser.h
diff --git a/quvi.c b/core/quvi.c
similarity index 100%
rename from quvi.c
rename to core/quvi.c
diff --git a/screenshot.c b/core/screenshot.c
similarity index 100%
rename from screenshot.c
rename to core/screenshot.c
diff --git a/screenshot.h b/core/screenshot.h
similarity index 100%
rename from screenshot.h
rename to core/screenshot.h
diff --git a/subopt-helper.c b/core/subopt-helper.c
similarity index 100%
rename from subopt-helper.c
rename to core/subopt-helper.c
diff --git a/subopt-helper.h b/core/subopt-helper.h
similarity index 100%
rename from subopt-helper.h
rename to core/subopt-helper.h
diff --git a/timeline/tl_cue.c b/core/timeline/tl_cue.c
similarity index 100%
rename from timeline/tl_cue.c
rename to core/timeline/tl_cue.c
diff --git a/timeline/tl_edl.c b/core/timeline/tl_edl.c
similarity index 100%
rename from timeline/tl_edl.c
rename to core/timeline/tl_edl.c
diff --git a/timeline/tl_matroska.c b/core/timeline/tl_matroska.c
similarity index 100%
rename from timeline/tl_matroska.c
rename to core/timeline/tl_matroska.c
diff --git a/version.c b/core/version.c
similarity index 100%
rename from version.c
rename to core/version.c
diff --git a/libmpdemux/asf.h b/demux/asf.h
similarity index 100%
rename from libmpdemux/asf.h
rename to demux/asf.h
diff --git a/libmpdemux/asfguid.h b/demux/asfguid.h
similarity index 100%
rename from libmpdemux/asfguid.h
rename to demux/asfguid.h
diff --git a/libmpdemux/asfheader.c b/demux/asfheader.c
similarity index 100%
rename from libmpdemux/asfheader.c
rename to demux/asfheader.c
diff --git a/libmpdemux/asfheader.h b/demux/asfheader.h
similarity index 100%
rename from libmpdemux/asfheader.h
rename to demux/asfheader.h
diff --git a/libmpdemux/aviheader.c b/demux/aviheader.c
similarity index 100%
rename from libmpdemux/aviheader.c
rename to demux/aviheader.c
diff --git a/libmpdemux/aviheader.h b/demux/aviheader.h
similarity index 100%
rename from libmpdemux/aviheader.h
rename to demux/aviheader.h
diff --git a/libmpdemux/aviprint.c b/demux/aviprint.c
similarity index 100%
rename from libmpdemux/aviprint.c
rename to demux/aviprint.c
diff --git a/libmpdemux/aviprint.h b/demux/aviprint.h
similarity index 100%
rename from libmpdemux/aviprint.h
rename to demux/aviprint.h
diff --git a/libmpdemux/demuxer.c b/demux/demux.c
similarity index 100%
rename from libmpdemux/demuxer.c
rename to demux/demux.c
diff --git a/libmpdemux/demuxer.h b/demux/demux.h
similarity index 100%
rename from libmpdemux/demuxer.h
rename to demux/demux.h
diff --git a/libmpdemux/demux_asf.c b/demux/demux_asf.c
similarity index 100%
rename from libmpdemux/demux_asf.c
rename to demux/demux_asf.c
diff --git a/libmpdemux/demux_avi.c b/demux/demux_avi.c
similarity index 100%
rename from libmpdemux/demux_avi.c
rename to demux/demux_avi.c
diff --git a/libmpdemux/demux_cue.c b/demux/demux_cue.c
similarity index 100%
rename from libmpdemux/demux_cue.c
rename to demux/demux_cue.c
diff --git a/libmpdemux/demux_edl.c b/demux/demux_edl.c
similarity index 100%
rename from libmpdemux/demux_edl.c
rename to demux/demux_edl.c
diff --git a/libmpdemux/demux_gif.c b/demux/demux_gif.c
similarity index 100%
rename from libmpdemux/demux_gif.c
rename to demux/demux_gif.c
diff --git a/libmpdemux/demux_lavf.c b/demux/demux_lavf.c
similarity index 100%
rename from libmpdemux/demux_lavf.c
rename to demux/demux_lavf.c
diff --git a/libmpdemux/demux_mf.c b/demux/demux_mf.c
similarity index 100%
rename from libmpdemux/demux_mf.c
rename to demux/demux_mf.c
diff --git a/libmpdemux/demux_mkv.c b/demux/demux_mkv.c
similarity index 100%
rename from libmpdemux/demux_mkv.c
rename to demux/demux_mkv.c
diff --git a/libmpdemux/demux_mng.c b/demux/demux_mng.c
similarity index 100%
rename from libmpdemux/demux_mng.c
rename to demux/demux_mng.c
diff --git a/libmpdemux/demux_mpg.c b/demux/demux_mpg.c
similarity index 100%
rename from libmpdemux/demux_mpg.c
rename to demux/demux_mpg.c
diff --git a/libmpdemux/demux_packet.h b/demux/demux_packet.h
similarity index 100%
rename from libmpdemux/demux_packet.h
rename to demux/demux_packet.h
diff --git a/libmpdemux/demux_rawaudio.c b/demux/demux_rawaudio.c
similarity index 100%
rename from libmpdemux/demux_rawaudio.c
rename to demux/demux_rawaudio.c
diff --git a/libmpdemux/demux_rawvideo.c b/demux/demux_rawvideo.c
similarity index 100%
rename from libmpdemux/demux_rawvideo.c
rename to demux/demux_rawvideo.c
diff --git a/libmpdemux/demux_ts.c b/demux/demux_ts.c
similarity index 100%
rename from libmpdemux/demux_ts.c
rename to demux/demux_ts.c
diff --git a/libmpdemux/demux_ts.h b/demux/demux_ts.h
similarity index 100%
rename from libmpdemux/demux_ts.h
rename to demux/demux_ts.h
diff --git a/libmpdemux/ebml.c b/demux/ebml.c
similarity index 100%
rename from libmpdemux/ebml.c
rename to demux/ebml.c
diff --git a/libmpdemux/ebml.h b/demux/ebml.h
similarity index 100%
rename from libmpdemux/ebml.h
rename to demux/ebml.h
diff --git a/libmpdemux/extension.c b/demux/extension.c
similarity index 100%
rename from libmpdemux/extension.c
rename to demux/extension.c
diff --git a/libmpdemux/matroska.h b/demux/matroska.h
similarity index 100%
rename from libmpdemux/matroska.h
rename to demux/matroska.h
diff --git a/libmpdemux/mf.c b/demux/mf.c
similarity index 100%
rename from libmpdemux/mf.c
rename to demux/mf.c
diff --git a/libmpdemux/mf.h b/demux/mf.h
similarity index 100%
rename from libmpdemux/mf.h
rename to demux/mf.h
diff --git a/libmpdemux/mp3_hdr.c b/demux/mp3_hdr.c
similarity index 100%
rename from libmpdemux/mp3_hdr.c
rename to demux/mp3_hdr.c
diff --git a/libmpdemux/mp3_hdr.h b/demux/mp3_hdr.h
similarity index 100%
rename from libmpdemux/mp3_hdr.h
rename to demux/mp3_hdr.h
diff --git a/libmpdemux/mp_taglists.c b/demux/mp_taglists.c
similarity index 100%
rename from libmpdemux/mp_taglists.c
rename to demux/mp_taglists.c
diff --git a/libmpdemux/mp_taglists.h b/demux/mp_taglists.h
similarity index 100%
rename from libmpdemux/mp_taglists.h
rename to demux/mp_taglists.h
diff --git a/libmpdemux/mpeg_hdr.c b/demux/mpeg_hdr.c
similarity index 100%
rename from libmpdemux/mpeg_hdr.c
rename to demux/mpeg_hdr.c
diff --git a/libmpdemux/mpeg_hdr.h b/demux/mpeg_hdr.h
similarity index 100%
rename from libmpdemux/mpeg_hdr.h
rename to demux/mpeg_hdr.h
diff --git a/libmpdemux/ms_hdr.h b/demux/ms_hdr.h
similarity index 100%
rename from libmpdemux/ms_hdr.h
rename to demux/ms_hdr.h
diff --git a/libmpdemux/parse_es.c b/demux/parse_es.c
similarity index 100%
rename from libmpdemux/parse_es.c
rename to demux/parse_es.c
diff --git a/libmpdemux/parse_es.h b/demux/parse_es.h
similarity index 100%
rename from libmpdemux/parse_es.h
rename to demux/parse_es.h
diff --git a/libmpdemux/stheader.h b/demux/stheader.h
similarity index 100%
rename from libmpdemux/stheader.h
rename to demux/stheader.h
diff --git a/libmpdemux/video.c b/demux/video.c
similarity index 100%
rename from libmpdemux/video.c
rename to demux/video.c
diff --git a/stream/stream_ffmpeg.c b/stream/stream_lavf.c
similarity index 100%
rename from stream/stream_ffmpeg.c
rename to stream/stream_lavf.c
diff --git a/libvo/csputils.c b/video/csputils.c
similarity index 100%
rename from libvo/csputils.c
rename to video/csputils.c
diff --git a/libvo/csputils.h b/video/csputils.h
similarity index 100%
rename from libvo/csputils.h
rename to video/csputils.h
diff --git a/libmpcodecs/dec_video.c b/video/decode/dec_video.c
similarity index 100%
rename from libmpcodecs/dec_video.c
rename to video/decode/dec_video.c
diff --git a/libmpcodecs/dec_video.h b/video/decode/dec_video.h
similarity index 100%
rename from libmpcodecs/dec_video.h
rename to video/decode/dec_video.h
diff --git a/libmpcodecs/vd.c b/video/decode/vd.c
similarity index 100%
rename from libmpcodecs/vd.c
rename to video/decode/vd.c
diff --git a/libmpcodecs/vd.h b/video/decode/vd.h
similarity index 100%
rename from libmpcodecs/vd.h
rename to video/decode/vd.h
diff --git a/libmpcodecs/vd_ffmpeg.c b/video/decode/vd_lavc.c
similarity index 100%
rename from libmpcodecs/vd_ffmpeg.c
rename to video/decode/vd_lavc.c
diff --git a/libmpcodecs/pullup.c b/video/filter/pullup.c
similarity index 100%
rename from libmpcodecs/pullup.c
rename to video/filter/pullup.c
diff --git a/libmpcodecs/pullup.h b/video/filter/pullup.h
similarity index 100%
rename from libmpcodecs/pullup.h
rename to video/filter/pullup.h
diff --git a/libmpcodecs/vf.c b/video/filter/vf.c
similarity index 100%
rename from libmpcodecs/vf.c
rename to video/filter/vf.c
diff --git a/libmpcodecs/vf.h b/video/filter/vf.h
similarity index 100%
rename from libmpcodecs/vf.h
rename to video/filter/vf.h
diff --git a/libmpcodecs/vf_crop.c b/video/filter/vf_crop.c
similarity index 100%
rename from libmpcodecs/vf_crop.c
rename to video/filter/vf_crop.c
diff --git a/libmpcodecs/vf_delogo.c b/video/filter/vf_delogo.c
similarity index 100%
rename from libmpcodecs/vf_delogo.c
rename to video/filter/vf_delogo.c
diff --git a/libmpcodecs/vf_divtc.c b/video/filter/vf_divtc.c
similarity index 100%
rename from libmpcodecs/vf_divtc.c
rename to video/filter/vf_divtc.c
diff --git a/libmpcodecs/vf_dlopen.c b/video/filter/vf_dlopen.c
similarity index 100%
rename from libmpcodecs/vf_dlopen.c
rename to video/filter/vf_dlopen.c
diff --git a/libmpcodecs/vf_dlopen.h b/video/filter/vf_dlopen.h
similarity index 100%
rename from libmpcodecs/vf_dlopen.h
rename to video/filter/vf_dlopen.h
diff --git a/libmpcodecs/vf_down3dright.c b/video/filter/vf_down3dright.c
similarity index 100%
rename from libmpcodecs/vf_down3dright.c
rename to video/filter/vf_down3dright.c
diff --git a/libmpcodecs/vf_dsize.c b/video/filter/vf_dsize.c
similarity index 100%
rename from libmpcodecs/vf_dsize.c
rename to video/filter/vf_dsize.c
diff --git a/libmpcodecs/vf_eq2.c b/video/filter/vf_eq2.c
similarity index 100%
rename from libmpcodecs/vf_eq2.c
rename to video/filter/vf_eq2.c
diff --git a/libmpcodecs/vf_expand.c b/video/filter/vf_expand.c
similarity index 100%
rename from libmpcodecs/vf_expand.c
rename to video/filter/vf_expand.c
diff --git a/libmpcodecs/vf_flip.c b/video/filter/vf_flip.c
similarity index 100%
rename from libmpcodecs/vf_flip.c
rename to video/filter/vf_flip.c
diff --git a/libmpcodecs/vf_format.c b/video/filter/vf_format.c
similarity index 100%
rename from libmpcodecs/vf_format.c
rename to video/filter/vf_format.c
diff --git a/libmpcodecs/vf_gradfun.c b/video/filter/vf_gradfun.c
similarity index 100%
rename from libmpcodecs/vf_gradfun.c
rename to video/filter/vf_gradfun.c
diff --git a/libmpcodecs/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c
similarity index 100%
rename from libmpcodecs/vf_hqdn3d.c
rename to video/filter/vf_hqdn3d.c
diff --git a/libmpcodecs/vf_ilpack.c b/video/filter/vf_ilpack.c
similarity index 100%
rename from libmpcodecs/vf_ilpack.c
rename to video/filter/vf_ilpack.c
diff --git a/libmpcodecs/vf_mirror.c b/video/filter/vf_mirror.c
similarity index 100%
rename from libmpcodecs/vf_mirror.c
rename to video/filter/vf_mirror.c
diff --git a/libmpcodecs/vf_noformat.c b/video/filter/vf_noformat.c
similarity index 100%
rename from libmpcodecs/vf_noformat.c
rename to video/filter/vf_noformat.c
diff --git a/libmpcodecs/vf_noise.c b/video/filter/vf_noise.c
similarity index 100%
rename from libmpcodecs/vf_noise.c
rename to video/filter/vf_noise.c
diff --git a/libmpcodecs/vf_phase.c b/video/filter/vf_phase.c
similarity index 100%
rename from libmpcodecs/vf_phase.c
rename to video/filter/vf_phase.c
diff --git a/libmpcodecs/vf_pp.c b/video/filter/vf_pp.c
similarity index 100%
rename from libmpcodecs/vf_pp.c
rename to video/filter/vf_pp.c
diff --git a/libmpcodecs/vf_pullup.c b/video/filter/vf_pullup.c
similarity index 100%
rename from libmpcodecs/vf_pullup.c
rename to video/filter/vf_pullup.c
diff --git a/libmpcodecs/vf_rotate.c b/video/filter/vf_rotate.c
similarity index 100%
rename from libmpcodecs/vf_rotate.c
rename to video/filter/vf_rotate.c
diff --git a/libmpcodecs/vf_scale.c b/video/filter/vf_scale.c
similarity index 100%
rename from libmpcodecs/vf_scale.c
rename to video/filter/vf_scale.c
diff --git a/libmpcodecs/vf_screenshot.c b/video/filter/vf_screenshot.c
similarity index 100%
rename from libmpcodecs/vf_screenshot.c
rename to video/filter/vf_screenshot.c
diff --git a/libmpcodecs/vf_softpulldown.c b/video/filter/vf_softpulldown.c
similarity index 100%
rename from libmpcodecs/vf_softpulldown.c
rename to video/filter/vf_softpulldown.c
diff --git a/libmpcodecs/vf_stereo3d.c b/video/filter/vf_stereo3d.c
similarity index 100%
rename from libmpcodecs/vf_stereo3d.c
rename to video/filter/vf_stereo3d.c
diff --git a/libmpcodecs/vf_sub.c b/video/filter/vf_sub.c
similarity index 100%
rename from libmpcodecs/vf_sub.c
rename to video/filter/vf_sub.c
diff --git a/libmpcodecs/vf_swapuv.c b/video/filter/vf_swapuv.c
similarity index 100%
rename from libmpcodecs/vf_swapuv.c
rename to video/filter/vf_swapuv.c
diff --git a/libmpcodecs/vf_unsharp.c b/video/filter/vf_unsharp.c
similarity index 100%
rename from libmpcodecs/vf_unsharp.c
rename to video/filter/vf_unsharp.c
diff --git a/libmpcodecs/vf_vo.c b/video/filter/vf_vo.c
similarity index 100%
rename from libmpcodecs/vf_vo.c
rename to video/filter/vf_vo.c
diff --git a/libmpcodecs/vf_yadif.c b/video/filter/vf_yadif.c
similarity index 100%
rename from libmpcodecs/vf_yadif.c
rename to video/filter/vf_yadif.c
diff --git a/fmt-conversion.c b/video/fmt-conversion.c
similarity index 100%
rename from fmt-conversion.c
rename to video/fmt-conversion.c
diff --git a/fmt-conversion.h b/video/fmt-conversion.h
similarity index 100%
rename from fmt-conversion.h
rename to video/fmt-conversion.h
diff --git a/image_writer.c b/video/image_writer.c
similarity index 100%
rename from image_writer.c
rename to video/image_writer.c
diff --git a/image_writer.h b/video/image_writer.h
similarity index 100%
rename from image_writer.h
rename to video/image_writer.h
diff --git a/libmpcodecs/img_format.c b/video/img_format.c
similarity index 100%
rename from libmpcodecs/img_format.c
rename to video/img_format.c
diff --git a/libmpcodecs/img_format.h b/video/img_format.h
similarity index 100%
rename from libmpcodecs/img_format.h
rename to video/img_format.h
diff --git a/libvo/fastmemcpy.h b/video/memcpy_pic.h
similarity index 100%
rename from libvo/fastmemcpy.h
rename to video/memcpy_pic.h
diff --git a/libmpcodecs/mp_image.c b/video/mp_image.c
similarity index 100%
rename from libmpcodecs/mp_image.c
rename to video/mp_image.c
diff --git a/libmpcodecs/mp_image.h b/video/mp_image.h
similarity index 100%
rename from libmpcodecs/mp_image.h
rename to video/mp_image.h
diff --git a/libvo/aspect.c b/video/out/aspect.c
similarity index 100%
rename from libvo/aspect.c
rename to video/out/aspect.c
diff --git a/libvo/aspect.h b/video/out/aspect.h
similarity index 100%
rename from libvo/aspect.h
rename to video/out/aspect.h
diff --git a/libvo/bitmap_packer.c b/video/out/bitmap_packer.c
similarity index 100%
rename from libvo/bitmap_packer.c
rename to video/out/bitmap_packer.c
diff --git a/libvo/bitmap_packer.h b/video/out/bitmap_packer.h
similarity index 100%
rename from libvo/bitmap_packer.h
rename to video/out/bitmap_packer.h
diff --git a/libvo/cocoa_common.h b/video/out/cocoa_common.h
similarity index 100%
rename from libvo/cocoa_common.h
rename to video/out/cocoa_common.h
diff --git a/libvo/cocoa_common.m b/video/out/cocoa_common.m
similarity index 100%
rename from libvo/cocoa_common.m
rename to video/out/cocoa_common.m
diff --git a/libvo/d3d_shader_yuv.h b/video/out/d3d_shader_yuv.h
similarity index 100%
rename from libvo/d3d_shader_yuv.h
rename to video/out/d3d_shader_yuv.h
diff --git a/libvo/d3d_shader_yuv.hlsl b/video/out/d3d_shader_yuv.hlsl
similarity index 100%
rename from libvo/d3d_shader_yuv.hlsl
rename to video/out/d3d_shader_yuv.hlsl
diff --git a/libvo/d3d_shader_yuv_2ch.h b/video/out/d3d_shader_yuv_2ch.h
similarity index 100%
rename from libvo/d3d_shader_yuv_2ch.h
rename to video/out/d3d_shader_yuv_2ch.h
diff --git a/libvo/filter_kernels.c b/video/out/filter_kernels.c
similarity index 100%
rename from libvo/filter_kernels.c
rename to video/out/filter_kernels.c
diff --git a/libvo/filter_kernels.h b/video/out/filter_kernels.h
similarity index 100%
rename from libvo/filter_kernels.h
rename to video/out/filter_kernels.h
diff --git a/libvo/geometry.c b/video/out/geometry.c
similarity index 100%
rename from libvo/geometry.c
rename to video/out/geometry.c
diff --git a/libvo/geometry.h b/video/out/geometry.h
similarity index 100%
rename from libvo/geometry.h
rename to video/out/geometry.h
diff --git a/libvo/gl_common.c b/video/out/gl_common.c
similarity index 100%
rename from libvo/gl_common.c
rename to video/out/gl_common.c
diff --git a/libvo/gl_common.h b/video/out/gl_common.h
similarity index 100%
rename from libvo/gl_common.h
rename to video/out/gl_common.h
diff --git a/libvo/gl_header_fixes.h b/video/out/gl_header_fixes.h
similarity index 100%
rename from libvo/gl_header_fixes.h
rename to video/out/gl_header_fixes.h
diff --git a/libvo/gl_osd.c b/video/out/gl_osd.c
similarity index 100%
rename from libvo/gl_osd.c
rename to video/out/gl_osd.c
diff --git a/libvo/gl_osd.h b/video/out/gl_osd.h
similarity index 100%
rename from libvo/gl_osd.h
rename to video/out/gl_osd.h
diff --git a/libvo/osx_common.c b/video/out/osx_common.c
similarity index 100%
rename from libvo/osx_common.c
rename to video/out/osx_common.c
diff --git a/libvo/osx_common.h b/video/out/osx_common.h
similarity index 100%
rename from libvo/osx_common.h
rename to video/out/osx_common.h
diff --git a/pnm_loader.c b/video/out/pnm_loader.c
similarity index 100%
rename from pnm_loader.c
rename to video/out/pnm_loader.c
diff --git a/pnm_loader.h b/video/out/pnm_loader.h
similarity index 100%
rename from pnm_loader.h
rename to video/out/pnm_loader.h
diff --git a/libvo/video_out.c b/video/out/vo.c
similarity index 100%
rename from libvo/video_out.c
rename to video/out/vo.c
diff --git a/libvo/video_out.h b/video/out/vo.h
similarity index 100%
rename from libvo/video_out.h
rename to video/out/vo.h
diff --git a/libvo/vo_caca.c b/video/out/vo_caca.c
similarity index 100%
rename from libvo/vo_caca.c
rename to video/out/vo_caca.c
diff --git a/libvo/vo_corevideo.h b/video/out/vo_corevideo.h
similarity index 100%
rename from libvo/vo_corevideo.h
rename to video/out/vo_corevideo.h
diff --git a/libvo/vo_corevideo.m b/video/out/vo_corevideo.m
similarity index 100%
rename from libvo/vo_corevideo.m
rename to video/out/vo_corevideo.m
diff --git a/libvo/vo_direct3d.c b/video/out/vo_direct3d.c
similarity index 100%
rename from libvo/vo_direct3d.c
rename to video/out/vo_direct3d.c
diff --git a/libvo/vo_image.c b/video/out/vo_image.c
similarity index 100%
rename from libvo/vo_image.c
rename to video/out/vo_image.c
diff --git a/libvo/vo_lavc.c b/video/out/vo_lavc.c
similarity index 100%
rename from libvo/vo_lavc.c
rename to video/out/vo_lavc.c
diff --git a/libvo/vo_null.c b/video/out/vo_null.c
similarity index 100%
rename from libvo/vo_null.c
rename to video/out/vo_null.c
diff --git a/libvo/vo_opengl.c b/video/out/vo_opengl.c
similarity index 100%
rename from libvo/vo_opengl.c
rename to video/out/vo_opengl.c
diff --git a/libvo/vo_opengl_old.c b/video/out/vo_opengl_old.c
similarity index 100%
rename from libvo/vo_opengl_old.c
rename to video/out/vo_opengl_old.c
diff --git a/libvo/vo_opengl_shaders.glsl b/video/out/vo_opengl_shaders.glsl
similarity index 100%
rename from libvo/vo_opengl_shaders.glsl
rename to video/out/vo_opengl_shaders.glsl
diff --git a/libvo/vo_vdpau.c b/video/out/vo_vdpau.c
similarity index 100%
rename from libvo/vo_vdpau.c
rename to video/out/vo_vdpau.c
diff --git a/libvo/vo_x11.c b/video/out/vo_x11.c
similarity index 100%
rename from libvo/vo_x11.c
rename to video/out/vo_x11.c
diff --git a/libvo/vo_xv.c b/video/out/vo_xv.c
similarity index 100%
rename from libvo/vo_xv.c
rename to video/out/vo_xv.c
diff --git a/libvo/w32_common.c b/video/out/w32_common.c
similarity index 100%
rename from libvo/w32_common.c
rename to video/out/w32_common.c
diff --git a/libvo/w32_common.h b/video/out/w32_common.h
similarity index 100%
rename from libvo/w32_common.h
rename to video/out/w32_common.h
diff --git a/libvo/x11_common.c b/video/out/x11_common.c
similarity index 100%
rename from libvo/x11_common.c
rename to video/out/x11_common.c
diff --git a/libvo/x11_common.h b/video/out/x11_common.h
similarity index 100%
rename from libvo/x11_common.h
rename to video/out/x11_common.h
diff --git a/libmpcodecs/sws_utils.c b/video/sws_utils.c
similarity index 100%
rename from libmpcodecs/sws_utils.c
rename to video/sws_utils.c
diff --git a/libmpcodecs/sws_utils.h b/video/sws_utils.h
similarity index 100%
rename from libmpcodecs/sws_utils.h
rename to video/sws_utils.h
diff --git a/libmpcodecs/vfcap.h b/video/vfcap.h
similarity index 100%
rename from libmpcodecs/vfcap.h
rename to video/vfcap.h