Basic grouping; still need file structure.