Added folder functionality