restructure - broken - part through
Authored by: jasons_2000 2013-07-27
Parent: [r108]
Child: [r110]