Redesign of figures/base_schematic2.svg (ie Figure 1) according to rules described in figures/base_schematic2_design_rules.txt to conform more closely and systematically to the neo object model