sorted out file structure, so not just 'groups'