Update path and group properties

Files are being moved to a sub folder per Ellen. As there are no longer
multiple groups, there is no longer a need to keep having an aggregate
group.

Change-Id: I80ddcfd3387b9979b5ee7651c4d0dd0b69fc6580
Merge "Update path and group properties"