This was done because they needed to be split from one file to two, for efficiency, and it makes sense to have two files in their own directory. It probably makes sense to have each extension in its own directory anyway.
Tested both the inefficient backwards compatible interface and the present interface. Still more to be converted...