Reorganization of stix updater code