Moved clef to util package