Better structured the scss files