Significant restructuring and renaming as well as a few bug fixes.
A few more bug fixes, including getting the right styles for headers and
correctly scaling the scripted SVG demo.