refactor svg and sub packages