It sounds to me like this would potentially be some good de-tangling to do at some point in time, since it should lead to the code being more loosely coupled.
However, as you say, a lot of work, so it is unlikely to happen soon. I am afraid I can't offer to help.
So, I think it just needs to sit somewhere on the to-do list for now.