A few structure changes.

Nothing major.