updatet structuring of gofire folders