Added folder related actions
Cleanup