Has the refactoring of the code to separate files been done yet? The last time I saw it, it was one big file.