Put fold states into folder

For better organization