Currently if I segregate Custom Fields into folders in a sub-account and create a snapshot from that, the folders are not part of the snapshot. This makes for a mess when snapshots are deployed to other sub-accounts, especially if you have a lot of custom fields. I would suggest adding the custom field folders to the snapshots and restoring them when the snapshot is loaded into a sub-account. This means that those of us who build snapshots can organize our custom fields into folders that makes sense inside the contact object. It will make it easier for our customers to navigate all the data we have added to the contacts object through Custom Fields.