Restructure SVG related stuff, change data format