diff --git a/core/asxparser.c b/mpvcore/asxparser.c
similarity index 100%
rename from core/asxparser.c
rename to mpvcore/asxparser.c
diff --git a/core/asxparser.h b/mpvcore/asxparser.h
similarity index 100%
rename from core/asxparser.h
rename to mpvcore/asxparser.h
diff --git a/core/av_common.c b/mpvcore/av_common.c
similarity index 100%
rename from core/av_common.c
rename to mpvcore/av_common.c
diff --git a/core/av_common.h b/mpvcore/av_common.h
similarity index 100%
rename from core/av_common.h
rename to mpvcore/av_common.h
diff --git a/core/av_log.c b/mpvcore/av_log.c
similarity index 100%
rename from core/av_log.c
rename to mpvcore/av_log.c
diff --git a/core/av_log.h b/mpvcore/av_log.h
similarity index 100%
rename from core/av_log.h
rename to mpvcore/av_log.h
diff --git a/core/av_opts.c b/mpvcore/av_opts.c
similarity index 100%
rename from core/av_opts.c
rename to mpvcore/av_opts.c
diff --git a/core/av_opts.h b/mpvcore/av_opts.h
similarity index 100%
rename from core/av_opts.h
rename to mpvcore/av_opts.h
diff --git a/core/bstr.c b/mpvcore/bstr.c
similarity index 100%
rename from core/bstr.c
rename to mpvcore/bstr.c
diff --git a/core/bstr.h b/mpvcore/bstr.h
similarity index 100%
rename from core/bstr.h
rename to mpvcore/bstr.h
diff --git a/core/charset_conv.c b/mpvcore/charset_conv.c
similarity index 100%
rename from core/charset_conv.c
rename to mpvcore/charset_conv.c
diff --git a/core/charset_conv.h b/mpvcore/charset_conv.h
similarity index 100%
rename from core/charset_conv.h
rename to mpvcore/charset_conv.h
diff --git a/core/codecs.c b/mpvcore/codecs.c
similarity index 100%
rename from core/codecs.c
rename to mpvcore/codecs.c
diff --git a/core/codecs.h b/mpvcore/codecs.h
similarity index 100%
rename from core/codecs.h
rename to mpvcore/codecs.h
diff --git a/core/command.c b/mpvcore/command.c
similarity index 100%
rename from core/command.c
rename to mpvcore/command.c
diff --git a/core/command.h b/mpvcore/command.h
similarity index 100%
rename from core/command.h
rename to mpvcore/command.h
diff --git a/core/cpudetect.c b/mpvcore/cpudetect.c
similarity index 100%
rename from core/cpudetect.c
rename to mpvcore/cpudetect.c
diff --git a/core/cpudetect.h b/mpvcore/cpudetect.h
similarity index 100%
rename from core/cpudetect.h
rename to mpvcore/cpudetect.h
diff --git a/core/encode.h b/mpvcore/encode.h
similarity index 100%
rename from core/encode.h
rename to mpvcore/encode.h
diff --git a/core/encode_lavc.c b/mpvcore/encode_lavc.c
similarity index 100%
rename from core/encode_lavc.c
rename to mpvcore/encode_lavc.c
diff --git a/core/encode_lavc.h b/mpvcore/encode_lavc.h
similarity index 100%
rename from core/encode_lavc.h
rename to mpvcore/encode_lavc.h
diff --git a/core/input/input.c b/mpvcore/input/input.c
similarity index 100%
rename from core/input/input.c
rename to mpvcore/input/input.c
diff --git a/core/input/input.h b/mpvcore/input/input.h
similarity index 100%
rename from core/input/input.h
rename to mpvcore/input/input.h
diff --git a/core/input/joystick.c b/mpvcore/input/joystick.c
similarity index 100%
rename from core/input/joystick.c
rename to mpvcore/input/joystick.c
diff --git a/core/input/joystick.h b/mpvcore/input/joystick.h
similarity index 100%
rename from core/input/joystick.h
rename to mpvcore/input/joystick.h
diff --git a/core/input/keycodes.h b/mpvcore/input/keycodes.h
similarity index 100%
rename from core/input/keycodes.h
rename to mpvcore/input/keycodes.h
diff --git a/core/input/lirc.c b/mpvcore/input/lirc.c
similarity index 100%
rename from core/input/lirc.c
rename to mpvcore/input/lirc.c
diff --git a/core/input/lirc.h b/mpvcore/input/lirc.h
similarity index 100%
rename from core/input/lirc.h
rename to mpvcore/input/lirc.h
diff --git a/core/m_config.c b/mpvcore/m_config.c
similarity index 100%
rename from core/m_config.c
rename to mpvcore/m_config.c
diff --git a/core/m_config.h b/mpvcore/m_config.h
similarity index 100%
rename from core/m_config.h
rename to mpvcore/m_config.h
diff --git a/core/m_option.c b/mpvcore/m_option.c
similarity index 100%
rename from core/m_option.c
rename to mpvcore/m_option.c
diff --git a/core/m_option.h b/mpvcore/m_option.h
similarity index 100%
rename from core/m_option.h
rename to mpvcore/m_option.h
diff --git a/core/m_property.c b/mpvcore/m_property.c
similarity index 100%
rename from core/m_property.c
rename to mpvcore/m_property.c
diff --git a/core/m_property.h b/mpvcore/m_property.h
similarity index 100%
rename from core/m_property.h
rename to mpvcore/m_property.h
diff --git a/core/mp_common.c b/mpvcore/mp_common.c
similarity index 100%
rename from core/mp_common.c
rename to mpvcore/mp_common.c
diff --git a/core/mp_common.h b/mpvcore/mp_common.h
similarity index 100%
rename from core/mp_common.h
rename to mpvcore/mp_common.h
diff --git a/core/mp_core.h b/mpvcore/mp_core.h
similarity index 100%
rename from core/mp_core.h
rename to mpvcore/mp_core.h
diff --git a/core/mp_memory_barrier.h b/mpvcore/mp_memory_barrier.h
similarity index 100%
rename from core/mp_memory_barrier.h
rename to mpvcore/mp_memory_barrier.h
diff --git a/core/mp_msg.c b/mpvcore/mp_msg.c
similarity index 100%
rename from core/mp_msg.c
rename to mpvcore/mp_msg.c
diff --git a/core/mp_msg.h b/mpvcore/mp_msg.h
similarity index 100%
rename from core/mp_msg.h
rename to mpvcore/mp_msg.h
diff --git a/core/mp_osd.h b/mpvcore/mp_osd.h
similarity index 100%
rename from core/mp_osd.h
rename to mpvcore/mp_osd.h
diff --git a/core/mp_ring.c b/mpvcore/mp_ring.c
similarity index 100%
rename from core/mp_ring.c
rename to mpvcore/mp_ring.c
diff --git a/core/mp_ring.h b/mpvcore/mp_ring.h
similarity index 100%
rename from core/mp_ring.h
rename to mpvcore/mp_ring.h
diff --git a/core/mp_talloc.h b/mpvcore/mp_talloc.h
similarity index 100%
rename from core/mp_talloc.h
rename to mpvcore/mp_talloc.h
diff --git a/core/mplayer.c b/mpvcore/mplayer.c
similarity index 100%
rename from core/mplayer.c
rename to mpvcore/mplayer.c
diff --git a/core/mpv_global.h b/mpvcore/mpv_global.h
similarity index 100%
rename from core/mpv_global.h
rename to mpvcore/mpv_global.h
diff --git a/core/options.c b/mpvcore/options.c
similarity index 100%
rename from core/options.c
rename to mpvcore/options.c
diff --git a/core/options.h b/mpvcore/options.h
similarity index 100%
rename from core/options.h
rename to mpvcore/options.h
diff --git a/core/parser-cfg.c b/mpvcore/parser-cfg.c
similarity index 100%
rename from core/parser-cfg.c
rename to mpvcore/parser-cfg.c
diff --git a/core/parser-cfg.h b/mpvcore/parser-cfg.h
similarity index 100%
rename from core/parser-cfg.h
rename to mpvcore/parser-cfg.h
diff --git a/core/parser-mpcmd.c b/mpvcore/parser-mpcmd.c
similarity index 100%
rename from core/parser-mpcmd.c
rename to mpvcore/parser-mpcmd.c
diff --git a/core/parser-mpcmd.h b/mpvcore/parser-mpcmd.h
similarity index 100%
rename from core/parser-mpcmd.h
rename to mpvcore/parser-mpcmd.h
diff --git a/core/path.c b/mpvcore/path.c
similarity index 100%
rename from core/path.c
rename to mpvcore/path.c
diff --git a/core/path.h b/mpvcore/path.h
similarity index 100%
rename from core/path.h
rename to mpvcore/path.h
diff --git a/core/playlist.c b/mpvcore/playlist.c
similarity index 100%
rename from core/playlist.c
rename to mpvcore/playlist.c
diff --git a/core/playlist.h b/mpvcore/playlist.h
similarity index 100%
rename from core/playlist.h
rename to mpvcore/playlist.h
diff --git a/core/playlist_parser.c b/mpvcore/playlist_parser.c
similarity index 100%
rename from core/playlist_parser.c
rename to mpvcore/playlist_parser.c
diff --git a/core/playlist_parser.h b/mpvcore/playlist_parser.h
similarity index 100%
rename from core/playlist_parser.h
rename to mpvcore/playlist_parser.h
diff --git a/core/resolve.h b/mpvcore/resolve.h
similarity index 100%
rename from core/resolve.h
rename to mpvcore/resolve.h
diff --git a/core/resolve_quvi.c b/mpvcore/resolve_quvi.c
similarity index 100%
rename from core/resolve_quvi.c
rename to mpvcore/resolve_quvi.c
diff --git a/core/resolve_quvi9.c b/mpvcore/resolve_quvi9.c
similarity index 100%
rename from core/resolve_quvi9.c
rename to mpvcore/resolve_quvi9.c
diff --git a/core/screenshot.c b/mpvcore/screenshot.c
similarity index 100%
rename from core/screenshot.c
rename to mpvcore/screenshot.c
diff --git a/core/screenshot.h b/mpvcore/screenshot.h
similarity index 100%
rename from core/screenshot.h
rename to mpvcore/screenshot.h
diff --git a/core/timeline/tl_cue.c b/mpvcore/timeline/tl_cue.c
similarity index 100%
rename from core/timeline/tl_cue.c
rename to mpvcore/timeline/tl_cue.c
diff --git a/core/timeline/tl_edl.c b/mpvcore/timeline/tl_edl.c
similarity index 100%
rename from core/timeline/tl_edl.c
rename to mpvcore/timeline/tl_edl.c
diff --git a/core/timeline/tl_matroska.c b/mpvcore/timeline/tl_matroska.c
similarity index 100%
rename from core/timeline/tl_matroska.c
rename to mpvcore/timeline/tl_matroska.c
diff --git a/core/version.c b/mpvcore/version.c
similarity index 100%
rename from core/version.c
rename to mpvcore/version.c