Renamed folders to make them less confuse.