A bit of restructuring. Minified some SVG.
A bit of restructuring.