Really? I thought the old Doctor's structural theory went something like this:
The id contains "primitive desires" (hunger, rage, and sex), the super-ego contains internalized norms, morality and taboos, and the ego mediates between the two and may include or give rise to the sense of self.
Yes.