refactoring resources structure to support grouping by datasets
refactoring resources structure to support grouping by datasets