diff --git a/.gitignore b/.gitignore
index 69acf57cc5c12..e9a857b433ed0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@
 /mpv
 /mpv.app
 /version.h
-/mpvcore/input/input_conf.h
+/input/input_conf.h
 /tags
 /TAGS
 /video/out/gl_video_shaders.h
@@ -19,7 +19,7 @@
 /demux/ebml_defs.c
 /demux/ebml_types.h
 /sub/osd_font.h
-/mpvcore/player/lua/*.inc
+/player/lua/*.inc
 /DOCS/man/*/mpv.1
 /DOCS/man/*/mpv.aux
 /DOCS/man/*/mpv.log
diff --git a/DOCS/tech-overview.txt b/DOCS/tech-overview.txt
index 5d117000a7450..063ba06fbf33e 100644
--- a/DOCS/tech-overview.txt
+++ b/DOCS/tech-overview.txt
@@ -2,7 +2,7 @@ NOTE: DOCS/OUTDATED-tech/* may contain more detailed information, but most of it
       is possibly or definitely outdated. This file intends to give a big
       picture of how mpv is structured.
 
-mpvcore/player/*.c:
+player/*.c:
     Essentially makes up the player applications, including the main() function
     and the playback loop.
 
@@ -83,14 +83,14 @@ talloc.h & talloc.c:
              rid of the talloc emulation later and use TA natively.
              (See ta/README for details.)
 
-mpvcore/player/command.c:
+player/command.c:
     This contains the implementation for slave commands and properties.
     Properties are essentially dynamic variables changed by certain commands.
     This is basically responsible for all user commands, like initiating
     seeking, switching tracks, etc. It calls into other player/*.c files,
     where most of the work is done, but also calls other parts of mpv.
 
-mpvcore/player/mp_core.h:
+player/core.h:
     Data structures and function prototypes for most of player/*.c. They are
     usually not accessed by other parts of mpv for the sake of modularization.
 
@@ -98,7 +98,7 @@ mpvcore/player/mp_core.h:
     else. This is an ongoing transition, and eventually there should be no
     global variables anymore.
 
-mpvcore/options.h, mpvcore/options.c
+options/options.h, options/options.c
     options.h contains the global option struct MPOpts. The option declarations
     (option names, types, and MPOpts offsets for the option parser) are in
     options.c. Most default values for options and MPOpts are in
@@ -111,7 +111,7 @@ mpvcore/options.h, mpvcore/options.c
     The actual option parser is spread over m_option.c, m_config.c, and
     parser-mpcmd.c, and uses the option table in options.c.
 
-mpvcore/input/input.c:
+input/input.c:
     This translates keyboard input comming from libvo and other sources (such
     as remote control devices like Apple IR or slave mode commands) to the
     key bindings listed in the user's (or the builtin) input.conf and turns
@@ -123,7 +123,7 @@ mpvcore/input/input.c:
     direction of slave mode communication, mpv to application, consists of
     random mp_msg() calls all over the code in all parts of the player.)
 
-mpvcore/mp_msg.h:
+common/msg.h:
     All terminal output should go through mp_msg().
 
 stream/*:
@@ -240,7 +240,7 @@ sub/:
     detection as well as timing postprocessing work. (Timing postprocessing
     removes tiny gaps or overlaps between subtitle events.)
 
-mpvcore/player/timeline/:
+player/timeline/:
     A timeline is the abstraction used by loadfile.c to combine several files
     into one seemingly linear video. It's mainly used for ordered chapters
     playback. The high level code to find and load other files containing the
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 127eacd00d9d2..ba801f412a4cb 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -19,9 +19,9 @@
 #include <pthread.h>
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "common/msg.h"
+#include "input/input.h"
+#include "input/keycodes.h"
 
 #include "osdep/macosx_application_objc.h"
 #include "osdep/macosx_compat.h"
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index a7ca335736902..56f1bd539786e 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -26,7 +26,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "talloc.h"
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 // doesn't make much sense, but needed to access keymap functionality
 #include "video/out/vo.h"
 
diff --git a/osdep/path-macosx.m b/osdep/path-macosx.m
index 7446710ee5c09..d4c5020da1ebe 100644
--- a/osdep/path-macosx.m
+++ b/osdep/path-macosx.m
@@ -17,7 +17,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#include "mpvcore/path.h"
+#include "options/path.h"
 #include "osdep/path.h"
 
 char *mp_get_macosx_bundled_path(const char *file)
diff --git a/video/out/cocoa/view.m b/video/out/cocoa/view.m
index b5049e28c9b27..45f0f17b0642a 100644
--- a/video/out/cocoa/view.m
+++ b/video/out/cocoa/view.m
@@ -17,8 +17,8 @@
 
 #include <libavutil/common.h>
 
-#include "mpvcore/input/input.h"
-#include "mpvcore/input/keycodes.h"
+#include "input/input.h"
+#include "input/keycodes.h"
 
 #include "osdep/macosx_compat.h"
 #include "video/out/cocoa_common.h"
diff --git a/video/out/cocoa/window.m b/video/out/cocoa/window.m
index b259af134e0c7..e760fd184d54e 100644
--- a/video/out/cocoa/window.m
+++ b/video/out/cocoa/window.m
@@ -17,7 +17,7 @@
 
 #include <libavutil/common.h>
 
-#include "mpvcore/input/keycodes.h"
+#include "input/keycodes.h"
 
 #include "osdep/macosx_application.h"
 #include "osdep/macosx_events.h"
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index 28f1a044e820b..29c06044fe7e4 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -33,14 +33,14 @@
 
 #include "config.h"
 
-#include "mpvcore/options.h"
+#include "options/options.h"
 #include "video/out/vo.h"
 #include "video/out/aspect.h"
 
-#include "mpvcore/input/input.h"
+#include "input/input.h"
 #include "talloc.h"
 
-#include "mpvcore/mp_msg.h"
+#include "common/msg.h"
 
 static void vo_cocoa_fullscreen(struct vo *vo);
 static void vo_cocoa_ontop(struct vo *vo);