Removed underscores in folder names