diff --git a/aegisub/libaegisub/media/ffms_audio.cpp b/aegisub/libmedia/audio/ffms_audio.cpp
similarity index 100%
rename from aegisub/libaegisub/media/ffms_audio.cpp
rename to aegisub/libmedia/audio/ffms_audio.cpp
diff --git a/aegisub/libaegisub/media/ffms_audio.h b/aegisub/libmedia/audio/ffms_audio.h
similarity index 100%
rename from aegisub/libaegisub/media/ffms_audio.h
rename to aegisub/libmedia/audio/ffms_audio.h
diff --git a/aegisub/libaegisub/media/ffms_common.cpp b/aegisub/libmedia/common/ffms_common.cpp
similarity index 100%
rename from aegisub/libaegisub/media/ffms_common.cpp
rename to aegisub/libmedia/common/ffms_common.cpp
diff --git a/aegisub/libaegisub/media/ffms_common.h b/aegisub/libmedia/common/ffms_common.h
similarity index 100%
rename from aegisub/libaegisub/media/ffms_common.h
rename to aegisub/libmedia/common/ffms_common.h
diff --git a/aegisub/libaegisub/include/libaegisub/media.h b/aegisub/libmedia/include/libmedia/exception.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/media.h
rename to aegisub/libmedia/include/libmedia/exception.h
diff --git a/aegisub/libaegisub/include/libaegisub/media_video_frame.h b/aegisub/libmedia/include/libmedia/video_frame.h
similarity index 100%
rename from aegisub/libaegisub/include/libaegisub/media_video_frame.h
rename to aegisub/libmedia/include/libmedia/video_frame.h
diff --git a/aegisub/libaegisub/media/ffms_video.cpp b/aegisub/libmedia/video/ffms_video.cpp
similarity index 100%
rename from aegisub/libaegisub/media/ffms_video.cpp
rename to aegisub/libmedia/video/ffms_video.cpp
diff --git a/aegisub/libaegisub/media/ffms_video.h b/aegisub/libmedia/video/ffms_video.h
similarity index 100%
rename from aegisub/libaegisub/media/ffms_video.h
rename to aegisub/libmedia/video/ffms_video.h