Remove underscores from folder names
Remove underscores from folder names