Maybe you are overdoing it a little. I usually just keep divided by type (flora, minerals and so on) just in the containers for semplicity. The only things I try really hard to keep grouped are the trade goods, just to make easier to dump a batch of them without the need to look in too many places. And I am trying to keep them grouped by economy type