OK, it took me a second read-through to figure out (I think) why you have it divided up that way. If I understand correctly, you'd be giving the same kinds of information about, for example, ogres and elves, but just dividing it up differently.

Since ogres are not playable and don't have the detailed political system or clans and tribes, their political info just goes into the creature description. Since ogres don't have different military setups by tribe/clan, their combat info also goes into the creature description.

Elves, on the other hand, would have different political and military infor depending on tribe/clan, so that doesn't go in the creature/humanoid description, but goes instead in the tribe or clan description.

Is that the way it works? Sounds like a good plan to me.