> It's all in one file too, that shouldn't be too bad.

Fewer files is not necessarily better.

The guiding principle in my mind is reduction of entropy. If splitting one file into multiple files makes sense in the brains of the beholders it is a good thing.