Merge "Move response validation schema's in sub folder"