Merge pull request #1073 from hypar-io/handle-deserialize-folders

Merge pull request #1073 from hypar-io/handle-deserialize-folders #504