Changed the return-value of add_folders