merged archive structure changes