Added folder management stuff