Cleanup / refactor for folder add
Cleanup / refactor for folder add