diff --git a/aegisub/FFmpegSource2/Makefile.am b/aegisub/libffms/Makefile.am
similarity index 100%
rename from aegisub/FFmpegSource2/Makefile.am
rename to aegisub/libffms/Makefile.am
diff --git a/aegisub/FFmpegSource2/MatroskaParser.c b/aegisub/libffms/MatroskaParser.c
similarity index 100%
rename from aegisub/FFmpegSource2/MatroskaParser.c
rename to aegisub/libffms/MatroskaParser.c
diff --git a/aegisub/FFmpegSource2/MatroskaParser.h b/aegisub/libffms/MatroskaParser.h
similarity index 100%
rename from aegisub/FFmpegSource2/MatroskaParser.h
rename to aegisub/libffms/MatroskaParser.h
diff --git a/aegisub/FFmpegSource2/avisynth.h b/aegisub/libffms/avisynth.h
similarity index 100%
rename from aegisub/FFmpegSource2/avisynth.h
rename to aegisub/libffms/avisynth.h
diff --git a/aegisub/FFmpegSource2/coparser.h b/aegisub/libffms/coparser.h
similarity index 100%
rename from aegisub/FFmpegSource2/coparser.h
rename to aegisub/libffms/coparser.h
diff --git a/aegisub/FFmpegSource2/ffaudiosource.cpp b/aegisub/libffms/ffaudiosource.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffaudiosource.cpp
rename to aegisub/libffms/ffaudiosource.cpp
diff --git a/aegisub/FFmpegSource2/ffaudiosource.h b/aegisub/libffms/ffaudiosource.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffaudiosource.h
rename to aegisub/libffms/ffaudiosource.h
diff --git a/aegisub/FFmpegSource2/ffavisynth.cpp b/aegisub/libffms/ffavisynth.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffavisynth.cpp
rename to aegisub/libffms/ffavisynth.cpp
diff --git a/aegisub/FFmpegSource2/ffavisynth.h b/aegisub/libffms/ffavisynth.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffavisynth.h
rename to aegisub/libffms/ffavisynth.h
diff --git a/aegisub/FFmpegSource2/ffavsfilters.cpp b/aegisub/libffms/ffavsfilters.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffavsfilters.cpp
rename to aegisub/libffms/ffavsfilters.cpp
diff --git a/aegisub/FFmpegSource2/ffms.cpp b/aegisub/libffms/ffms.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffms.cpp
rename to aegisub/libffms/ffms.cpp
diff --git a/aegisub/FFmpegSource2/ffms.h b/aegisub/libffms/ffms.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffms.h
rename to aegisub/libffms/ffms.h
diff --git a/aegisub/FFmpegSource2/ffms2.avsi b/aegisub/libffms/ffms2.avsi
similarity index 100%
rename from aegisub/FFmpegSource2/ffms2.avsi
rename to aegisub/libffms/ffms2.avsi
diff --git a/aegisub/FFmpegSource2/ffms2.html b/aegisub/libffms/ffms2.html
similarity index 100%
rename from aegisub/FFmpegSource2/ffms2.html
rename to aegisub/libffms/ffms2.html
diff --git a/aegisub/FFmpegSource2/ffms2.lib b/aegisub/libffms/ffms2.lib
similarity index 100%
rename from aegisub/FFmpegSource2/ffms2.lib
rename to aegisub/libffms/ffms2.lib
diff --git a/aegisub/FFmpegSource2/ffms2rt.cpp b/aegisub/libffms/ffms2rt.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffms2rt.cpp
rename to aegisub/libffms/ffms2rt.cpp
diff --git a/aegisub/FFmpegSource2/ffmsindex.cpp b/aegisub/libffms/ffmsindex.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffmsindex.cpp
rename to aegisub/libffms/ffmsindex.cpp
diff --git a/aegisub/FFmpegSource2/ffpp.cpp b/aegisub/libffms/ffpp.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffpp.cpp
rename to aegisub/libffms/ffpp.cpp
diff --git a/aegisub/FFmpegSource2/ffpp.h b/aegisub/libffms/ffpp.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffpp.h
rename to aegisub/libffms/ffpp.h
diff --git a/aegisub/FFmpegSource2/ffswscale.cpp b/aegisub/libffms/ffswscale.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffswscale.cpp
rename to aegisub/libffms/ffswscale.cpp
diff --git a/aegisub/FFmpegSource2/ffswscale.h b/aegisub/libffms/ffswscale.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffswscale.h
rename to aegisub/libffms/ffswscale.h
diff --git a/aegisub/FFmpegSource2/ffvideosource.cpp b/aegisub/libffms/ffvideosource.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/ffvideosource.cpp
rename to aegisub/libffms/ffvideosource.cpp
diff --git a/aegisub/FFmpegSource2/ffvideosource.h b/aegisub/libffms/ffvideosource.h
similarity index 100%
rename from aegisub/FFmpegSource2/ffvideosource.h
rename to aegisub/libffms/ffvideosource.h
diff --git a/aegisub/FFmpegSource2/guids.h b/aegisub/libffms/guids.h
similarity index 100%
rename from aegisub/FFmpegSource2/guids.h
rename to aegisub/libffms/guids.h
diff --git a/aegisub/FFmpegSource2/indexing.cpp b/aegisub/libffms/indexing.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/indexing.cpp
rename to aegisub/libffms/indexing.cpp
diff --git a/aegisub/FFmpegSource2/indexing.h b/aegisub/libffms/indexing.h
similarity index 100%
rename from aegisub/FFmpegSource2/indexing.h
rename to aegisub/libffms/indexing.h
diff --git a/aegisub/FFmpegSource2/stdiostream.c b/aegisub/libffms/stdiostream.c
similarity index 100%
rename from aegisub/FFmpegSource2/stdiostream.c
rename to aegisub/libffms/stdiostream.c
diff --git a/aegisub/FFmpegSource2/stdiostream.h b/aegisub/libffms/stdiostream.h
similarity index 100%
rename from aegisub/FFmpegSource2/stdiostream.h
rename to aegisub/libffms/stdiostream.h
diff --git a/aegisub/FFmpegSource2/utils.cpp b/aegisub/libffms/utils.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/utils.cpp
rename to aegisub/libffms/utils.cpp
diff --git a/aegisub/FFmpegSource2/utils.h b/aegisub/libffms/utils.h
similarity index 100%
rename from aegisub/FFmpegSource2/utils.h
rename to aegisub/libffms/utils.h
diff --git a/aegisub/FFmpegSource2/wave64writer.cpp b/aegisub/libffms/wave64writer.cpp
similarity index 100%
rename from aegisub/FFmpegSource2/wave64writer.cpp
rename to aegisub/libffms/wave64writer.cpp
diff --git a/aegisub/FFmpegSource2/wave64writer.h b/aegisub/libffms/wave64writer.h
similarity index 100%
rename from aegisub/FFmpegSource2/wave64writer.h
rename to aegisub/libffms/wave64writer.h