restructure

breaking things into groups