Move glyphs into seperate module