Renamed folders to match problem names