two too many StrucutreFactories.  also, edit it to allow new structure definitions to override old