new structure including machine-groups