It does make sense to separate them like that, agreed. Unfortunately, it's probably too late now to do it without breaking many parts of the game.
too many variables and scenes might stop working properly for this to work?
It's a bit difficult to explain, has to do with saves breaking because items aren't equipped in the right places, and it's really difficult to fix that with so many that would need to be changed
