Update and restructure Sass components