Thanks, Dr. A!
That's exactly what I wanted to hear. (Well, not exactly, but you know what I mean. )
I think I'll let everything stay in the containers I assigned because, thematically, they make sense and it fits if, because of their interwoven nature, either all powers or none go.