Added removeemptyfolders