[patch/scss] Organize SCSS again