Added ability to create subfolders