Renamed folders to match task description