Restructure file groupings