Moving to SMACSS style approach