More changes to structure to have relevant parts together.