Yes. I planned to do that after it gets committed in another PR.  I was expecting other changes to happen and having this code broken up into several files would have made the merge conflict resolution tedious.

I promise to do it in the next PR though.  Scouts honor.