Oops, should have been part of commit 37085788.
37085788
Now all demuxer implementations (at least demuxer API-wise) are in the demux directory.