Some restructure.
More structure stuff.