Country/project categorization

We have donations coming in from the whole planet.
So far we have categorized everything by adding a custom "country field" to Contacts and Contributions.
I works great and we can make nice country reports etc.

But in the future we need more detailed categories with several "donation projects" in many countries.
Any hint for doing this?