More STIX 1.0 update code and restructuring