Cleanup, folder model, generic resource model