Added folders functionality