Combine Group and Folder

Please continue here: Make folder tracks = Group tracks