re-strucutured scss