partial upgrade to new nested struct-regime (init/ini_part1 still incomplete)