Re-structured scss