Added automatic folder feature described in 6090