new structure and support item.filename regexes