major reshuffle in sections towards something that is more consistent and flows better