Structural changes. More solutions, better logical seperation