Restructure svg container into separate svgs

[#57495348]