Refactor shreds component's structure