Initial work on subscription folder support
Additional work on folders